Merge branch 'hotfix/6.6.1'

MauroDataMapper · Sep 22, 2021 · 6f41285 · 6f41285
2 parents 393efdb + 849281a
commit 6f41285
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mdm-ui",
-  "version": "6.6.0",
+  "version": "6.6.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/src/app/services/handlers/security-handler.service.ts b/src/app/services/handlers/security-handler.service.ts
@@ -356,7 +356,7 @@ export class SecurityHandlerService {
     // The static page is therefore a landing point so that it can immediately redirect to the correct authentication component
     // route and do the real work.
     const authorizationUrl = '/redirects/open-id-connect-redirect.html';
-    const baseUrl = `${window.location.protocol}//${window.location.host}`;
-    return new URL(authorizationUrl, baseUrl);
+    const baseUrl = window.location.href.slice(0, window.location.href.indexOf('/#/'));
+    return new URL(baseUrl + authorizationUrl);
   }
 }
diff --git a/src/static-pages/open-id-connect-redirect.html b/src/static-pages/open-id-connect-redirect.html
@@ -35,10 +35,8 @@
     <body>
         <p>Redirecting back to Mauro Data Mapper...</p>
         <script lang="javascript">
-          const baseUrl = `${window.location.protocol}//${window.location.host}`;
-          const currentUrl = `#/open-id-connect/authorize${window.location.search}`;
-          const redirectUrl = new URL(currentUrl, baseUrl);
-          window.open(redirectUrl.toString(), '_self');
+          const redirectUrl = window.location.href.replace('/redirects/open-id-connect-redirect.html', '/#/open-id-connect/authorize');
+          window.open(redirectUrl, '_self');
         </script>
     </body>
 </html>