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

MOBILE-3401 login: Prevent reconnect page created several times

main
Dani Palou 2020-06-10 11:40:12 +02:00
parent 428e753ca6
commit 4ef18b7ec5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/login/providers/helper.ts
View File

@ -83,6 +83,7 @@ export class CoreLoginHelperProvider {
protected isSSOConfirmShown = false; protected isSSOConfirmShown = false;
protected isOpenEditAlertShown = false; protected isOpenEditAlertShown = false;
protected pageToLoad: {page: string, params: any, time: number}; // Page to load once main menu is opened. protected pageToLoad: {page: string, params: any, time: number}; // Page to load once main menu is opened.
protected isOpeningReconnect = false;
waitingForBrowser = false; waitingForBrowser = false;
constructor(logger: CoreLoggerProvider, private sitesProvider: CoreSitesProvider, private domUtils: CoreDomUtilsProvider, constructor(logger: CoreLoggerProvider, private sitesProvider: CoreSitesProvider, private domUtils: CoreDomUtilsProvider,
@ -1135,7 +1136,7 @@ export class CoreLoginHelperProvider {
} }
const info = currentSite.getInfo(); const info = currentSite.getInfo();
if (typeof info != 'undefined' && typeof info.username != 'undefined') { if (typeof info != 'undefined' && typeof info.username != 'undefined' && !this.isOpeningReconnect) {
const rootNavCtrl = this.appProvider.getRootNavController(), const rootNavCtrl = this.appProvider.getRootNavController(),
activePage = rootNavCtrl.getActive(); activePage = rootNavCtrl.getActive();
@ -1144,6 +1145,8 @@ export class CoreLoginHelperProvider {
return; return;
} }
this.isOpeningReconnect = true;
rootNavCtrl.setRoot('CoreLoginReconnectPage', { rootNavCtrl.setRoot('CoreLoginReconnectPage', {
infoSiteUrl: info.siteurl, infoSiteUrl: info.siteurl,
siteUrl: result.siteUrl, siteUrl: result.siteUrl,
@ -1151,6 +1154,8 @@ export class CoreLoginHelperProvider {
pageName: data.pageName, pageName: data.pageName,
pageParams: data.params, pageParams: data.params,
siteConfig: result.config siteConfig: result.config
}).finally(() => {
this.isOpeningReconnect = false;
}); });
} }
} }