Merge remote-tracking branch 'origin/4.5' into sw-backport-4.5.1

Author: shuowu

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

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));
       }