add support for referrer based login UI redirection

NASA-AMMOS · Dec 14, 2023 · 5a4e3bb · 5a4e3bb
1 parent 713edec
commit 5a4e3bb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/packages/auth/adapters/CAMAuthAdapter.ts b/src/packages/auth/adapters/CAMAuthAdapter.ts
@@ -2,6 +2,8 @@ import { getEnv } from '../../../env.js';
 import { generateJwt, getUserRoles } from "../functions.js";
 import type { AuthAdapter, AuthResponse, ValidateResponse } from "../types.js";
 
+import { Request } from "express";
+
 type CAMValidateResponse = {
   validated?: boolean;
   errorCode?: string;
@@ -22,10 +24,10 @@ type CAMLoginResponse = {
 
 export const CAMAuthAdapter: AuthAdapter = {
 
-  logout: async (cookies: any): Promise<boolean> => {
-
+  logout: async (req: Request): Promise<boolean> => {
     const { AUTH_SSO_TOKEN_NAME, AUTH_URL } = getEnv();
 
+    const cookies = req.cookies;
     const ssoToken = cookies[AUTH_SSO_TOKEN_NAME];
 
     const body = JSON.stringify({ ssoToken });
@@ -36,10 +38,10 @@ export const CAMAuthAdapter: AuthAdapter = {
     return invalidated;
   },
 
-  validate: async (cookies: any): Promise<ValidateResponse> => {
-
+  validate: async (req: Request): Promise<ValidateResponse> => {
     const { AUTH_SSO_TOKEN_NAME, AUTH_URL, AUTH_UI_URL } = getEnv();
 
+    const cookies = req.cookies;
     const ssoToken = cookies[AUTH_SSO_TOKEN_NAME];
 
     const body = JSON.stringify({ ssoToken });
@@ -49,10 +51,14 @@ export const CAMAuthAdapter: AuthAdapter = {
 
     const { validated = false, errorCode = false } = json;
 
+    const redirectTo = req.headers.referrer;
+
+    const redirectURL = `${AUTH_UI_URL}/?goto=${redirectTo}`;
+
     if (errorCode || !validated) {
       return {
         message: "invalid token, redirecting to login UI",
-        redirectURL: AUTH_UI_URL,
+        redirectURL,
         success: false
       };
     }

diff --git a/src/packages/auth/routes.ts b/src/packages/auth/routes.ts
@@ -68,7 +68,7 @@ export default (app: Express, auth: AuthAdapter) => {
    *       - Auth
    */
   app.get('/auth/validateSSO', loginLimiter, async (req, res) => {
-    const { token, success, message, userId, redirectURL } = await auth.validate(req.cookies);
+    const { token, success, message, userId, redirectURL } = await auth.validate(req);
     const resp = {
       message,
       redirectURL,
@@ -99,7 +99,7 @@ export default (app: Express, auth: AuthAdapter) => {
    *       - Auth
    */
   app.get('/auth/logoutSSO', async (req, res) => {
-    const success = await auth.logout(req.cookies);
+    const success = await auth.logout(req);
     res.json({ success });
   });
 

diff --git a/src/packages/auth/types.ts b/src/packages/auth/types.ts
@@ -1,3 +1,5 @@
+import { Request } from "express";
+
 export type JsonWebToken = string;
 
 export type JwtDecode = {
@@ -45,6 +47,6 @@ export type ValidateResponse = {
 };
 
 export interface AuthAdapter {
-  validate(cookies: any): Promise<ValidateResponse>;
-  logout(cookies: any): Promise<boolean>;
+  validate(req: Request): Promise<ValidateResponse>;
+  logout(req: Request): Promise<boolean>;
 };