feat: redirect to requested path after login

src/handlers/middleware.ts

@@ -1,16 +1,20 @@
 import express from 'express';
 import { Request, Response, NextFunction } from "express";
 import { IntraUser } from "../intra/oauth";
+import { CustomSessionData } from "./session";
 import { PrismaClient } from "@prisma/client";
 const prisma = new PrismaClient();
 
+
 const checkIfAuthenticated = function(req: Request, res: Response, next: NextFunction) {
 	if (req.path.startsWith('/login') || req.path.startsWith('/logout') || res.statusCode === 503) {
 		return next();
 	}
 	if (req.isAuthenticated()) {
 		return next();
 	}
+	// Store the path the user was trying to access
+	(req.session as CustomSessionData).returnTo = req.originalUrl;
 	return res.redirect('/login');
 };
 

src/handlers/session.ts

@@ -0,0 +1,5 @@
+import { SessionData } from "express-session";
+
+export interface CustomSessionData extends SessionData {
+	returnTo?: string;
+}

src/routes/login.ts

@@ -1,6 +1,7 @@
 import { Express } from 'express';
 import passport from 'passport';
 import { IntraUser } from '../intra/oauth';
+import { CustomSessionData } from '../handlers/session';
 
 export const setupLoginRoutes = function(app: Express): void {
 	app.get('/login', (req, res) => {
@@ -23,6 +24,12 @@ export const setupLoginRoutes = function(app: Express): void {
 			if (err) {
 				console.error('Failed to save session:', err);
 			}
+			// Check if there was a path the user was trying to access
+			const returnTo = (req.session as CustomSessionData).returnTo;
+			if (returnTo) {
+				delete (req.session as CustomSessionData).returnTo;
+				return res.redirect(returnTo);
+			}
 			res.redirect('/');
 		});
 	});