From 103069061fa190d8d63f83511aef46ba73f58e46 Mon Sep 17 00:00:00 2001 From: Tom Milewski Date: Mon, 13 May 2024 09:21:44 -0400 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"fix(chrome-extension):=20Remove?= =?UTF-8?q?=20Origin=20from=20API=20mutation=20request=20header=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7540b0522d90afda98a2be074d350712dcadd8c4. --- .changeset/modern-steaks-think.md | 5 ---- packages/chrome-extension/src/index.ts | 35 +++----------------------- 2 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 .changeset/modern-steaks-think.md diff --git a/.changeset/modern-steaks-think.md b/.changeset/modern-steaks-think.md deleted file mode 100644 index 0e46ce98395..00000000000 --- a/.changeset/modern-steaks-think.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@clerk/chrome-extension': patch ---- - -Remove `Origin` from API mutation request headers via `onInstalled` listener. diff --git a/packages/chrome-extension/src/index.ts b/packages/chrome-extension/src/index.ts index 3c2350ba616..1a134cf1f5f 100644 --- a/packages/chrome-extension/src/index.ts +++ b/packages/chrome-extension/src/index.ts @@ -1,36 +1,9 @@ -// Override Clerk React error thrower to show that errors come from @clerk/chrome-extension -import { setErrorThrowerOptions } from '@clerk/clerk-react/internal'; -import type { DeclarativeNetRequest } from 'webextension-polyfill'; -import browser from 'webextension-polyfill'; - -setErrorThrowerOptions({ packageName: PACKAGE_NAME }); - -browser.runtime.onInstalled.addListener(() => { - const rules: DeclarativeNetRequest.Rule[] = [ - { - id: 654321, - action: { - type: 'modifyHeaders', - requestHeaders: [{ header: 'Origin', operation: 'remove' }], - }, - condition: { - initiatorDomains: [browser.runtime.id], - isUrlFilterCaseSensitive: true, - regexFilter: '.+_is_native=1.*', - requestMethods: ['post', 'put', 'delete'], - resourceTypes: ['xmlhttprequest'], - }, - }, - ]; - - void browser.declarativeNetRequest.updateDynamicRules({ - removeRuleIds: rules.map(r => r.id), - addRules: rules, - }); -}); - export * from '@clerk/clerk-react'; export type { StorageCache } from './utils/storage'; // The order matters since we want override @clerk/clerk-react ClerkProvider export { ClerkProvider } from './ClerkProvider'; + +// Override Clerk React error thrower to show that errors come from @clerk/chrome-extension +import { setErrorThrowerOptions } from '@clerk/clerk-react/internal'; +setErrorThrowerOptions({ packageName: PACKAGE_NAME }); From 88dbf31806ca255b7c87322872bf46550a41318a Mon Sep 17 00:00:00 2001 From: Tom Milewski Date: Mon, 13 May 2024 09:39:26 -0400 Subject: [PATCH 2/2] chore(chrome-extension): Revert #3363 --- .changeset/modern-steaks-think.md | 5 +++++ .changeset/rotten-mice-juggle.md | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 .changeset/modern-steaks-think.md create mode 100644 .changeset/rotten-mice-juggle.md diff --git a/.changeset/modern-steaks-think.md b/.changeset/modern-steaks-think.md new file mode 100644 index 00000000000..0e46ce98395 --- /dev/null +++ b/.changeset/modern-steaks-think.md @@ -0,0 +1,5 @@ +--- +'@clerk/chrome-extension': patch +--- + +Remove `Origin` from API mutation request headers via `onInstalled` listener. diff --git a/.changeset/rotten-mice-juggle.md b/.changeset/rotten-mice-juggle.md new file mode 100644 index 00000000000..991ba0fa361 --- /dev/null +++ b/.changeset/rotten-mice-juggle.md @@ -0,0 +1,5 @@ +--- +'@clerk/chrome-extension': patch +--- + +Revert: Remove `Origin` from API mutation request headers via `onInstalled` listener.