From 6f6b8f2a2d6f6ef2e17a77fc568a9f4e804611d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 14 Sep 2023 17:11:42 +0200 Subject: [PATCH] MOBILE-4201 login: Do not show other auth methods or signup if sso --- .../login/components/login-methods/login-methods.ts | 10 ++++++++-- .../features/login/pages/credentials/credentials.html | 10 +++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/core/features/login/components/login-methods/login-methods.ts b/src/core/features/login/components/login-methods/login-methods.ts index 606e2ee13..a934c1bc0 100644 --- a/src/core/features/login/components/login-methods/login-methods.ts +++ b/src/core/features/login/components/login-methods/login-methods.ts @@ -31,6 +31,7 @@ export class CoreLoginMethodsComponent implements OnInit { @Input() siteConfig?: CoreSitePublicConfigResponse; @Input() redirectData?: CoreRedirectPayload; + isBrowserSSO = false; showScanQR = false; loginMethods: CoreLoginMethod[] = []; identityProviders: CoreSiteIdentityProvider[] = []; @@ -50,9 +51,14 @@ export class CoreLoginMethodsComponent implements OnInit { } if (this.siteConfig) { - const disabledFeatures = CoreLoginHelper.getDisabledFeatures(this.siteConfig); + this.isBrowserSSO = CoreLoginHelper.isSSOLoginNeeded(this.siteConfig.typeoflogin); - this.identityProviders = CoreLoginHelper.getValidIdentityProviders(this.siteConfig, disabledFeatures); + if (!this.isBrowserSSO) { + // Identity providers won't be shown if login on browser. + const disabledFeatures = CoreLoginHelper.getDisabledFeatures(this.siteConfig); + + this.identityProviders = CoreLoginHelper.getValidIdentityProviders(this.siteConfig, disabledFeatures); + } if (this.reconnect) { this.showScanQR = CoreLoginHelper.displayQRInSiteScreen(); diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html index e54efed08..be6df4301 100644 --- a/src/core/features/login/pages/credentials/credentials.html +++ b/src/core/features/login/pages/credentials/credentials.html @@ -86,7 +86,7 @@ -
+ - - {{ 'core.login.startsignup' | translate }} - + {{ 'core.tryagain' | translate }}