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

Merge pull request #4156 from dpalou/MOBILE-4606 

Mobile 4606
main
Pau Ferrer Ocaña 2024-09-03 10:41:58 +02:00 committed by GitHub
parent 7140045439 e666fdc517
commit d165b06a07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,10 +80,16 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
protected urlToOpen?: string;
protected valueChangeSubscription?: Subscription;
protected alwaysShowLoginFormObserver?: CoreEventObserver;
protected loginObserver?: CoreEventObserver;
constructor(
protected fb: FormBuilder,
) {}
) {
// Listen to LOGIN event to determine if login was successful, since the login can be done using QR, SSO, etc.
this.loginObserver = CoreEvents.on(CoreEvents.LOGIN, ({ siteId }) => {
this.siteId = siteId;
});
}
/**
* @inheritdoc
@ -297,14 +303,12 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
try {
const data = await CoreSites.getUserToken(siteUrl, username, password);
const id = await CoreSites.newSite(data.siteUrl, data.token, data.privateToken);
await CoreSites.newSite(data.siteUrl, data.token, data.privateToken);
// Reset fields so the data is not in the view anymore.
this.credForm.controls['username'].reset();
this.credForm.controls['password'].reset();
this.siteId = id;
await CoreNavigator.navigateToSiteHome({ params: { urlToOpen: this.urlToOpen } });
} catch (error) {
if (error instanceof CoreSiteError && CoreLoginHelper.isAppUnsupportedError(error)) {
@ -379,6 +383,7 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
);
this.valueChangeSubscription?.unsubscribe();
this.alwaysShowLoginFormObserver?.off();
this.loginObserver?.off();
}
}

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

@ -71,6 +71,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
protected loginSuccessful = false;
protected username = '';
protected alwaysShowLoginFormObserver?: CoreEventObserver;
protected loginObserver?: CoreEventObserver;
constructor(
protected fb: FormBuilder,
@ -81,6 +82,11 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
this.credForm = fb.group({
password: ['', Validators.required],
});
// Listen to LOGIN event to determine if login was successful, since the login can be done using QR, biometric, etc.
this.loginObserver = CoreEvents.on(CoreEvents.LOGIN, () => {
this.loginSuccessful = true;
});
}
/**
@ -151,10 +157,12 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
{
config: this.siteConfig,
loginSuccessful: this.loginSuccessful,
siteId: this.siteId,
},
this.siteId,
);
this.alwaysShowLoginFormObserver?.off();
this.loginObserver?.off();
}
/**
@ -190,7 +198,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
if (!this.eventThrown && !this.viewLeft) {
this.eventThrown = true;
CoreEvents.trigger(CoreEvents.LOGIN_SITE_CHECKED, { config: this.siteConfig });
CoreEvents.trigger(CoreEvents.LOGIN_SITE_CHECKED, { config: this.siteConfig, siteId: this.siteId });
}
this.isBrowserSSO = CoreLoginHelper.isSSOLoginNeeded(this.siteConfig.typeoflogin);
@ -261,8 +269,6 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
this.credForm.controls['password'].reset();
// Go to the site initial page.
this.loginSuccessful = true;
await CoreNavigator.navigateToSiteHome({
params: this.redirectData,
});

12
src/core/features/styles/services/styles.ts
View File

@ -148,8 +148,15 @@ export class CoreStylesService {
this.removeSite(site.getId());
});
// Load temporary styles when site config is checked in login.
// Load temporary styles when site config is checked in login/reconnect.
CoreEvents.on(CoreEvents.LOGIN_SITE_CHECKED, (data) => {
if (data.siteId) {
// Reconnecting to a site, enable the site styles.
this.enableSiteStyles(data.siteId);
return;
}
this.loadTmpStyles(data.config).catch((error) => {
this.logger.error('Error loading tmp styles', error);
});
@ -163,8 +170,9 @@ export class CoreStylesService {
return;
}
// The tmp styles are from a site that wasn't added in the end. Just remove them.
// User didn't access the site, unload tmp styles and site styles if any.
this.unloadTmpStyles();
this.clear();
});
}

2
src/core/services/sites.ts
View File

@ -1443,7 +1443,7 @@ export class CoreSitesProvider {
async login(siteId: string): Promise<void> {
await CoreConfig.set(CORE_SITE_CURRENT_SITE_ID_CONFIG, siteId);
CoreEvents.trigger(CoreEvents.LOGIN, {}, siteId);
CoreEvents.trigger(CoreEvents.LOGIN, { siteId }, siteId);
}
/**

2
src/core/services/tests/sites.test.ts
View File

@ -72,7 +72,7 @@ describe('CoreSitesProvider', () => {
getCurrentSiteId: () => '42',
});
CoreEvents.trigger(CoreEvents.LOGIN, {}, '42');
CoreEvents.trigger(CoreEvents.LOGIN, { siteId: '42' }, '42');
// Wait the event to be processed.
await CoreWait.nextTick();

3
src/core/singletons/events.ts
View File

@ -56,6 +56,7 @@ export interface CoreEventsData {
[CoreEvents.IAB_LOAD_START]: InAppBrowserEvent;
[CoreEvents.IAB_LOAD_STOP]: InAppBrowserEvent;
[CoreEvents.IAB_MESSAGE]: Record<string, unknown>;
[CoreEvents.LOGIN]: { siteId: string };
[CoreEvents.LOGIN_SITE_CHECKED]: CoreEventLoginSiteCheckedData;
[CoreEvents.LOGIN_SITE_UNCHECKED]: CoreEventLoginSiteUncheckedData;
[CoreEvents.SEND_ON_ENTER_CHANGED]: CoreEventSendOnEnterChangedData;
@ -428,6 +429,7 @@ export type CoreEventActivityDataSentData = {
*/
export type CoreEventLoginSiteCheckedData = {
config: CoreSitePublicConfigResponse;
siteId?: string;
};
/**
@ -436,6 +438,7 @@ export type CoreEventLoginSiteCheckedData = {
export type CoreEventLoginSiteUncheckedData = {
config?: CoreSitePublicConfigResponse;
loginSuccessful: boolean;
siteId?: string;
};
/**