if disable is overridden, proxy correctly

segmentio · Nov 17, 2023 · 9b6a432 · 9b6a432
1 parent ba4617e
commit 9b6a432
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/packages/consent/consent-tools/src/domain/__tests__/create-wrapper.test.ts b/packages/consent/consent-tools/src/domain/__tests__/create-wrapper.test.ts
@@ -746,7 +746,7 @@ describe(createWrapper, () => {
       ).toBe(false)
     })
 
-    it('should be disabled if a user overrides disable with a true value, regardless of what we calculate', async () => {
+    it('should be disabled if if a user overrides disabled with boolean: true, and pass through a boolean', async () => {
       disableSegmentMock.segmentShouldBeDisabled.mockReturnValue(false)
       wrapTestAnalytics()
       await analytics.load(
@@ -757,9 +757,7 @@ describe(createWrapper, () => {
       )
       expect(
         // @ts-ignore
-        analyticsLoadSpy.mock.lastCall[1].disable!(
-          DEFAULT_LOAD_SETTINGS.cdnSettings
-        )
+        analyticsLoadSpy.mock.lastCall[1].disable
       ).toBe(true)
     })
 
@@ -796,5 +794,23 @@ describe(createWrapper, () => {
         )
       ).toBe(true)
     })
+
+    it('should enable if user passes the wrong option to "load"', async () => {
+      disableSegmentMock.segmentShouldBeDisabled.mockReturnValue(false)
+      wrapTestAnalytics()
+      await analytics.load(
+        {
+          ...DEFAULT_LOAD_SETTINGS,
+        },
+        // @ts-ignore
+        { disable: 'foo' }
+      )
+      expect(
+        // @ts-ignore
+        analyticsLoadSpy.mock.lastCall[1].disable!(
+          DEFAULT_LOAD_SETTINGS.cdnSettings
+        )
+      ).toBe(false)
+    })
   })
 })
diff --git a/packages/consent/consent-tools/src/domain/create-wrapper.ts b/packages/consent/consent-tools/src/domain/create-wrapper.ts
@@ -100,8 +100,11 @@ export const createWrapper = <Analytics extends AnyAnalytics>(
           updateCDNSettings,
           options?.updateCDNSettings || ((id) => id)
         ),
-        disable: (cdnSettings) =>
-          isDisabled(cdnSettings, initialCategories, options?.disable),
+        disable:
+          options?.disable === true
+            ? true
+            : (cdnSettings) =>
+                isDisabled(cdnSettings, initialCategories, options?.disable),
       })
     }
     analyticsService.replaceLoadMethod(loadWithConsent)
@@ -187,16 +190,10 @@ const disableIntegrations = (
 const isDisabled = (
   cdnSettings: CDNSettings,
   initialCategories: Categories,
-  disableOpt: InitOptions['disable'] | undefined
+  disable: InitOptions['disable']
 ): boolean => {
-  const shouldBeDisabled = segmentShouldBeDisabled(
-    initialCategories,
-    cdnSettings.consentSettings
-  )
   return (
-    shouldBeDisabled ||
-    (typeof disableOpt === 'function'
-      ? disableOpt(cdnSettings)
-      : disableOpt === true)
+    segmentShouldBeDisabled(initialCategories, cdnSettings.consentSettings) ||
+    (typeof disable === 'function' ? disable(cdnSettings) : disable === true)
   )
 }