From 6cf78453696278b8c0df697a75f8a78ef59e55cc Mon Sep 17 00:00:00 2001
From: Seth Silesky <5115498+silesky@users.noreply.github.com>
Date: Mon, 13 Nov 2023 17:04:55 -0600
Subject: [PATCH] wip

---
 .../pages/index-consent-no-banner.html        |  4 +--
 .../domain/__tests__/create-wrapper.test.ts   |  8 ++---
 .../src/domain/analytics/analytics-service.ts | 33 +++++++++++++++--
 .../src/domain/analytics/consent-changed.ts   | 35 -------------------
 4 files changed, 35 insertions(+), 45 deletions(-)
 delete mode 100644 packages/consent/consent-tools/src/domain/analytics/consent-changed.ts

diff --git a/examples/standalone-playground/pages/index-consent-no-banner.html b/examples/standalone-playground/pages/index-consent-no-banner.html
index a7dedd251..7f5bba799 100644
--- a/examples/standalone-playground/pages/index-consent-no-banner.html
+++ b/examples/standalone-playground/pages/index-consent-no-banner.html
@@ -33,7 +33,7 @@
     data-domain-script="09b87b90-1b30-4d68-9610-9d2fe11234f3-test"></script>
   <script type="text/javascript">
     const wk = document.querySelector("input").value
-    wk && console.log('should be on the following url ->', `${window.location.origin + window.location.pathname}?writeKey=${wk}&otpreview=true&otgeo=za`)
+    console.log('should be on the following url ->', `${window.location.origin + window.location.pathname}?writeKey=${wk || '<writekey>'}&otpreview=true&otgeo=za`)
     function OptanonWrapper() {
       // debugging.
       if (!window.OnetrustActiveGroups.replaceAll(',', '')) {
@@ -147,7 +147,7 @@ <h2>Logs</h2>
 
   <script type="text/javascript">
     const displayConsentLogs = (str) => document.querySelector('#consent-changed').textContent = str
-    analytics.on('track', (name, properties, options) => {
+    window.analytics?.on('track', (name, properties, options) => {
       if (name.includes("Segment Consent")) {
         displayConsentLogs("Consent Changed Event Fired")
         setTimeout(() => displayConsentLogs(''), 3000)
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
index 3728bafd6..16de23e87 100644
--- a/packages/consent/consent-tools/src/domain/__tests__/create-wrapper.test.ts
+++ b/packages/consent/consent-tools/src/domain/__tests__/create-wrapper.test.ts
@@ -1,5 +1,4 @@
 import * as ConsentStamping from '../consent-stamping'
-import * as ConsentChanged from '../analytics/consent-changed'
 import { createWrapper } from '../create-wrapper'
 import { AbortLoadError, LoadContext } from '../load-cancellation'
 import type {
@@ -11,6 +10,7 @@ import type {
 } from '../../types'
 import { CDNSettingsBuilder } from '@internal/test-helpers'
 import { assertIntegrationsContainOnly } from './assertions/integrations-assertions'
+import { AnalyticsService } from '../analytics'
 
 const DEFAULT_LOAD_SETTINGS = {
   writeKey: 'foo',
@@ -661,8 +661,8 @@ describe(createWrapper, () => {
 
   describe('registerOnConsentChanged', () => {
     const sendConsentChangedEventSpy = jest.spyOn(
-      ConsentChanged,
-      'sendConsentChangedEvent'
+      AnalyticsService.prototype,
+      'consentChange'
     )
 
     let categoriesChangedCb: (categories: Categories) => void = () => {
@@ -709,8 +709,6 @@ describe(createWrapper, () => {
       expect(consoleErrorSpy).toBeCalledTimes(1)
       const err = consoleErrorSpy.mock.lastCall[0]
       expect(err.toString()).toMatch(/validation/i)
-      // if OnConsentChanged callback is called with categories, it should send event
-      expect(sendConsentChangedEventSpy).not.toBeCalled()
       expect(analyticsTrackSpy).not.toBeCalled()
     })
   })
diff --git a/packages/consent/consent-tools/src/domain/analytics/analytics-service.ts b/packages/consent/consent-tools/src/domain/analytics/analytics-service.ts
index 089d6e7c7..e29f48e42 100644
--- a/packages/consent/consent-tools/src/domain/analytics/analytics-service.ts
+++ b/packages/consent/consent-tools/src/domain/analytics/analytics-service.ts
@@ -1,9 +1,11 @@
 import { AnyAnalytics, Categories, CDNSettings } from '../../types'
 import { createConsentStampingMiddleware } from '../consent-stamping'
-import { validateAnalyticsInstance } from '../validation'
-import { validateAndSendConsentChangedEvent } from './consent-changed'
+import { validateAnalyticsInstance, validateCategories } from '../validation'
 import { getInitializedAnalytics } from './get-initialized-analytics'
 
+/**
+ * This class is a wrapper around the analytics.js library.
+ */
 export class AnalyticsService {
   /**
    * The original analytics.load fn
@@ -45,7 +47,32 @@ export class AnalyticsService {
     return this.analytics.addSourceMiddleware(MW)
   }
 
+  /**
+   * Dispatch an event that looks like:
+   * ```ts
+   * {
+   * "type": "track",
+   *  "event": "Segment Consent Preference",
+   *  "context": {
+   *    "consent": {
+   *      "categoryPreferences" : {
+   *         "C0001": true,
+   *         "C0002": false,
+   *    }
+   *  }
+   * ...
+   * ```
+   */
   consentChange(categories: Categories): void {
-    return validateAndSendConsentChangedEvent(this.analytics, categories)
+    try {
+      validateCategories(categories)
+    } catch (e: unknown) {
+      // not sure if there's a better way to handle this
+      return console.error(e)
+    }
+    const CONSENT_CHANGED_EVENT = 'Segment Consent Preference'
+    this.analytics.track(CONSENT_CHANGED_EVENT, undefined, {
+      consent: { categoryPreferences: categories },
+    })
   }
 }
diff --git a/packages/consent/consent-tools/src/domain/analytics/consent-changed.ts b/packages/consent/consent-tools/src/domain/analytics/consent-changed.ts
deleted file mode 100644
index 121b6eb2e..000000000
--- a/packages/consent/consent-tools/src/domain/analytics/consent-changed.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Categories, MaybeInitializedAnalytics } from '../../types'
-import { validateCategories } from '../validation'
-
-const CONSENT_CHANGED_EVENT = 'Segment Consent Preference'
-
-/**
- * Dispatch an event that looks like:
- * ```ts
- * {
- * "type": "track",
- *  "event": "Segment Consent Preference",
- *  "context": {
- *    "consent": {
- *      "categoryPreferences" : {
- *         "C0001": true,
- *         "C0002": false,
- *    }
- *  }
- * ...
- * ```
- */
-export const validateAndSendConsentChangedEvent = (
-  analytics: MaybeInitializedAnalytics,
-  categories: Categories
-) => {
-  try {
-    validateCategories(categories)
-    analytics.track(CONSENT_CHANGED_EVENT, undefined, {
-      consent: { categoryPreferences: categories },
-    })
-  } catch (err) {
-    // Not sure if there's a better way to handle this, but this makes testing a bit easier.
-    console.error(err)
-  }
-}