From d8a1d2d956c1a6569f8c67c5a44f384ae4d9ad4e Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 21 Oct 2019 14:37:56 +0200 Subject: [PATCH] MOBILE-3195 login: Allow to disable forgotten password --- .../login/pages/credentials/credentials.html | 2 +- .../login/pages/credentials/credentials.ts | 18 +++++-- src/core/login/pages/reconnect/reconnect.html | 2 +- src/core/login/pages/reconnect/reconnect.ts | 15 ++++-- src/core/login/providers/helper.ts | 50 ++++++++++++++++--- 5 files changed, 70 insertions(+), 17 deletions(-) diff --git a/src/core/login/pages/credentials/credentials.html b/src/core/login/pages/credentials/credentials.html index e34139c6c..467bb49dd 100644 --- a/src/core/login/pages/credentials/credentials.html +++ b/src/core/login/pages/credentials/credentials.html @@ -36,7 +36,7 @@ -
+ diff --git a/src/core/login/pages/credentials/credentials.ts b/src/core/login/pages/credentials/credentials.ts index de94968cf..ed0b43d0e 100644 --- a/src/core/login/pages/credentials/credentials.ts +++ b/src/core/login/pages/credentials/credentials.ts @@ -43,6 +43,7 @@ export class CoreLoginCredentialsPage { pageLoaded = false; isBrowserSSO = false; isFixedUrlSet = false; + showForgottenPassword = true; protected siteConfig; protected eventThrown = false; @@ -50,9 +51,14 @@ export class CoreLoginCredentialsPage { protected siteId: string; protected urlToOpen: string; - constructor(private navCtrl: NavController, navParams: NavParams, fb: FormBuilder, private appProvider: CoreAppProvider, - private sitesProvider: CoreSitesProvider, private loginHelper: CoreLoginHelperProvider, - private domUtils: CoreDomUtilsProvider, private translate: TranslateService, + constructor(private navCtrl: NavController, + navParams: NavParams, + fb: FormBuilder, + private appProvider: CoreAppProvider, + private sitesProvider: CoreSitesProvider, + private loginHelper: CoreLoginHelperProvider, + private domUtils: CoreDomUtilsProvider, + private translate: TranslateService, private eventsProvider: CoreEventsProvider) { this.siteUrl = navParams.get('siteUrl'); @@ -149,9 +155,13 @@ export class CoreLoginCredentialsPage { this.siteName = CoreConfigConstants.sitename ? CoreConfigConstants.sitename : this.siteConfig.sitename; this.logoUrl = this.siteConfig.logourl || this.siteConfig.compactlogourl; this.authInstructions = this.siteConfig.authinstructions || this.translate.instant('core.login.loginsteps'); - this.canSignup = this.siteConfig.registerauth == 'email' && !this.loginHelper.isEmailSignupDisabled(this.siteConfig); this.identityProviders = this.loginHelper.getValidIdentityProviders(this.siteConfig); + const disabledFeatures = this.loginHelper.getDisabledFeatures(this.siteConfig); + this.canSignup = this.siteConfig.registerauth == 'email' && + !this.loginHelper.isEmailSignupDisabled(this.siteConfig, disabledFeatures); + this.showForgottenPassword = !this.loginHelper.isForgottenPasswordDisabled(this.siteConfig, disabledFeatures); + if (!this.eventThrown && !this.viewLeft) { this.eventThrown = true; this.eventsProvider.trigger(CoreEventsProvider.LOGIN_SITE_CHECKED, { config: this.siteConfig }); diff --git a/src/core/login/pages/reconnect/reconnect.html b/src/core/login/pages/reconnect/reconnect.html index 99e9ab99d..1aed56c2a 100644 --- a/src/core/login/pages/reconnect/reconnect.html +++ b/src/core/login/pages/reconnect/reconnect.html @@ -50,7 +50,7 @@ -