diff --git a/.gitignore b/.gitignore index 8eee9995..f3cd6b5f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ tmp uploads config.json out -public/assets/pd_logo.png +.idea +.vscode ssl/localhost.key ssl/localhost.crt \ No newline at end of file diff --git a/src/controllers/IndexController.ts b/src/controllers/IndexController.ts index 7a01663d..1cf454f9 100644 --- a/src/controllers/IndexController.ts +++ b/src/controllers/IndexController.ts @@ -30,6 +30,7 @@ export class IndexController { @Get('login') private async login(req: Request, res: Response) { + console.log(req.session.user); if (req.session.user || req.cookies.typex_user) return res.redirect('/'); return res.status(200).render('login', { failed: false, config }) } @@ -45,13 +46,12 @@ export class IndexController { @Post('login') private async postLogin(req: Request, res: Response) { if (req.session.user || req.cookies.typex_user) return res.redirect('/'); - if (req.body.username == 'administrator' && req.body.password === config.administrator.password) { + if (req.body.username === 'administrator' && req.body.password === config.administrator.password) { //@ts-ignore req.session.user = { id: 0, username: 'administrator', password: config.administrator.password, - token: config.administrator.authorization, administrator: true } res.cookie('typex_user', req.session.user.id, { maxAge: 1036800000 }); diff --git a/src/middleware/cookies.ts b/src/middleware/cookies.ts index 44213bbe..3c6f7247 100644 --- a/src/middleware/cookies.ts +++ b/src/middleware/cookies.ts @@ -6,13 +6,14 @@ import { User } from "../entities/User"; export async function cookies(req: Request, res: Response, next: any) { if (req.cookies.typex_user) { if (typeof req.cookies.typex_user !== 'string') return res.send('Please clear your browser cookies and refresh this page.') - if (req.cookies.typex_user === 0) req.session.user = { - id: 0, - username: 'administrator', - password: config.administrator.password, - administrator: true - } - else req.session.user = await getConnection().getRepository(User).findOne({ id: req.cookies.typex_user }); + if (Number(req.cookies.typex_user) === 0) { + req.session.user = { + id: 0, + username: 'administrator', + password: config.administrator.password, + administrator: true + } + } else req.session.user = await getConnection().getRepository(User).findOne({ id: req.cookies.typex_user }); if (!req.session.user) { res.clearCookie('typex_user'); req.session.user = null; diff --git a/src/middleware/cookiesForAPI.ts b/src/middleware/cookiesForAPI.ts index 97dc82fa..d9308bf7 100644 --- a/src/middleware/cookiesForAPI.ts +++ b/src/middleware/cookiesForAPI.ts @@ -7,7 +7,7 @@ import { User } from "../entities/User"; export async function cookiesForAPI(req: Request, res: Response, next: any) { if (req.cookies.typex_user) { if (typeof req.cookies.typex_user !== 'string') return res.status(BAD_REQUEST).send({ code: BAD_REQUEST, message: "Please clear browser cookies." }) - if (req.cookies.typex_user === 0) req.session.user = { + if (Number(req.cookies.typex_user) === 0) req.session.user = { id: 0, username: 'administrator', password: config.administrator.password, diff --git a/src/server.ts b/src/server.ts index a5aaedeb..d12cd33c 100644 --- a/src/server.ts +++ b/src/server.ts @@ -33,14 +33,10 @@ export class TypeXServer extends Server { }) ); this.app.use(async (req, res, next) => { - console.log(req.url, req.baseUrl, req.originalUrl) if (!req.url.startsWith(config.upload.route)) return next(); - console.log(`${config.site.returnProtocol}://${req.headers['host']}${req.url}`) const upload = await orm.repos.image.findOne({ url: `${config.site.returnProtocol}://${req.headers['host']}${req.url}` }); - console.log(upload); if (!upload) return next(); upload.views++; - console.log(upload.views); orm.repos.image.save(upload); return next(); })