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

Merge pull request #2419 from dpalou/MOBILE-3401 

MOBILE-3401 login: Fix navigation when authenticate via URL scheme
main
Juan Leyva 2020-06-19 13:17:20 +02:00 committed by GitHub
parent 2a2e3af44d 112377ccc9
commit a1b557d926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,9 +531,16 @@ export class CoreLoginHelperProvider {
goToNoSitePage(navCtrl: NavController, page: string, params?: any): Promise<any> { goToNoSitePage(navCtrl: NavController, page: string, params?: any): Promise<any> {
navCtrl = navCtrl || this.appProvider.getRootNavController(); navCtrl = navCtrl || this.appProvider.getRootNavController();
if (page == 'CoreLoginSitesPage') { const currentPage = navCtrl && navCtrl.getActive().component.name;
if (page == currentPage) {
// Already at page, nothing to do.
} else if (page == 'CoreLoginSitesPage') {
// Just open the page as root. // Just open the page as root.
return navCtrl.setRoot(page, params); return navCtrl.setRoot(page, params);
} else if (page == 'CoreLoginCredentialsPage' && currentPage == 'CoreLoginSitePage') {
// Just open the new page to keep the navigation history.
return navCtrl.push(page, params);
} else { } else {
// Check if there is any site stored. // Check if there is any site stored.
return this.sitesProvider.hasSites().then((hasSites) => { return this.sitesProvider.hasSites().then((hasSites) => {

2
src/providers/urlschemes.ts
View File

@ -105,7 +105,7 @@ export class CoreCustomURLSchemesProvider {
await this.sitesProvider.checkRequiredMinimumVersion(result.config); await this.sitesProvider.checkRequiredMinimumVersion(result.config);
} }
return this.sitesProvider.newSite(data.siteUrl, data.token, data.privateToken, data.isSSOToken, return this.sitesProvider.newSite(data.siteUrl, data.token, data.privateToken, !!data.isSSOToken,
this.loginHelper.getOAuthIdFromParams(data.ssoUrlParams)); this.loginHelper.getOAuthIdFromParams(data.ssoUrlParams));
} else { } else {
// Token belongs to current site, no need to create it. // Token belongs to current site, no need to create it.