diff options
Diffstat (limited to '')
| -rw-r--r-- | src/assets/javascripts/general.js | 1 | ||||
| -rw-r--r-- | src/assets/javascripts/services.js | 3 | ||||
| -rw-r--r-- | src/assets/javascripts/utils.js | 56 |
3 files changed, 20 insertions, 40 deletions
diff --git a/src/assets/javascripts/general.js b/src/assets/javascripts/general.js index 6eb0a454..9e490c4a 100644 --- a/src/assets/javascripts/general.js +++ b/src/assets/javascripts/general.js @@ -33,7 +33,6 @@ async function initDefaults() { theme: "detect", popupServices: ["youtube", "twitter", "instagram", "tiktok", "imgur", "reddit", "quora", "translate", "maps"], autoRedirect: false, - firstPartyIsolate: false, network: "clearnet", networkFallback: true, latencyThreshold: 1000, diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js index a2e12138..2cb3fedd 100644 --- a/src/assets/javascripts/services.js +++ b/src/assets/javascripts/services.js @@ -521,7 +521,7 @@ function unifyPreferences(url, tabId) { const frontendObject = config.services[service].frontends[frontend]
if ("cookies" in frontendObject.preferences) {
for (const cookie of frontendObject.preferences.cookies) {
- await utils.copyCookie(frontendObject, url, instancesList, cookie)
+ await utils.copyCookie(url, instancesList, cookie)
}
}
if ("localstorage" in frontendObject.preferences) {
@@ -652,7 +652,6 @@ function upgradeOptions() { options.popupServices.splice(tmp, 1)
options.popupServices.push("sendFiles")
}
- options.firstPartyIsolate = r.firstPartyIsolate
options.autoRedirect = r.autoRedirect
switch (r.onlyEmbeddedVideo) {
case "onlyNotEmbedded":
diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js index 62041690..1f09435c 100644 --- a/src/assets/javascripts/utils.js +++ b/src/assets/javascripts/utils.js @@ -280,46 +280,28 @@ async function testLatency(element, instances, frontend) { }) } -function copyCookie(frontend, targetUrl, urls, name) { +function copyCookie(targetUrl, urls, name) { return new Promise(resolve => { - browser.storage.local.get("options", r => { - let query - if (!r.options.firstPartyIsolate) - query = { - url: protocolHost(targetUrl), - name: name, - } - else - query = { - url: protocolHost(targetUrl), - name: name, - firstPartyDomain: null, - } - browser.cookies.getAll(query, async cookies => { - for (const cookie of cookies) - if (cookie.name == name) { - for (const url of urls) { - const setQuery = r.options.firstPartyIsolate - ? { - url: url, - name: name, - value: cookie.value, - secure: true, - firstPartyDomain: new URL(url).hostname, - } - : { - url: url, - name: name, - value: cookie.value, - secure: true, - expirationDate: cookie.expirationDate, - } - browser.cookies.set(setQuery) + const query = { + url: protocolHost(targetUrl), + name: name, + } + browser.cookies.getAll(query, async cookies => { + for (const cookie of cookies) + if (cookie.name == name) { + for (const url of urls) { + const setQuery = { + url: url, + name: name, + value: cookie.value, + secure: true, + expirationDate: cookie.expirationDate, } - break + browser.cookies.set(setQuery) } - resolve() - }) + break + } + resolve() }) }) } |