@c8y/login 1022.6.1 → 1022.8.0

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@c8y/login",
-  "version": "1022.6.1",
+  "version": "1022.8.0",
   "description": "This package is used to scaffold a login application for Cumulocity IoT.",
   "dependencies": {
-    "@c8y/style": "1022.6.1",
-    "@c8y/ngx-components": "1022.6.1",
-    "@c8y/client": "1022.6.1",
-    "@c8y/bootstrap": "1022.6.1",
+    "@c8y/style": "1022.8.0",
+    "@c8y/ngx-components": "1022.8.0",
+    "@c8y/client": "1022.8.0",
+    "@c8y/bootstrap": "1022.8.0",
     "@angular/cdk": "^19.2.18",
     "ngx-bootstrap": "19.0.2",
     "rxjs": "7.8.1"
   },
   "devDependencies": {
-    "@c8y/options": "1022.6.1",
-    "@c8y/devkit": "1022.6.1"
+    "@c8y/options": "1022.8.0",
+    "@c8y/devkit": "1022.8.0"
   },
   "peerDependencies": {
     "@angular/common": ">=19 <20"

package/src/app/login/login.service.ts

@@ -326,18 +326,18 @@ export class LoginService extends SimplifiedAuthService {
     if (redirectPathFromSessionStorage) {
       sessionStorage.removeItem('c8yRedirectAfterLoginPath');
       if (redirectPathFromSessionStorage.includes('?')) {
-        const queryParams = new URLSearchParams(redirectPathFromSessionStorage);
+        const { hash, searchParams, pathname } = new URL(
+          redirectPathFromSessionStorage,
+          window.location.origin
+        );
         for (const param of this.queryParamsToRemove) {
-          queryParams.delete(param);
+          searchParams.delete(param);
         }
-        const newQueryParams = queryParams.toString();
-        const redirectWithoutQueryParams = redirectPathFromSessionStorage.split('?', 1)[0];
-        const hash = redirectPathFromSessionStorage.split('#', 2)[1] || '';
+        const newQueryParams = searchParams.toString();
 
         const queryParamsToAppend = newQueryParams ? `?${newQueryParams}` : '';
-        const hashToAppend = hash ? `#${hash}` : '';
-        redirectPathFromSessionStorage =
-          redirectWithoutQueryParams + queryParamsToAppend + hashToAppend;
+        const hashToAppend = hash || '';
+        redirectPathFromSessionStorage = pathname + queryParamsToAppend + hashToAppend;
       }
       return Promise.resolve(redirectPathFromSessionStorage);
     }