Merge pull request #372 from USEPA/feature/update-setting-of-base-url

Feature/update setting of base url
USEPA · Oct 9, 2023 · 824d8ce · 824d8ce
2 parents 0d1f949 + 42c3ff2
commit 824d8ce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/app/server/app/routes/auth.js b/app/server/app/routes/auth.js
@@ -5,22 +5,18 @@ const { ensureAuthenticated } = require("../middleware");
 const { createJWT, jwtCookieName } = require("../utilities/createJwt");
 const log = require("../utilities/logger");
 
-const { CLIENT_URL, SERVER_URL, SAML_PUBLIC_KEY } = process.env;
+const { NODE_ENV, CLIENT_URL, SERVER_URL, SAML_PUBLIC_KEY } = process.env;
+const url = NODE_ENV === "development" ? CLIENT_URL : SERVER_URL;
 
 const router = express.Router();
 
-/**
- * NOTE: SERVER_URL is needed as fallback when using sub path, e.g. /csb
- */
-const baseUrl = CLIENT_URL || SERVER_URL;
-
 router.get(
   "/login",
   passport.authenticate("saml", {
     successRedirect: "/",
     failureRedirect: "/login/fail",
     session: false,
-  })
+  }),
 );
 
 router.post(
@@ -57,15 +53,15 @@ router.post(
      * "RelayState" will be the path that the user initially tried to access
      * before being sent to /login
      */
-    res.redirect(`${baseUrl}${body.RelayState || "/"}`);
-  }
+    res.redirect(`${url}${body.RelayState || "/"}`);
+  },
 );
 
 router.get("/login/fail", (req, res) => {
   const logMessage = `SAML Error - Login failed.`;
   log({ level: "error", message: logMessage, req });
 
-  res.redirect(`${baseUrl}/welcome?error=saml`);
+  res.redirect(`${url}/welcome?error=saml`);
 });
 
 router.get("/logout", ensureAuthenticated, (req, res) => {
@@ -77,7 +73,7 @@ router.get("/logout", ensureAuthenticated, (req, res) => {
       const logMessage = `SAML Error - Passport logout failed - ${err}`;
       log({ level: "error", message: logMessage, req });
 
-      res.redirect(`${baseUrl}/`);
+      res.redirect(`${url}/`);
     } else {
       const logMessage = `User with email '${mail}' and member of ${userGroups} groups logged out.`;
       log({ level: "info", message: logMessage, req });
@@ -97,7 +93,7 @@ const logoutCallback = (req, res) => {
    * or post body), redirect to below.
    */
   const relayState = req.query?.RelayState || req.body?.RelayState;
-  res.redirect(`${baseUrl}${relayState || "/welcome?success=logout"}`);
+  res.redirect(`${url}${relayState || "/welcome?success=logout"}`);
 };
 
 /**

diff --git a/app/server/app/utilities/errorHandler.js b/app/server/app/utilities/errorHandler.js
@@ -1,13 +1,12 @@
 const log = require("./logger");
 
-const { CLIENT_URL, SERVER_URL } = process.env;
+const { NODE_ENV, CLIENT_URL, SERVER_URL } = process.env;
+const url = NODE_ENV === "development" ? CLIENT_URL : SERVER_URL;
 
 function errorHandler(err, req, res, next) {
   const logMessage = typeof err.toString === "function" ? err.toString() : err;
   log({ level: "error", message: logMessage, req });
 
-  const url = CLIENT_URL || SERVER_URL;
-
   /**
    * If user was trying to log in and an error occurred, return them back to
    * login page to display a message.