EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-4059 login: Show help without support link

main
Noel De Martin 2022-11-07 13:01:59 +01:00
parent 9b0200c3bf
commit fc55a31872
9 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/langindex.json
View File

@ -1932,6 +1932,7 @@
"core.login.errorqrnoscheme": "local_moodlemobileapp", "core.login.errorqrnoscheme": "local_moodlemobileapp",
"core.login.errorupdatesite": "local_moodlemobileapp", "core.login.errorupdatesite": "local_moodlemobileapp",
"core.login.exceededloginattempts": "local_moodlemobileapp", "core.login.exceededloginattempts": "local_moodlemobileapp",
"core.login.exceededloginattemptsfallback": "local_moodlemobileapp",
"core.login.exceededloginattemptssupportsubject": "local_moodlemobileapp", "core.login.exceededloginattemptssupportsubject": "local_moodlemobileapp",
"core.login.exceededpasswordresetattempts": "local_moodlemobileapp", "core.login.exceededpasswordresetattempts": "local_moodlemobileapp",
"core.login.exceededpasswordresetattemptssupportsubject": "local_moodlemobileapp", "core.login.exceededpasswordresetattemptssupportsubject": "local_moodlemobileapp",

4
src/core/features/login/components/exceeded-attempts/exceeded-attempts.html
View File

@ -1,11 +1,11 @@
<ion-card *ngIf="canContactSupport" class="core-danger-card"> <ion-card class="core-danger-card">
<ion-item> <ion-item>
<ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon> <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
<ion-label> <ion-label>
<p> <p>
<ng-content></ng-content> <ng-content></ng-content>
</p> </p>
<ion-button fill="outline" color="medium" (click)="contactSupport()"> <ion-button *ngIf="canContactSupport" fill="outline" color="medium" (click)="contactSupport()">
{{ 'core.contactsupport' | translate }} {{ 'core.contactsupport' | translate }}
</ion-button> </ion-button>
</ion-label> </ion-label>

3
src/core/features/login/lang.json
View File

@ -28,7 +28,8 @@
"errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. <strong>Please use the URL of your school or organization's site.</strong>", "errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. <strong>Please use the URL of your school or organization's site.</strong>",
"errorqrnoscheme": "This URL isn't a valid login URL.", "errorqrnoscheme": "This URL isn't a valid login URL.",
"errorupdatesite": "An error occurred while updating the site's token.", "errorupdatesite": "An error occurred while updating the site's token.",
"exceededloginattempts": "Need help logging in? Try recovering your password or contact your site support", "exceededloginattempts": "Need help logging in? Try recovering your password or contact your site support.",
"exceededloginattemptsfallback": "Need help logging in? Try recovering your password.",
"exceededloginattemptssupportsubject": "I can't log in", "exceededloginattemptssupportsubject": "I can't log in",
"exceededpasswordresetattempts": "It seems you are having trouble accessing your account. You can contact your school or learning provider or try again later.", "exceededpasswordresetattempts": "It seems you are having trouble accessing your account. You can contact your school or learning provider or try again later.",
"exceededpasswordresetattemptssupportsubject": "I can't reset my password", "exceededpasswordresetattemptssupportsubject": "I can't reset my password",

7
src/core/features/login/pages/credentials/credentials.html
View File

