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

Merge pull request #1773 from dpalou/MOBILE-2882 

MOBILE-2882 mac: Restore browser SSO in Mac app
main
Juan Leyva 2019-02-18 17:03:00 +01:00 committed by GitHub
parent 6d829452c6 7f7d5a54dc
commit 212bc572e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,8 +561,8 @@ export class CoreLoginHelperProvider {
* @return {boolean} True if embedded browser, false othwerise. * @return {boolean} True if embedded browser, false othwerise.
*/ */
isSSOEmbeddedBrowser(code: number): boolean { isSSOEmbeddedBrowser(code: number): boolean {
if (this.appProvider.isLinux() || this.appProvider.isMac()) { if (this.appProvider.isLinux()) {
// In Linux and Mac desktop apps, always use embedded browser. // In Linux desktop app, always use embedded browser.
return true; return true;
} }
@ -647,8 +647,8 @@ export class CoreLoginHelperProvider {
loginUrl += '&oauthsso=' + params.id; loginUrl += '&oauthsso=' + params.id;
if (this.appProvider.isLinux() || this.appProvider.isMac()) { if (this.appProvider.isLinux()) {
// In Linux and Mac desktop apps, always use embedded browser. // In Linux desktop app, always use embedded browser.
this.utils.openInApp(loginUrl); this.utils.openInApp(loginUrl);
} else { } else {
// Always open it in browser because the user might have the session stored in there. // Always open it in browser because the user might have the session stored in there.