mvp

apps/backend/src/auth/auth.controller.ts

@@ -17,8 +17,8 @@ export class AuthController {
   @Public()
   @SensitiveRateLimit()
   @Redirect()
-  async login() {
-    return { url: await this.auth.createLoginUrl() };
+  async login(@Query('returnTo') returnTo?: string) {
+    return { url: await this.auth.createLoginUrl(returnTo) };
   }
 
   @Get('callback')
@@ -30,7 +30,7 @@ export class AuthController {
     @Req() req: AuthenticatedRequest,
     @Res() res: Response,
   ) {
-    const { session, csrfToken } = await this.auth.completeLogin(
+    const { session, csrfToken, returnPath } = await this.auth.completeLogin(
       code,
       state,
       req.get('user-agent'),
@@ -51,7 +51,9 @@ export class AuthController {
       path: '/',
       expires: session.absoluteExpiresAt,
     });
-    res.redirect(this.config.frontendBaseUrl);
+    res.redirect(
+      new URL(returnPath ?? '/', this.config.frontendBaseUrl).toString(),
+    );
   }
 
   @Get('logout')