From e89a131ffcc9e063eca283e451a1a363cd8ac93b Mon Sep 17 00:00:00 2001
From: Kristaps Fabians Geikins <fabians@speckle.systems>
Date: Thu, 16 Jan 2025 16:29:17 +0200
Subject: [PATCH] fix(fe2): less frequent cookie-fix invocation (#3841)

---
 packages/frontend-2/app.vue                   |  2 ++
 .../lib/common/composables/reactiveCookie.ts  | 21 +++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/frontend-2/app.vue b/packages/frontend-2/app.vue
index 4809d4f58..a3c065173 100644
--- a/packages/frontend-2/app.vue
+++ b/packages/frontend-2/app.vue
@@ -12,6 +12,7 @@
 <script setup lang="ts">
 import { useTheme } from '~~/lib/core/composables/theme'
 import { useAuthManager } from '~~/lib/auth/composables/auth'
+import { useFixBraveSafariCookies } from '~~/lib/common/composables/reactiveCookie'
 
 const { isDarkTheme } = useTheme()
 
@@ -30,6 +31,7 @@ useHead({
 
 const { watchAuthQueryString } = useAuthManager()
 watchAuthQueryString()
+useFixBraveSafariCookies()
 </script>
 <style>
 .page-enter-active,
diff --git a/packages/frontend-2/lib/common/composables/reactiveCookie.ts b/packages/frontend-2/lib/common/composables/reactiveCookie.ts
index 24707d7e4..c57082f1f 100644
--- a/packages/frontend-2/lib/common/composables/reactiveCookie.ts
+++ b/packages/frontend-2/lib/common/composables/reactiveCookie.ts
@@ -5,9 +5,6 @@ import dayjs from 'dayjs'
 import { useScopedState } from '~~/lib/common/composables/scopedState'
 import { isUndefined } from 'lodash-es'
 import { isBraveOrSafari } from '@speckle/shared'
-import { abortControllerManager, isAbortError } from '~/lib/common/utils/requests'
-
-const aborts = abortControllerManager()
 
 /**
  * Makes useCookie() synchronized across the app so that a change to it from one place
@@ -43,16 +40,6 @@ export const useSynchronizedCookie = <CookieValue = string>(
         } else {
           tmpCookie.value = undefined
         }
-
-        // Fetch w/ abort of previous call, if any
-        const controller = aborts.popOnlyInCSR()
-        void fetch('/web-api/cookie-fix', {
-          signal: controller?.signal
-        }).catch((e) => {
-          if (!isAbortError(e)) {
-            throw e
-          }
-        })
       })
     }
 
@@ -64,3 +51,11 @@ export const useSynchronizedCookie = <CookieValue = string>(
 
     return cookie
   })
+
+export const useFixBraveSafariCookies = () => {
+  if (!import.meta.client || !isBraveOrSafari()) return
+
+  onMounted(async () => {
+    await fetch('/web-api/cookie-fix')
+  })
+}