add domain to add item

src/handler/operation/cookie.js

@@ -1,61 +1,40 @@
-import { TYPES } from "../../common.js";
-
 async function getCookie(tab, cookieStoreItems) {
-  const cookies = await chrome.cookies.getAll({ url: tabToStringUrl(tab) });
-  const cookieStoreItemsKeys = cookieStoreItems.map(({ key }) => key);
-
-  const matchCookies = cookies
-    .filter(({ name }) => cookieStoreItemsKeys.includes(name))
-    .map(({ name, value }) => ({ name, value, type: TYPES.COOKIE }));
+  const cookies = await chrome.cookies.getAll({ url: tabToStringUrl(tab), domain: cookieStoreItems.domain });
 
   return cookieStoreItems.map((item) => {
-    item.value = matchCookies.find(({ name }) => name === item.key)?.value || undefined;
+    const cookie = cookieFinder(cookies, item.key, item.domain);
+
+    let value = cookie?.value;
     if (item.subKey) {
       try {
-        item.value = JSON.parse(item.value)[item.subKey];
+        value = JSON.parse(value)[item.subKey];
       } catch {
-        item.value = undefined;
+        value = undefined;
       }
     }
-    return item;
+
+    return { ...item, value };
   });
 }
 
-async function saveCookieValue(tab, key, subKey, value) {
+async function saveCookieValue(tab, key, subKey, userDomain, value) {
   const url = tabToStringUrl(tab);
-  const domain = tabToStringDomain(tab);
-  let details = await chrome.cookies.get({
-    name: key,
-    url,
-  });
-  if (details === null) {
-    details = { name: key };
-  }
+  const domain = getCookieDomain(userDomain, url);
 
-  let newValue = value;
+  const cookies = await chrome.cookies.getAll({ url, domain });
+  const cookie = cookieFinder(cookies, key, userDomain);
 
-  if (subKey) {
-    const originalValue = details.value;
-    if (details.value !== undefined)
-      try {
-        newValue = JSON.parse(originalValue);
-      } catch (e) {
-        newValue = {};
-      }
-    else newValue = {};
-
-    newValue[subKey] = value;
-  }
+  const cookieValue = getCookieValue(subKey, value, cookie.value);
 
-  const stringifiedValue = newValue instanceof Object ? JSON.stringify(newValue) : newValue;
+  cookie.value = cookieValue;
+  cookie.domain = domain;
+  cookie.name = key;
 
-  details.value = stringifiedValue;
-
-  delete details.hostOnly;
-  delete details.session;
+  delete cookie.hostOnly;
+  delete cookie.session;
 
   return new Promise((resolve, reject) => {
-    chrome.cookies.set({ ...details, url, domain }, function (cookie) {
+    chrome.cookies.set({ ...cookie, url, domain: cookie.domain }, function (cookie) {
       if (cookie) resolve();
       else reject();
     });
@@ -67,9 +46,46 @@ function tabToStringUrl(tab) {
   return `${url.protocol}//${url.hostname}`;
 }
 
-function tabToStringDomain(tab) {
-  const url = new URL(tab.url);
-  return `.${url.hostname}`;
+function getCookieDomain(userDomain, tabUrl) {
+  let sUrl = tabUrl;
+  if (userDomain) sUrl = `http://${userDomain}`;
+
+  const url = new URL(sUrl);
+  return url.hostname;
+}
+
+function cookieFinder(cookies, key, domain) {
+  return (
+    cookies.find((cookie) => {
+      if (key !== cookie.name) return false;
+      if (domain && !isDomainMatch(domain, cookie.domain)) return false;
+      return true;
+    }) || {}
+  );
+}
+
+function isDomainMatch(itemDomain, cookieDomain) {
+  return itemDomain === cookieDomain || itemDomain === cookieDomain.substring(1);
+}
+
+function getCookieValue(subKey, newValue, originalValue) {
+  let value;
+
+  if (subKey) {
+    if (originalValue !== undefined) {
+      try {
+        value = JSON.parse(originalValue);
+      } catch (e) {
+        value = {};
+      }
+    } else value = {};
+
+    value[subKey] = newValue;
+  } else {
+    value = newValue;
+  }
+
+  return value instanceof Object ? JSON.stringify(value) : value;
 }
 
 export { getCookie, saveCookieValue };

src/handler/valueWriter.js

@@ -23,9 +23,9 @@ async function saveLocalValue(tab, key, subKey = "", value) {
   return false;
 }
 
-async function saveCookieValue(tab, key, subKey = "", value) {
+async function saveCookieValue(tab, key, subKey = "", domain, value) {
   try {
-    return await chromeSaveCookieValue(tab, key, subKey, value);
+    return await chromeSaveCookieValue(tab, key, subKey, domain, value);
   } catch (e) {
     console.log("🐶 ~ could not set cookie value for key " + key + " :", e);
   }

src/manager.js

@@ -39,7 +39,7 @@ function appManager() {
       case TYPES.LOCAL:
         return saveLocalValue(tab, item.key, item.subKey, value);
       case TYPES.COOKIE:
-        return saveCookieValue(tab, item.key, item.subKey, value);
+        return saveCookieValue(tab, item.key, item.subKey, item.domain, value);
     }
 
     return false;

src/view/items.js

@@ -43,7 +43,7 @@ function newItem({ storageType, item, actions }) {
     return [{ action: copyButton, visible: false }, { action: moreActionsButton }];
   }
 
-  function itemFooter({ id, key, subKey }) {
+  function itemFooter({ id, domain, key, subKey }) {
     const footerBody = document.createElement("div");
     addClassesToElement(footerBody, "flex flex-col mb-2");
 
@@ -55,10 +55,15 @@ function newItem({ storageType, item, actions }) {
     keyDetailsArea.appendChild(keyLabel);
 
     if (subKey) {
-      const subKeyLabel = newLabelWithBadge({ label: "Subkey", value: subKey || "" });
+      const subKeyLabel = newLabelWithBadge({ label: "Subkey", value: subKey });
       keyDetailsArea.appendChild(subKeyLabel);
     }
 
+    if (domain) {
+      const domainLabel = newLabelWithBadge({ label: "Domain", value: domain });
+      keyDetailsArea.appendChild(domainLabel);
+    }
+
     footerBody.appendChild(keyDetailsArea);
 
     const tokenArea = newTextArea({