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

MOBILE-3523 login: Fix consecutive logins if logout+SSO

main
Dani Palou 2020-10-15 09:02:09 +02:00
parent 94b215816e
commit 0f968c6986
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/mainmenu/pages/menu/menu.ts
View File

@ -46,6 +46,7 @@ export class CoreMainMenuPage implements OnDestroy {
protected urlToOpen: string; protected urlToOpen: string;
protected mainMenuId: number; protected mainMenuId: number;
protected keyboardObserver: any; protected keyboardObserver: any;
protected resizeFunction;
@ViewChild('mainTabs') mainTabs: CoreIonTabsComponent; @ViewChild('mainTabs') mainTabs: CoreIonTabsComponent;
@ -115,7 +116,8 @@ export class CoreMainMenuPage implements OnDestroy {
} }
}); });
window.addEventListener('resize', this.initHandlers.bind(this)); this.resizeFunction = this.initHandlers.bind(this);
window.addEventListener('resize', this.resizeFunction);
if (CoreApp.instance.isIOS()) { if (CoreApp.instance.isIOS()) {
// In iOS, the resize event is triggered before the keyboard is opened/closed and not triggered again once done. // In iOS, the resize event is triggered before the keyboard is opened/closed and not triggered again once done.
@ -241,7 +243,7 @@ export class CoreMainMenuPage implements OnDestroy {
ngOnDestroy(): void { ngOnDestroy(): void {
this.subscription && this.subscription.unsubscribe(); this.subscription && this.subscription.unsubscribe();
this.redirectObs && this.redirectObs.off(); this.redirectObs && this.redirectObs.off();
window.removeEventListener('resize', this.initHandlers.bind(this)); window.removeEventListener('resize', this.resizeFunction);
CoreApp.instance.setMainMenuOpen(this.mainMenuId, false); CoreApp.instance.setMainMenuOpen(this.mainMenuId, false);
this.keyboardObserver && this.keyboardObserver.off(); this.keyboardObserver && this.keyboardObserver.off();
} }

9
src/providers/sites.ts
View File

@ -1549,11 +1549,16 @@ export class CoreSitesProvider {
await this.dbReady; await this.dbReady;
const site = await this.getSite(siteId); const site = await this.getSite(siteId);
const newValues = { const newValues: any = {
token: '', // Erase the token for security.
loggedOut: loggedOut ? 1 : 0 loggedOut: loggedOut ? 1 : 0
}; };
if (loggedOut) {
// Erase the token for security.
newValues.token = '';
site.token = '';
}
site.setLoggedOut(loggedOut); site.setLoggedOut(loggedOut);
return this.appDB.updateRecords(CoreSitesProvider.SITES_TABLE, newValues, { id: siteId }); return this.appDB.updateRecords(CoreSitesProvider.SITES_TABLE, newValues, { id: siteId });