@c8y/login 1023.97.8 → 1024.0.0

package/jest.config.js

@@ -14,5 +14,5 @@ module.exports = {
     '../ngx-components/test/fail-on-console-error-configuration.ts'
   ],
   testRunner: 'jest-jasmine2',
-  transformIgnorePatterns: ['/!node_modules\\/lodash-es/', 'node_modules/(?!.*\\.mjs$)']
+  transformIgnorePatterns: ['/!node_modules\\/lodash-es/', 'node_modules/(?!gridstack|.*\\.mjs$)']
 };

package/package.json

@@ -1,24 +1,25 @@
 {
   "name": "@c8y/login",
-  "version": "1023.97.8",
+  "version": "1024.0.0",
   "description": "This package is used to scaffold a login application for Cumulocity IoT.",
   "dependencies": {
-    "@angular/animations": "^20.3.24",
-    "@angular/cdk": "^20.2.14",
-    "@c8y/bootstrap": "1023.97.8",
-    "@c8y/client": "1023.97.8",
-    "@c8y/ngx-components": "1023.97.8",
-    "@c8y/style": "1023.97.8",
+    "@angular/animations": "^21.2.0",
+    "@angular/cdk": "^21.2.0",
+    "@c8y/bootstrap": "1024.0.0",
+    "@c8y/client": "1024.0.0",
+    "@c8y/ngx-components": "1024.0.0",
+    "@c8y/style": "1024.0.0",
     "monaco-editor": "~0.53.0",
-    "ngx-bootstrap": "20.0.2",
-    "rxjs": "7.8.2"
+    "ngx-bootstrap": "21.0.1",
+    "rxjs": "7.8.2",
+    "zone.js": "~0.15.1"
   },
   "devDependencies": {
-    "@c8y/devkit": "1023.97.8",
-    "@c8y/options": "1023.97.8"
+    "@c8y/devkit": "1024.0.0",
+    "@c8y/options": "1024.0.0"
   },
   "peerDependencies": {
-    "@angular/common": ">=20 <21"
+    "@angular/common": ">=21 <22"
   },
   "author": "Cumulocity GmbH",
   "license": "Apache-2.0"

package/src/app/app.config.ts

@@ -1,9 +1,10 @@
-import { ApplicationConfig, importProvidersFrom } from '@angular/core';
+import { ApplicationConfig, importProvidersFrom, provideZoneChangeDetection } from '@angular/core';
 import { provideAnimations } from '@angular/platform-browser/animations';
 import { CoreModule, RouterModule } from '@c8y/ngx-components';
 
 export const appConfig: ApplicationConfig = {
   providers: [
+    provideZoneChangeDetection(),
     provideAnimations(),
     importProvidersFrom(RouterModule.forRoot()),
     importProvidersFrom(CoreModule.forRoot())

package/src/app/login/credentials-from-query-params.service.ts

@@ -1,9 +1,10 @@
-import { Injectable } from '@angular/core';
+import { DOCUMENT, inject, Injectable } from '@angular/core';
 import { ICredentials } from '@c8y/client';
 
 @Injectable({ providedIn: 'root' })
 export class CredentialsFromQueryParamsService {
   private readonly queryParamsToHandle: Array<keyof ICredentials> = ['tenant', 'user'];
+  private readonly document = inject(DOCUMENT);
 
   /**
    * Retrieves any subset of credentials provided via queryParams
@@ -12,14 +13,14 @@ export class CredentialsFromQueryParamsService {
   getCredentialsFromQueryParams(): ICredentials {
     const credentials: ICredentials = {};
     try {
-      const params = new URLSearchParams(window.location.search);
+      const params = new URLSearchParams(this.document.location.search);
       this.queryParamsToHandle.forEach(param => {
         const value = this.getParameterFromQueryParams(params, param);
         if (value) {
           credentials[param] = value;
         }
       });
-    } catch (e) {
+    } catch {
       // URLSearchParams probably not available in all browsers (https://caniuse.com/urlsearchparams)
     }
     return credentials;
@@ -32,15 +33,15 @@ export class CredentialsFromQueryParamsService {
    */
   removeCredentialsFromQueryParams(): boolean {
     try {
-      const params = new URLSearchParams(window.location.search);
+      const params = new URLSearchParams(this.document.location.search);
       const hasRemovedAtLeastOneParam = this.queryParamsToHandle
         .map(param => this.removeParameterFromQueryParameters(params, param))
         .reduceRight((prev, curr) => prev || curr, false);
       if (hasRemovedAtLeastOneParam) {
-        window.location.search = params.toString();
+        this.document.location.search = params.toString();
         return true;
       }
-    } catch (e) {
+    } catch {
       // URLSearchParams probably not available in all browsers (https://caniuse.com/urlsearchparams)
     }
     return false;

package/src/app/login/login.component.ts

@@ -33,7 +33,7 @@ import { MissingApplicationAccessComponent } from './missing-application-access/
 @Component({
   selector: 'c8y-login',
   templateUrl: './login.component.html',
-  styleUrls: ['./login.component.less'],
+  styleUrls: ['./login.component.scss'],
   encapsulation: ViewEncapsulation.None,
   standalone: true,
   imports: [

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

@@ -1,4 +1,4 @@
-import { inject, Injectable } from '@angular/core';
+import { DOCUMENT, inject, Injectable } from '@angular/core';
 import {
   ApplicationService,
   BearerAuthFromSessionStorage,
@@ -22,13 +22,7 @@ import { BehaviorSubject, EMPTY } from 'rxjs';
 import { isEmpty } from 'lodash-es';
 import { TranslateService } from '@ngx-translate/core';
 import { LoginEvent, SsoData } from './login.model';
-import {
-  getStoredToken,
-  getStoredTfaToken,
-  TOKEN_KEY,
-  TFATOKEN_KEY,
-  isLocal
-} from '@c8y/bootstrap';
+import { getStoredToken, getStoredTfaToken, TOKEN_KEY, TFATOKEN_KEY } from '@c8y/bootstrap';
 
 /**
  * Service to manage the login.
@@ -102,6 +96,7 @@ export class LoginService extends SimplifiedAuthService {
   private tenantLoginOptionsService = inject(TenantLoginOptionsService);
   private modalService = inject(ModalService);
   private applicationService = inject(ApplicationService);
+  private document = inject(DOCUMENT);
 
   constructor() {
     super();
@@ -150,7 +145,7 @@ export class LoginService extends SimplifiedAuthService {
   redirectToOauth() {
     const idpHint = this.getIdpHintFromQueryParams();
     const { initRequest, flowControlledByUI } = this.oauthOptions;
-    const fullPath = `${window.location.origin}${window.location.pathname}`;
+    const fullPath = `${this.document.location.origin}${this.document.location.pathname}`;
     const redirectUrl = encodeURIComponent(fullPath);
     const originUriParam = `${initRequest.includes('?') ? '&' : '?'}originUri=${redirectUrl}`;
     const urlObject = new URL(initRequest);
@@ -160,12 +155,12 @@ export class LoginService extends SimplifiedAuthService {
         .fetch(`/tenant/oauth${urlObject.search}${originUriParam}`)
         .then(res => this.handleErrorStatusCodes(res))
         .then(res => res.json())
-        .then((res: any) => (window.location.href = res.redirectTo))
+        .then((res: any) => (this.document.location.href = res.redirectTo))
         .catch(ex => this.showSsoError(ex));
     } else if (idpHint) {
-      window.location.href = `${initRequest}${originUriParam}&${this.IDP_HINT_QUERY_PARAM}=${idpHint}`;
+      this.document.location.href = `${initRequest}${originUriParam}&${this.IDP_HINT_QUERY_PARAM}=${idpHint}`;
     } else {
-      window.location.href = `${initRequest}${originUriParam}`;
+      this.document.location.href = `${initRequest}${originUriParam}`;
     }
   }
 
@@ -252,7 +247,7 @@ export class LoginService extends SimplifiedAuthService {
       const authStrategy = new BearerAuthFromSessionStorage();
       console.log(`Using BearerAuthFromSessionStorage`);
       return authStrategy;
-    } catch (e) {
+    } catch {
       // do nothing
     }
     let authStrategy: IAuthentication = this.cookieAuth;
@@ -350,14 +345,14 @@ export class LoginService extends SimplifiedAuthService {
     const userHasAccessToApp =
       // in case of local development we do not need to verify if the user has access to the app
       // This way developers do not need to create the application in the tenant before developing
-      window.location.hostname === 'localhost' ||
+      this.document.location.hostname === 'localhost' ||
       (await this.userHasAccessToApp(user, redirectPath));
 
     if (!userHasAccessToApp) {
       return false;
     }
 
-    window.location.href = redirectPath;
+    this.document.location.href = redirectPath;
     return true;
   }
 
@@ -368,7 +363,7 @@ export class LoginService extends SimplifiedAuthService {
       if (redirectPathFromSessionStorage.includes('?')) {
         const { hash, searchParams, pathname } = new URL(
           redirectPathFromSessionStorage,
-          window.location.origin
+          this.document.location.origin
         );
         for (const param of this.queryParamsToRemove) {
           searchParams.delete(param);
@@ -406,7 +401,7 @@ export class LoginService extends SimplifiedAuthService {
     try {
       await this.applicationService.getManifestOfContextPath(contextPathOfApp);
       return redirectPath;
-    } catch (e) {
+    } catch {
       return false;
     }
   }
@@ -535,9 +530,9 @@ export class LoginService extends SimplifiedAuthService {
   }
 
   redirectToDomain(domain) {
-    const originUrl = new URL(window.location.href);
+    const originUrl = new URL(this.document.location.href);
     const redirectUrl = originUrl.href.replace(originUrl.hostname, domain);
-    window.location.href = redirectUrl;
+    this.document.location.href = redirectUrl;
   }
 
   showSsoError(error): void {
@@ -610,7 +605,8 @@ export class LoginService extends SimplifiedAuthService {
    * Running on localhost means development mode.
    */
   private isLocal(): boolean {
-    return isLocal();
+    const hostname = this.document.location.hostname;
+    return /127\.0\.0\.1/.test(hostname) || /localhost/.test(hostname);
   }
 
   /**
@@ -630,7 +626,7 @@ export class LoginService extends SimplifiedAuthService {
   }
 
   private isShowTenant(): boolean {
-    return this.showTenantRegExp.test(window.location.href);
+    return this.showTenantRegExp.test(this.document.location.href);
   }
 
   /**
@@ -710,7 +706,7 @@ export class LoginService extends SimplifiedAuthService {
   }
 
   private getIdpHintFromQueryParams(): string | null {
-    const params = new URLSearchParams(window.location.search);
+    const params = new URLSearchParams(this.document.location.search);
     return params.get(this.IDP_HINT_QUERY_PARAM) || null;
   }
 }

package/src/app/login/tenant-id-setup/tenant-id-setup.component.ts

@@ -1,4 +1,4 @@
-import { Component, Output, EventEmitter } from '@angular/core';
+import { Component, DOCUMENT, Inject, Output, EventEmitter } from '@angular/core';
 import { LoginEvent, LoginViews } from '../login.model';
 import { FetchClient } from '@c8y/client';
 import {
@@ -46,7 +46,8 @@ export class TenantIdSetupComponent {
     private ui: AppStateService,
     private loginService: LoginService,
     private alert: AlertService,
-    private translateService: TranslateService
+    private translateService: TranslateService,
+    @Inject(DOCUMENT) private document: Document
   ) {}
 
   /**
@@ -78,7 +79,7 @@ export class TenantIdSetupComponent {
   redirectToCorrectDomain() {
     const loginRedirectDomain = this.loginService.loginMode.loginRedirectDomain;
     if (loginRedirectDomain) {
-      const alreadyOnCorrectDomain = window.location.href.includes(loginRedirectDomain);
+      const alreadyOnCorrectDomain = this.document.location.href.includes(loginRedirectDomain);
       if (!alreadyOnCorrectDomain) {
         this.loginService.redirectToDomain(loginRedirectDomain);
       } else {