@c8y/ngx-components 1021.22.78 → 1021.22.86

package/fesm2022/c8y-ngx-components.mjs

@@ -13233,6 +13233,10 @@ class LoginService {
             : gettext$1('SSO login failed. Contact the administrator.');
         this.modalService.acknowledge(gettext$1('Login error'), body, Status.DANGER, gettext$1('OK'));
     }
+    async clearCookies() {
+        // clear cookies but avoid redirect on logout
+        return await this.cookieAuth.logout({ redirect: 'manual' });
+    }
     /**
      * Sets the tenant to the client and updates the credentials on the
      * auth strategy.
@@ -16877,6 +16881,7 @@ class LoginComponent {
             await this.loginService.login();
         }
         catch (e) {
+            await this.loginService.clearCookies();
             const preferredLoginOptionType = this.loginService.loginMode.type;
             if (preferredLoginOptionType === TenantLoginOptionType.OAUTH2) {
                 this.loginService.redirectToOauth();
@@ -22996,8 +23001,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.9", ngImpor
         }] });
 
 class NavigatorBottomService {
-    constructor(options) {
+    constructor(options, themeService) {
         this.options = options;
+        this.themeService = themeService;
         this.navigatorLogoVariable = 'navigator-platform-logo';
         this.navigatorLogoHeightVariable = 'navigator-platform-logo-height';
     }
@@ -23005,11 +23011,15 @@ class NavigatorBottomService {
         return this.options.get$('hidePowered').pipe(map(hidePowered => !!hidePowered));
     }
     hasCustomNavigatorLogoSet() {
-        return this.options.get$('brandingCSSVars').pipe(map(vars => {
+        return combineLatest([
+            this.options.get$('brandingCSSVars'),
+            this.themeService.currentlyAppliedTheme$
+        ]).pipe(map(([vars, theme]) => {
             if (!vars || typeof vars !== 'object') {
                 return false;
             }
-            if (typeof vars[this.navigatorLogoVariable] === 'string') {
+            const variableToLookFor = theme === 'dark' ? `dark-${this.navigatorLogoVariable}` : this.navigatorLogoVariable;
+            if (typeof vars[variableToLookFor] === 'string') {
                 return true;
             }
             return false;
@@ -23021,7 +23031,7 @@ class NavigatorBottomService {
     shouldShowDefaultPoweredBy() {
         return combineLatest([this.hasHidePoweredSet(), this.hasCustomNavigatorLogoSet()]).pipe(map(([hidePowered, hasCustomLogo]) => !hidePowered && !hasCustomLogo));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.9", ngImport: i0, type: NavigatorBottomService, deps: [{ token: OptionsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.9", ngImport: i0, type: NavigatorBottomService, deps: [{ token: OptionsService }, { token: ThemeSwitcherService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.9", ngImport: i0, type: NavigatorBottomService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.9", ngImport: i0, type: NavigatorBottomService, decorators: [{
@@ -23029,7 +23039,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.9", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: OptionsService }] });
+        }], ctorParameters: () => [{ type: OptionsService }, { type: ThemeSwitcherService }] });
 
 class NavigatorBottomComponent {
     constructor(bottomService) {