Skip to content

MOBILE-3401 login: Fix navigation when authenticate via URL scheme #2419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 19, 2020
Merged

MOBILE-3401 login: Fix navigation when authenticate via URL scheme #2419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/core/login/providers/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,16 @@ export class CoreLoginHelperProvider {
goToNoSitePage(navCtrl: NavController, page: string, params?: any): Promise<any> {
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.
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 {
// Check if there is any site stored.
return this.sitesProvider.hasSites().then((hasSites) => {
Expand Down
2 changes: 1 addition & 1 deletion src/providers/urlschemes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export class CoreCustomURLSchemesProvider {
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));
} else {
// Token belongs to current site, no need to create it.
Expand Down