Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/login/pages/credentials/credentials.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</form>

<!-- Forgotten password button. -->
<div padding-top class="core-login-forgotten-password">
<div *ngIf="showForgottenPassword" padding-top class="core-login-forgotten-password">
<button ion-button block text-wrap color="light" (click)="forgottenPassword()">{{ 'core.login.forgotten' | translate }}</button>
</div>

Expand Down
18 changes: 14 additions & 4 deletions src/core/login/pages/credentials/credentials.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,22 @@ export class CoreLoginCredentialsPage {
pageLoaded = false;
isBrowserSSO = false;
isFixedUrlSet = false;
showForgottenPassword = true;

protected siteConfig;
protected eventThrown = false;
protected viewLeft = false;
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');
Expand Down Expand Up @@ -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 });
Expand Down
2 changes: 1 addition & 1 deletion src/core/login/pages/reconnect/reconnect.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</ion-list>

<!-- Forgotten password button. -->
<div padding-top class="core-login-forgotten-password">
<div *ngIf="showForgottenPassword" padding-top class="core-login-forgotten-password">
<button ion-button block text-wrap color="light" (click)="forgottenPassword()">{{ 'core.login.forgotten' | translate }}</button>
</div>

Expand Down
15 changes: 11 additions & 4 deletions src/core/login/pages/reconnect/reconnect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export class CoreLoginReconnectPage {
logoUrl: string;
identityProviders: any[];
site: any;
showForgottenPassword = true;

protected infoSiteUrl: string;
protected pageName: string;
Expand All @@ -44,9 +45,13 @@ export class CoreLoginReconnectPage {
protected isLoggedOut: boolean;
protected siteId: string;

constructor(private navCtrl: NavController, navParams: NavParams, fb: FormBuilder, private appProvider: CoreAppProvider,
private sitesProvider: CoreSitesProvider, private loginHelper: CoreLoginHelperProvider,
private domUtils: CoreDomUtilsProvider) {
constructor(private navCtrl: NavController,
navParams: NavParams,
fb: FormBuilder,
private appProvider: CoreAppProvider,
private sitesProvider: CoreSitesProvider,
private loginHelper: CoreLoginHelperProvider,
private domUtils: CoreDomUtilsProvider) {

const currentSite = this.sitesProvider.getCurrentSite();

Expand All @@ -69,6 +74,7 @@ export class CoreLoginReconnectPage {
ionViewDidLoad(): void {
if (this.siteConfig) {
this.identityProviders = this.loginHelper.getValidIdentityProviders(this.siteConfig);
this.showForgottenPassword = !this.loginHelper.isForgottenPasswordDisabled(this.siteConfig);
}

this.sitesProvider.getSite(this.siteId).then((site) => {
Expand All @@ -87,9 +93,10 @@ export class CoreLoginReconnectPage {
// Check logoURL if user avatar is not set.
if (this.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) {
this.site.avatar = false;

this.logoUrl = config.logourl || config.compactlogourl;
}

this.showForgottenPassword = !this.loginHelper.isForgottenPasswordDisabled(config);
}).catch(() => {
this.cancel();
});
Expand Down
50 changes: 43 additions & 7 deletions src/core/login/providers/helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,21 @@ export class CoreLoginHelperProvider {
});
}

/**
* Get disabled features from a site public config.
*
* @param config Site public config.
* @return Disabled features.
*/
getDisabledFeatures(config: any): string {
const disabledFeatures = config && config.tool_mobile_disabledfeatures;
if (!disabledFeatures) {
return '';
}

return this.textUtils.treatDisabledFeatures(disabledFeatures);
}

/**
* Builds an object with error messages for some common errors.
* Please notice that this function doesn't support all possible error types.
Expand Down Expand Up @@ -555,17 +570,27 @@ export class CoreLoginHelperProvider {
* Given a site public config, check if email signup is disabled.
*
* @param config Site public config.
* @param disabledFeatures List of disabled features already treated. If not provided it will be calculated.
* @return Whether email signup is disabled.
*/
isEmailSignupDisabled(config: any): boolean {
let disabledFeatures = config && config.tool_mobile_disabledfeatures;
if (!disabledFeatures) {
return false;
}
isEmailSignupDisabled(config?: any, disabledFeatures?: string): boolean {
return this.isFeatureDisabled('CoreLoginEmailSignup', config, disabledFeatures);
}

disabledFeatures = this.textUtils.treatDisabledFeatures(disabledFeatures);
/**
* Given a site public config, check if a certian feature is disabled.
*
* @param feature Feature to check.
* @param config Site public config.
* @param disabledFeatures List of disabled features already treated. If not provided it will be calculated.
* @return Whether email signup is disabled.
*/
isFeatureDisabled(feature: string, config?: any, disabledFeatures?: string): boolean {
if (typeof disabledFeatures == 'undefined') {
disabledFeatures = this.getDisabledFeatures(config);
}

const regEx = new RegExp('(,|^)CoreLoginEmailSignup(,|$)', 'g');
const regEx = new RegExp('(,|^)' + feature + '(,|$)', 'g');

return !!disabledFeatures.match(regEx);
}
Expand All @@ -583,6 +608,17 @@ export class CoreLoginHelperProvider {
return !!CoreConfigConstants.siteurl;
}

/**
* Given a site public config, check if forgotten password is disabled.
*
* @param config Site public config.
* @param disabledFeatures List of disabled features already treated. If not provided it will be calculated.
* @return Whether it's disabled.
*/
isForgottenPasswordDisabled(config?: any, disabledFeatures?: string): boolean {
return this.isFeatureDisabled('NoDelegate_ForgottenPassword', config, disabledFeatures);
}

/**
* Check if current site is logged out, triggering mmCoreEventSessionExpired if it is.
*
Expand Down