update(*): fix auth sessions

RINIYAProject · Jan 27, 2024 · d8f0fb2 · d8f0fb2
1 parent 3ca169d
commit d8f0fb2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/api/website/index.ts b/src/api/website/index.ts
@@ -27,6 +27,13 @@ export interface CustomResponse extends Response {
   token?: DiscordAccount;
 }
 
+declare module 'express-session' {
+  interface SessionData {
+      account?: DiscordAccount
+      accountId?: string;
+  }
+}
+
 export default class WebsiteServer {
   private routes: Tuple<AbstractRoutes>
   private server: http.Server

diff --git a/src/api/website/middleware/CAuthMiddleware.ts b/src/api/website/middleware/CAuthMiddleware.ts
@@ -15,11 +15,10 @@ export default class CAuthMiddleware extends BaseMiddleware {
     }
 
     public async handle(request: CustomRequest, response: CustomResponse, next) {
-
-        if (isNull(request.internal)) {
+        if (isNull(request.session.accountId)) {
             return response.redirect("https://www.riniya.uk/user/login")
         } else {
-          const account = await DiscordAccount.findOne({ _id: request.internal })
+          const account = await DiscordAccount.findOne({ _id: request.session.accountId })
           if (isNull(account)) {
             return response.redirect("https://www.riniya.uk")
           }

diff --git a/src/api/website/routes/Auth.ts b/src/api/website/routes/Auth.ts
@@ -72,7 +72,9 @@ export default class Auth extends AbstractRoutes {
                 },
                 uuid: discordState
               }).save().then(r => {
-
+                req.session.account = r
+                req.session.accountId = r._id
+                req.session.save()
               })
             } else {
               await DiscordAccount.updateOne({
@@ -92,7 +94,9 @@ export default class Auth extends AbstractRoutes {
                 }
               })
 
-
+              req.session.account = account
+              req.session.accountId = account._id
+              req.session.save()
             }
 
             res.status(200).redirect("https://www.riniya.uk/dashboard")

diff --git a/src/api/website/routes/Dashboard.ts b/src/api/website/routes/Dashboard.ts
@@ -7,7 +7,7 @@ export default class Dashboard extends AbstractRoutes {
 
     this.router.get('/', function (req: CustomRequest, res) {
         res.render('dashboard', {
-              user: req.token
+              user: req.session.account
         })
     })
   }