fix: append cookies instead

Author: crimx

src/components/dictionaries/network-compat.ts

@@ -155,7 +155,7 @@ async function installMv3HeaderRule(
   if (cookieHeader) {
     requestHeaders.push({
       header: 'cookie',
-      operation: 'set',
+      operation: 'append',
       value: cookieHeader
     })
   }
@@ -190,15 +190,13 @@ async function getCookieHeader(
   const partitionKey = {
     topLevelSite: options.topLevelSite
   }
-  const unpartitionedCookies = await getCookiesForRequest(cookiesApi, options)
   const partitionedCookies = await getCookiesForRequest(
     cookiesApi,
     options,
     partitionKey
   )
-  const cookies = collectCookies(unpartitionedCookies, partitionedCookies)
-  if (cookies.length > 0) {
-    return stringifyCookies(cookies)
+  if (partitionedCookies.length > 0) {
+    return stringifyCookies(partitionedCookies)
   }
 
   return stringifyCookies(
@@ -302,20 +300,6 @@ function stringifyCookies(cookies: Cookie[]) {
   return cookiePairs.join('; ')
 }
 
-function collectCookies(...cookieLists: Cookie[][]) {
-  const result: Cookie[] = []
-
-  for (const cookies of cookieLists) {
-    for (const cookie of cookies) {
-      if (cookie.name && cookie.value) {
-        result.push({ name: cookie.name, value: cookie.value })
-      }
-    }
-  }
-
-  return result
-}
-
 function setRequestHeader(
   requestHeaders: Array<{ name: string; value?: string }>,
   name: string,

test/specs/components/dictionaries/cambridge/network.spec.ts

@@ -1,5 +1,8 @@
 import { browser } from '../../../../helper'
 
+const getCookieQueryArgs = () =>
+  browser.cookies.getAll.getCalls().map(call => call.args[0])
+
 describe('Dict/Cambridge/network', () => {
   let originalWebRequest: typeof browser.webRequest
 
@@ -116,7 +119,7 @@ describe('Dict/Cambridge/network', () => {
 
     await ensureNetworkCompatibility()
 
-    expect(browser.cookies.getAll.thirdCall.args[0]).toEqual({
+    expect(getCookieQueryArgs()).toContainEqual({
       url: 'https://dictionary.cambridge.org',
       partitionKey: {
         topLevelSite: 'https://cambridge.org'
@@ -142,7 +145,7 @@ describe('Dict/Cambridge/network', () => {
     })
   })
 
-  it('should preserve same-name cookies in MV2', async () => {
+  it('should append partitioned cookies in MV2', async () => {
     browser.cookies.getAll.callsFake(options =>
       Promise.resolve(
         options.partitionKey
@@ -318,7 +321,7 @@ describe('Dict/Cambridge/network', () => {
               },
               {
                 header: 'cookie',
-                operation: 'set',
+                operation: 'append',
                 value: 'cf_clearance=next-clearance-token'
               }
             ]
@@ -362,7 +365,7 @@ describe('Dict/Cambridge/network', () => {
 
     await ensureNetworkCompatibility()
 
-    expect(browser.cookies.getAll.thirdCall.args[0]).toEqual({
+    expect(getCookieQueryArgs()).toContainEqual({
       url: 'https://dictionary.cambridge.org',
       partitionKey: {
         topLevelSite: 'https://cambridge.org'
@@ -382,7 +385,7 @@ describe('Dict/Cambridge/network', () => {
               },
               {
                 header: 'cookie',
-                operation: 'set',
+                operation: 'append',
                 value:
                   'cf_clearance=partitioned-clearance-token; cf_chl_rc_ni=1'
               }

test/specs/components/dictionaries/cobuild/network.spec.ts

@@ -1,5 +1,8 @@
 import { browser } from '../../../../helper'
 
+const getCookieQueryArgs = () =>
+  browser.cookies.getAll.getCalls().map(call => call.args[0])
+
 describe('Dict/COBUILD/network', () => {
   let originalWebRequest: typeof browser.webRequest
 
@@ -43,7 +46,7 @@ describe('Dict/COBUILD/network', () => {
 
     await ensureNetworkCompatibility()
 
-    expect(browser.cookies.getAll.thirdCall.args[0]).toEqual({
+    expect(getCookieQueryArgs()).toContainEqual({
       url: 'https://www.collinsdictionary.com',
       partitionKey: {
         topLevelSite: 'https://collinsdictionary.com'
@@ -117,7 +120,7 @@ describe('Dict/COBUILD/network', () => {
               },
               {
                 header: 'cookie',
-                operation: 'set',
+                operation: 'append',
                 value: 'cf_clearance=partitioned-clearance-token'
               }
             ]