Skip to content

Compatibility with TC after unmapped url isolation change #74

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

Closed
stoically wants to merge 1 commit into from
Closed

Compatibility with TC after unmapped url isolation change #74

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
17 changes: 14 additions & 3 deletions src/webRequestListener.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ const createTab = (url, newTabIndex, currentTabId, cookieStoreId) => {
};
};

const isTmpContainer = async(cookieStoreId) => {
try {
return await browser.runtime.sendMessage('{c607c8df-14a7-4f28-894f-29e8722976af}', {
method: 'isTempContainer',
cookieStoreId,
});
} catch (error) {
return false;
}
};

export const webRequestListener = (requestDetails) => {

if (requestDetails.frameId !== 0 || requestDetails.tabId === -1) {
Expand All @@ -28,7 +39,7 @@ export const webRequestListener = (requestDetails) => {
Storage.get(requestDetails.url),
ContextualIdentity.getAll(),
Tabs.get(requestDetails.tabId),
]).then(([hostMap, identities, currentTab]) => {
]).then(async ([hostMap, identities, currentTab]) => {

if (currentTab.incognito || !hostMap) {
return {};
Expand All @@ -38,10 +49,10 @@ export const webRequestListener = (requestDetails) => {
const tabIdentity = identities.find((identity) => identity.cookieStoreId === currentTab.cookieStoreId);

if (hostIdentity && hostIdentity.cookieStoreId !== currentTab.cookieStoreId) {
return createTab(requestDetails.url, currentTab.index + 1, currentTab.id, hostIdentity.cookieStoreId);
return createTab(requestDetails.url, currentTab.index + 1, currentTab.id, hostIdentity.cookieStoreId);
}

if (!hostIdentity && tabIdentity) {
if (!hostIdentity && tabIdentity && !await isTmpContainer(currentTab.cookieStoreId)) {
return createTab(requestDetails.url, currentTab.index + 1, currentTab.id);
}

Expand Down