@ -35,7 +35,12 @@
<core-login-exceeded-attempts *ngIf="supportConfig && loginAttempts >= 3" [supportConfig]="supportConfig" <core-login-exceeded-attempts *ngIf="supportConfig && loginAttempts >= 3" [supportConfig]="supportConfig"
[supportSubject]="'core.login.exceededloginattemptssupportsubject' | translate"> [supportSubject]="'core.login.exceededloginattemptssupportsubject' | translate">
{{ 'core.login.exceededloginattempts' | translate }} <span *ngIf="canContactSupport">
{{ 'core.login.exceededloginattempts' | translate }}
</span>
<span *ngIf="!canContactSupport">
{{ 'core.login.exceededloginattemptsfallback' | translate }}
</span>
</core-login-exceeded-attempts> </core-login-exceeded-attempts>
<form [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #credentialsForm> <form [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #credentialsForm>

2
src/core/features/login/pages/credentials/credentials.ts
View File

@ -59,6 +59,7 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
showScanQR = false; showScanQR = false;
loginAttempts = 0; loginAttempts = 0;
supportConfig?: CoreUserSupportConfig; supportConfig?: CoreUserSupportConfig;
canContactSupport?: boolean;
protected siteConfig?: CoreSitePublicConfigResponse; protected siteConfig?: CoreSitePublicConfigResponse;
protected eventThrown = false; protected eventThrown = false;
@ -82,6 +83,7 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
this.siteConfig = CoreNavigator.getRouteParam<CoreSitePublicConfigResponse>('siteConfig'); this.siteConfig = CoreNavigator.getRouteParam<CoreSitePublicConfigResponse>('siteConfig');
this.urlToOpen = CoreNavigator.getRouteParam('urlToOpen'); this.urlToOpen = CoreNavigator.getRouteParam('urlToOpen');
this.supportConfig = this.siteConfig && new CoreUserGuestSupportConfig(this.siteConfig); this.supportConfig = this.siteConfig && new CoreUserGuestSupportConfig(this.siteConfig);
this.canContactSupport = this.supportConfig?.canContactSupport();
} catch (error) { } catch (error) {
CoreDomUtils.showErrorModal(error); CoreDomUtils.showErrorModal(error);

2
src/core/features/login/pages/forgotten-password/forgotten-password.html
View File

@ -11,7 +11,7 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="list-item-limited-width"> <div class="list-item-limited-width">
<core-login-exceeded-attempts *ngIf="supportConfig && wasPasswordResetRequestedRecently" [supportConfig]="supportConfig" <core-login-exceeded-attempts *ngIf="canContactSupport && wasPasswordResetRequestedRecently" [supportConfig]="supportConfig"
[supportSubject]="'core.login.exceededpasswordresetattemptssupportsubject' | translate"> [supportSubject]="'core.login.exceededpasswordresetattemptssupportsubject' | translate">
{{ 'core.login.exceededpasswordresetattempts' | translate }} {{ 'core.login.exceededpasswordresetattempts' | translate }}
</core-login-exceeded-attempts> </core-login-exceeded-attempts>

2
src/core/features/login/pages/forgotten-password/forgotten-password.ts
View File

@ -41,6 +41,7 @@ export class CoreLoginForgottenPasswordPage implements OnInit {
siteUrl!: string; siteUrl!: string;
autoFocus!: boolean; autoFocus!: boolean;
supportConfig?: CoreUserSupportConfig; supportConfig?: CoreUserSupportConfig;
canContactSupport?: boolean;
wasPasswordResetRequestedRecently = false; wasPasswordResetRequestedRecently = false;
constructor(protected formBuilder: FormBuilder) {} constructor(protected formBuilder: FormBuilder) {}
@ -67,6 +68,7 @@ export class CoreLoginForgottenPasswordPage implements OnInit {
}); });
this.supportConfig = siteConfig && new CoreUserGuestSupportConfig(siteConfig); this.supportConfig = siteConfig && new CoreUserGuestSupportConfig(siteConfig);
this.canContactSupport = this.supportConfig?.canContactSupport();
this.wasPasswordResetRequestedRecently = await CoreLoginHelper.wasPasswordResetRequestedRecently(siteUrl); this.wasPasswordResetRequestedRecently = await CoreLoginHelper.wasPasswordResetRequestedRecently(siteUrl);
} }

7
src/core/features/login/pages/reconnect/reconnect.html
View File

@ -45,7 +45,12 @@
<core-login-exceeded-attempts *ngIf="supportConfig && reconnectAttempts >= 3" [supportConfig]="supportConfig" <core-login-exceeded-attempts *ngIf="supportConfig && reconnectAttempts >= 3" [supportConfig]="supportConfig"
[supportSubject]="'core.login.exceededloginattemptssupportsubject' | translate"> [supportSubject]="'core.login.exceededloginattemptssupportsubject' | translate">
{{ 'core.login.exceededloginattempts' | translate }} <span *ngIf="canContactSupport">
{{ 'core.login.exceededloginattempts' | translate }}
</span>
<span *ngIf="!canContactSupport">
{{ 'core.login.exceededloginattemptsfallback' | translate }}
</span>
</core-login-exceeded-attempts> </core-login-exceeded-attempts>
</div> </div>
<form *ngIf="!isOAuth" [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #reconnectForm> <form *ngIf="!isOAuth" [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #reconnectForm>

2
src/core/features/login/pages/reconnect/reconnect.ts
View File

@ -61,6 +61,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
showLoading = true; showLoading = true;
reconnectAttempts = 0; reconnectAttempts = 0;
supportConfig?: CoreUserSupportConfig; supportConfig?: CoreUserSupportConfig;
canContactSupport?: boolean;
protected siteConfig?: CoreSitePublicConfigResponse; protected siteConfig?: CoreSitePublicConfigResponse;
protected viewLeft = false; protected viewLeft = false;
@ -108,6 +109,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
this.siteUrl = site.infos.siteurl; this.siteUrl = site.infos.siteurl;
this.siteName = site.getSiteName(); this.siteName = site.getSiteName();
this.supportConfig = new CoreUserAuthenticatedSupportConfig(site); this.supportConfig = new CoreUserAuthenticatedSupportConfig(site);
this.canContactSupport = this.supportConfig.canContactSupport();
// If login was OAuth we should only reach this page if the OAuth method ID has changed. // If login was OAuth we should only reach this page if the OAuth method ID has changed.
this.isOAuth = site.isOAuth(); this.isOAuth = site.isOAuth();