mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2025-12-06 02:30:47 -08:00
Code Issues Projects Releases Packages Wiki Activity

Fix Yandex Music auth links are open in browser (#139)

Browse source
This commit is contained in:
Quang Lam 2020-02-16 00:11:52 -06:00 • committed by GitHub
parent 9fd55d3058
commit d035bdbcb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
public/libs/views.js
View file

@ -61,6 +61,22 @@ const equivalentDomain = (domain) => {
return eDomain; return eDomain;
}; };
const isInternalUrl = (url, currentInternalUrls) => {
const domain = equivalentDomain(extractDomain(url));
const matchedInternalUrl = currentInternalUrls.find((internalUrl) => {
const internalDomain = equivalentDomain(extractDomain(internalUrl));
// domains match
return domain === internalDomain
// domains don't match, but current domain is referred
// tends to occur when authentication is placed on different domain
// Ex: music.yandex.ru => passport.yandex.ru?retpath=....music.yandex.ru
// https://github.com/quanglam2807/webcatalog/issues/546
|| url.includes(internalDomain);
});
return Boolean(matchedInternalUrl);
};
const addView = (browserWindow, workspace) => { const addView = (browserWindow, workspace) => {
if (views[workspace.id] != null) return; if (views[workspace.id] != null) return;
@ -213,8 +229,10 @@ const addView = (browserWindow, workspace) => {
}); });
const handleNewWindow = (e, nextUrl, frameName, disposition, options) => { const handleNewWindow = (e, nextUrl, frameName, disposition, options) => {
const appDomain = extractDomain(getWorkspace(workspace.id).homeUrl); const appUrl = getWorkspace(workspace.id).homeUrl;
const currentDomain = extractDomain(e.sender.getURL()); const appDomain = extractDomain(appUrl);
const currentUrl = e.sender.getURL();
const currentDomain = extractDomain(currentUrl);
const nextDomain = extractDomain(nextUrl); const nextDomain = extractDomain(nextUrl);
// load in same window // load in same window
@ -223,7 +241,7 @@ const addView = (browserWindow, workspace) => {
nextDomain === 'accounts.google.com' nextDomain === 'accounts.google.com'
// https://github.com/quanglam2807/webcatalog/issues/315 // https://github.com/quanglam2807/webcatalog/issues/315
|| ((appDomain.includes('asana.com') || currentDomain.includes('asana.com')) && nextDomain.includes('asana.com')) || ((appDomain.includes('asana.com') || currentDomain.includes('asana.com')) && nextDomain.includes('asana.com'))
|| (disposition === 'foreground-tab' && (nextDomain === appDomain || nextDomain === currentDomain)) || (disposition === 'foreground-tab' && isInternalUrl(nextUrl, [appUrl, currentUrl]))
) { ) {
e.preventDefault(); e.preventDefault();
adjustUserAgentByUrl(nextUrl); adjustUserAgentByUrl(nextUrl);
@ -232,8 +250,7 @@ const addView = (browserWindow, workspace) => {
} }
// open new window // open new window
if (equivalentDomain(nextDomain) === equivalentDomain(appDomain) if (isInternalUrl(nextUrl, [appUrl, currentUrl])) {
|| equivalentDomain(nextDomain) === equivalentDomain(currentDomain)) {
// https://gist.github.com/Gvozd/2cec0c8c510a707854e439fb15c561b0 // https://gist.github.com/Gvozd/2cec0c8c510a707854e439fb15c561b0
e.preventDefault(); e.preventDefault();
const newOptions = { const newOptions = {
@ -272,10 +289,8 @@ const addView = (browserWindow, workspace) => {
const popupWin = new BrowserWindow(newOptions); const popupWin = new BrowserWindow(newOptions);
popupWin.webContents.on('new-window', handleNewWindow); popupWin.webContents.on('new-window', handleNewWindow);
popupWin.webContents.once('will-navigate', (_, url) => { popupWin.webContents.once('will-navigate', (_, url) => {
const retrievedDomain = extractDomain(url);
// if the window is used for the current app, then use default behavior // if the window is used for the current app, then use default behavior
if (equivalentDomain(retrievedDomain) === equivalentDomain(appDomain) if (isInternalUrl(url, [appUrl, currentUrl])) {
|| equivalentDomain(retrievedDomain) === equivalentDomain(currentDomain)) {
popupWin.show(); popupWin.show();
} else { // if not, open in browser } else { // if not, open in browser
e.preventDefault(); e.preventDefault();