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

MOBILE-4201 login: Show error message if check site fails

main
Pau Ferrer Ocaña 2023-09-08 15:08:40 +02:00
parent 663f42de2a
commit 9c2133bd73
2 changed files with 86 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@
</ion-header>
<ion-content class="ion-padding limited-width">
<core-loading [hideUntil]="pageLoaded">
<ng-container *ngIf="!siteCheckError">
<div class="ion-text-wrap ion-text-center core-login-info-box">
<div class="core-login-site">
<div class="core-login-site-logo">
@ -44,8 +45,9 @@
<form [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #credentialsForm *ngIf="!isBrowserSSO">
<ion-item>
<ion-label class="sr-only">{{ 'core.login.username' | translate }}</ion-label>
<ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}" formControlName="username"
autocapitalize="none" autocorrect="off" autocomplete="username" enterkeyhint="next" required="true">
<ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}"
formControlName="username" autocapitalize="none" autocorrect="off" autocomplete="username" enterkeyhint="next"
required="true">
</ion-input>
</ion-item>
<ion-item class="ion-margin-bottom">
@ -72,7 +74,8 @@
</form>
<ng-container *ngIf="isBrowserSSO">
<ion-button expand="block" (click)="openBrowserSSO()" class="ion-margin core-login-login-inbrowser-button ion-text-wrap">
<ion-button expand="block" (click)="openBrowserSSO()"
class="ion-margin core-login-login-inbrowser-button ion-text-wrap">
{{ 'core.login.loginbutton' | translate }}
<ion-icon name="fas-up-right-from-square" slot="end" aria-hidden="true"></ion-icon>
</ion-button>
@ -97,5 +100,12 @@
<ion-button *ngIf="canSignup" expand="block" class="ion-margin ion-text-wrap" fill="outline" (click)="openEmailSignup()">
{{ 'core.login.startsignup' | translate }}
</ion-button>
</ng-container>
<core-empty-box *ngIf="siteCheckError" icon="fas-circle-exclamation" [message]="siteCheckError">
<ion-button expand="block" (click)="checkSite()" fill="outline">
{{ 'core.tryagain' | translate }}
</ion-button>
</core-empty-box>
</core-loading>
</ion-content>

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

@ -60,6 +60,7 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
supportConfig?: CoreUserSupportConfig;
exceededAttemptsHTML?: SafeHtml | string | null;
siteConfig?: CoreSitePublicConfigResponse;
siteCheckError = '';
protected siteCheck?: CoreSiteCheckResponse;
protected eventThrown = false;
@ -103,7 +104,7 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
password: ['', Validators.required],
});
await this.checkSite(this.siteUrl);
await this.checkSite();
if (CorePlatform.isIOS() && !this.isBrowserSSO) {
// Make iOS auto-fill work. The field that isn't focused doesn't get updated, do it manually.
@ -143,18 +144,17 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
* Get site config and check if it requires SSO login.
* This should be used only if a fixed URL is set, otherwise this check is already performed in CoreLoginSitePage.
*
* @param siteUrl Site URL to check.
* @returns Promise resolved when done.
*/
protected async checkSite(siteUrl: string): Promise<void> {
async checkSite(): Promise<void> {
this.pageLoaded = false;
// If the site is configured with http:// protocol we force that one, otherwise we use default mode.
const protocol = siteUrl.indexOf('http://') === 0 ? 'http://' : undefined;
const protocol = this.siteUrl.indexOf('http://') === 0 ? 'http://' : undefined;
try {
if (!this.siteCheck) {
this.siteCheck = await CoreSites.checkSite(siteUrl, protocol);
this.siteCheck = await CoreSites.checkSite(this.siteUrl, protocol);
}
this.siteUrl = this.siteCheck.siteUrl;
@ -162,9 +162,13 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
await this.treatSiteConfig();
this.siteCheckError = '';
// Check if user needs to authenticate in a browser.
this.isBrowserSSO = CoreLoginHelper.isSSOLoginNeeded(this.siteCheck.code);
} catch (error) {
this.siteCheckError = CoreDomUtils.getErrorMessage(error) || 'Error loading site';
CoreDomUtils.showErrorModal(error);
} finally {
this.pageLoaded = true;