fix: if appBaseUrl includes a base path

OKTA-464266 <<<Jenkins Check-In of Tested SHA: c6d7dd6 for eng_productivity_ci_bot_okta@okta.com>>> Artifact: okta-oidc-middleware Files changed count: 3 PR Link: "#43"
okta · Jan 27, 2022 · 8b0691c · 8b0691c
1 parent 4e1414e
commit 8b0691c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 4.5.1
+
+### Bug Fixes
+
+- [#43](https://github.com/okta/okta-oidc-middleware/pull/43) fix: correctly preprends `appBaseUrl` to redirect url when `appBaseUrl` contains a base path
+
 # 4.5.0
 
 ### Features

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@okta/oidc-middleware",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "description": "OpenId Connect middleware for authorization code flows",
   "repository": "https://github.com/okta/okta-oidc-middleware",
   "homepage": "https://github.com/okta/okta-oidc-middleware#readme",

diff --git a/src/oidcUtil.js b/src/oidcUtil.js
@@ -144,7 +144,11 @@ oidcUtil.ensureAuthenticated = (context, options = {}) => {
         if (req.session) {
           req.session.returnTo = req.originalUrl || req.url;
         }
-        const url = options.redirectTo || (new URL(context.options.routes.login.path, context.options.appBaseUrl)).href;
+        let url = options.redirectTo;
+        if (!url) {
+          const loginPath = context.options.routes.login.path;
+          url = (new URL(loginPath[0] === '/' ? `.${loginPath}` : `/${loginPath}`, context.options.appBaseUrl + '/')).href;
+        }
         return res.redirect(appendOptionsToQuery(url, options));
       }