Removed FPI settings unifying as it superceded by dFPI & ETP

5 files changed, 21 insertions, 44 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()
 		})
 	})
 }
diff --git a/src/config/config.json b/src/config/config.json
index d006f8ba..628bd460 100644
--- a/src/config/config.json
+++ b/src/config/config.json
@@ -138,7 +138,7 @@
 						],

 						"indexeddb": "hyperpipedb"

 					},

-					"name": "HyperPipe",

+					"name": "Hyperpipe",

 					"instanceList": true

 				}

 			},

diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js
index d133617b..164d9b89 100644
--- a/src/pages/options/widgets/general.js
+++ b/src/pages/options/widgets/general.js
@@ -170,8 +170,6 @@ for (const service in config.services) {
 		})
 	})
 }
-// const firstPartyIsolate = document.getElementById('firstPartyIsolate');
-// firstPartyIsolate.addEventListener("change", () => browser.storage.local.set({ firstPartyIsolate: firstPartyIsolate.checked }))
 
 browser.storage.local.get("options", r => {
 	autoRedirectElement.checked = r.options.autoRedirect
@@ -180,7 +178,6 @@ browser.storage.local.get("options", r => {
 	networkFallbackCheckbox.checked = r.options.networkFallback
 	latencyOutput.value = r.options.latencyThreshold
 	let options = r.options
-	// firstPartyIsolate.checked = r.firstPartyIsolate;
 
 	//let networkFallbackElement = document.getElementById("network-fallback")
 	if (networkElement.value == "clearnet") {