Update to 2.6.9

- Resolved cookies being cleared, even if not selected to be handled
jrie · Jan 4, 2018 · e6a477a · e6a477a
1 parent ffc138f
commit e6a477a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/cookies.js b/cookies.js
@@ -322,16 +322,24 @@ async function clearCookiesAction (action, data, cookies, domainURL) {
       }
     }
   } else {
+    if (data[domainURL] === undefined) {
+      return
+    }
+
     for (let cookie of cookieData[domainURL]) {
-      if (hasProfile && hasLogged && data['flagCookies_logged'][domainURL][cookie.name] !== undefined) {
-        let msg = "Allowed profile cookie on '" + action + "', cookie: '" + cookie.name + "' for '" + domainURL + "'"
+      if (data[domainURL][cookie.name] === undefined) {
+        continue
+      }
+
+      if (data[domainURL][cookie.name] === false) {
+        let msg = "Permitted cookie on '" + action + "', cookie: '" + cookie.name + "' for '" + domainURL + "'"
         addToLogData(msg)
         if (hasConsole) console.log(msg)
         continue
       }
 
-      if (data[domainURL] !== undefined && data[domainURL][cookie.name] !== undefined && data[domainURL][cookie.name] === false) {
-        let msg = "Permitted cookie on '" + action + "', cookie: '" + cookie.name + "' for '" + domainURL + "'"
+      if (hasProfile && hasLogged && data['flagCookies_logged'][domainURL][cookie.name] !== undefined) {
+        let msg = "Allowed profile cookie on '" + action + "', cookie: '" + cookie.name + "' for '" + domainURL + "'"
         addToLogData(msg)
         if (hasConsole) console.log(msg)
         continue

diff --git a/manifest.json b/manifest.json
@@ -31,7 +31,7 @@
   "homepage_url": "https://github.com/jrie/flagCookies",
   "manifest_version": 2,
   "name": "Flag Cookies",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "permissions": ["cookies", "tabs", "webNavigation", "<all_urls>", "storage", "unlimitedStorage"],
   "background": {
     "scripts": [