mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-02-25 17:41:01 -08:00
Code Issues Projects Releases Packages Wiki Activity

Fix switching account in Google apps opens pop up window (#260)

Browse source
This commit is contained in:
Quang Lam 2020-05-16 12:47:21 +07:00 • committed by GitHub
parent 34e1f8cc16
commit fcc340a869
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
public/libs/views.js
View file

@ -425,8 +425,17 @@ const addView = (browserWindow, workspace) => {
// load in same window
if (
// Google: Switch account
// Google: Add account
nextDomain === 'accounts.google.com'
// Google: Switch account
|| (
isInternalUrl(nextUrl, [appUrl, currentUrl])
&& nextDomain.indexOf('google.com') > 0
&& (
(nextUrl.indexOf('authuser=')) // https://drive.google.com/drive/u/1/priority?authuser=2 (has authuser query)
|| (/\/u\/[0-9]+\/{0,1}$/.test(nextUrl)) // https://mail.google.com/mail/u/1/ (ends with /u/1/)
)
)
// https://github.com/atomery/webcatalog/issues/315
|| ((appDomain.includes('asana.com') || currentDomain.includes('asana.com')) && nextDomain.includes('asana.com'))
) {