@c8y/ngx-components 1023.22.2 → 1023.22.5

package/fesm2022/c8y-ngx-components.mjs

@@ -9390,10 +9390,11 @@ const operationStatusClasses = {
 
 /** The helper UI service for tenant related methods built upon client services. */
 class TenantUiService {
-    constructor(userService, appStateService, tenantLoginOption) {
+    constructor(userService, appStateService, tenantLoginOption, options) {
         this.userService = userService;
         this.appStateService = appStateService;
         this.tenantLoginOption = tenantLoginOption;
+        this.options = options;
         this.MANAGEMENT = 'management';
         this.ROLE_TENANT_MANAGEMENT_READ = Permissions.ROLE_TENANT_MANAGEMENT_READ;
     }
@@ -9490,11 +9491,22 @@ class TenantUiService {
             return defaultFallback;
         }
         else {
-            const visibleLoginOptions = loginOptions.filter(this.isVisibleOnLoginPage);
-            return (visibleLoginOptions.find(this.isOauthInternal) ||
+            let visibleLoginOptions = loginOptions.filter(this.isVisibleOnLoginPage);
+            // should ignore the OAUTH2 option if skipSSORedirect is set
+            if (this.options.get('skipSSORedirect', false)) {
+                visibleLoginOptions = visibleLoginOptions.filter(lo => lo.type !== TenantLoginOptionType.OAUTH2);
+                // in case there is no other visible option, we fallback to all options except OAUTH2
+                if (visibleLoginOptions.length === 0) {
+                    visibleLoginOptions = loginOptions.filter(lo => lo.type !== TenantLoginOptionType.OAUTH2);
+                }
+            }
+            const preferredLoginOption = visibleLoginOptions.find(this.isOauthInternal) ||
                 visibleLoginOptions.find(this.isBasic) ||
                 visibleLoginOptions.find(this.isOauth2) ||
-                defaultFallback);
+                defaultFallback;
+            // ensure the returned login option is marked as visible on login page
+            preferredLoginOption.visibleOnLoginPage = true;
+            return preferredLoginOption;
         }
     }
     /**
@@ -9634,13 +9646,13 @@ class TenantUiService {
     isManagement(currentTenant) {
         return currentTenant.name === this.MANAGEMENT;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TenantUiService, deps: [{ token: i1.UserService }, { token: AppStateService }, { token: i1.TenantLoginOptionsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TenantUiService, deps: [{ token: i1.UserService }, { token: AppStateService }, { token: i1.TenantLoginOptionsService }, { token: OptionsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TenantUiService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TenantUiService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: () => [{ type: i1.UserService }, { type: AppStateService }, { type: i1.TenantLoginOptionsService }] });
+        }], ctorParameters: () => [{ type: i1.UserService }, { type: AppStateService }, { type: i1.TenantLoginOptionsService }, { type: OptionsService }] });
 
 class ZipService {
     getEntries(zipFile) {