fixing where product details is defined

Author: ashleysmithTTD

src/euidSdk.ts

@@ -22,7 +22,7 @@ export class EUID extends SdkBase {
     );
     return EUID.cookieName;
   }
-  static get EuidDetails(): ProductDetails {
+  private static get EuidDetails(): ProductDetails {
     return productDetails;
   }
 

src/integrationTests/euidSdk.test.ts

@@ -5,12 +5,11 @@ import { sdkWindow, EUID, __euidInternalHandleScriptLoad, SdkOptions } from '../
 import { EventType, CallbackHandler } from '../callbackManager';
 import { __euidSSProviderScriptLoad } from '../secureSignalEuid';
 import { UidSecureSignalProvider } from '../secureSignal_shared';
-import { ProductDetails } from '../product';
 import { removeConfig } from '../configManager';
+import { ProductDetails } from '../product';
 
 let callback: any;
 let asyncCallback: jest.Mock<CallbackHandler>;
-let euid: EUID;
 let xhrMock: any;
 let uid2ESP: UidSecureSignalProvider;
 let secureSignalProvidersPushMock: jest.Mock<(p: any) => Promise<void>>;
@@ -26,7 +25,7 @@ jest.spyOn(document, 'URL', 'get').mockImplementation(() => mockUrl);
 
 const makeIdentity = mocks.makeIdentityV2;
 
-const productDetails: ProductDetails = {
+const euidProductDetails: ProductDetails = {
   name: 'EUID',
   defaultBaseUrl: 'https://prod.euid.eu',
   localStorageKey: 'EUID-sdk-identity',
@@ -38,7 +37,7 @@ const getConfigCookie = () => {
   if (docCookie) {
     const payload = docCookie
       .split('; ')
-      .find((row) => row.startsWith(productDetails.cookieName + '_config' + '='));
+      .find((row) => row.startsWith(euidProductDetails.cookieName + '_config' + '='));
     if (payload) {
       return JSON.parse(decodeURIComponent(payload.split('=')[1]));
     }
@@ -160,7 +159,7 @@ describe('Store config EUID', () => {
   beforeEach(() => {
     sdkWindow.__euid = new EUID();
     document.cookie =
-      productDetails.cookieName + '_config' + '=;expires=Tue, 1 Jan 1980 23:59:59 GMT;path=/';
+      euidProductDetails.cookieName + '_config' + '=;expires=Tue, 1 Jan 1980 23:59:59 GMT;path=/';
   });
 
   afterEach(() => {
@@ -190,7 +189,7 @@ describe('Store config EUID', () => {
       });
       let cookie = getConfigCookie();
       expect(cookie).toBeInstanceOf(Object);
-      removeConfig({ ...options, useCookie: true }, productDetails);
+      removeConfig({ ...options, useCookie: true }, euidProductDetails);
       cookie = getConfigCookie();
       expect(cookie).toBeNull();
     });

src/integrationTests/options.test.ts

@@ -15,7 +15,7 @@ mocks.setupFakeTime();
 const mockDomain = 'www.uidapi.com';
 const mockUrl = `http://${mockDomain}/test/index.html`;
 
-const productDetails: ProductDetails = {
+const uid2ProductDetails: ProductDetails = {
   name: 'UID2',
   defaultBaseUrl: 'https://prod.uidapi.com',
   localStorageKey: 'UID2-sdk-identity',
@@ -41,13 +41,14 @@ const getUid2Cookie = mocks.getUid2Cookie;
 const getUid2LocalStorage = mocks.getUid2LocalStorage;
 const removeUid2Cookie = mocks.removeUid2Cookie;
 const removeUid2LocalStorage = mocks.removeUid2LocalStorage;
+const getUid2 = mocks.getUid2;
 
 const getConfigCookie = () => {
   const docCookie = document.cookie;
   if (docCookie) {
     const payload = docCookie
       .split('; ')
-      .find((row) => row.startsWith(productDetails.cookieName + '_config' + '='));
+      .find((row) => row.startsWith(uid2ProductDetails.cookieName + '_config' + '='));
     if (payload) {
       return JSON.parse(decodeURIComponent(payload.split('=')[1]));
     }
@@ -75,7 +76,7 @@ describe('cookieDomain option', () => {
     });
 
     test('should not mention domain in the cookie string', () => {
-      const cookie = cookieMock.getSetCookieString(productDetails.cookieName);
+      const cookie = cookieMock.getSetCookieString(uid2ProductDetails.cookieName);
       expect(cookie).not.toBe('');
       expect(cookie).not.toContain('Domain=');
     });
@@ -94,7 +95,7 @@ describe('cookieDomain option', () => {
     });
 
     test('should use domain in the cookie string', () => {
-      const cookie = cookieMock.getSetCookieString(productDetails.cookieName);
+      const cookie = cookieMock.getSetCookieString(uid2ProductDetails.cookieName);
       expect(cookie).toContain(`Domain=${domain};`);
     });
   });
@@ -111,7 +112,7 @@ describe('cookiePath option', () => {
     });
 
     test('should use the default path in the cookie string', () => {
-      const cookie = cookieMock.getSetCookieString(productDetails.cookieName) as string;
+      const cookie = cookieMock.getSetCookieString(uid2ProductDetails.cookieName) as string;
       expect(cookie + ';').toContain('Path=/;');
     });
   });
@@ -129,7 +130,7 @@ describe('cookiePath option', () => {
     });
 
     test('should use custom path in the cookie string', () => {
-      const cookie = cookieMock.getSetCookieString(productDetails.cookieName) as string;
+      const cookie = cookieMock.getSetCookieString(uid2ProductDetails.cookieName) as string;
       expect(cookie + ';').toContain(`Path=${path};`);
     });
   });
@@ -357,7 +358,7 @@ describe('multiple init calls', () => {
     });
 
     test('should update cookie manager', () => {
-      const cookie = cookieMock.getSetCookieString(productDetails.cookieName);
+      const cookie = cookieMock.getSetCookieString(UID2.COOKIE_NAME);
       expect(cookie).toContain(`Domain=${cookieDomain};`);
       expect(cookie + ';').toContain(`Path=${newCookiePath};`);
       const configCookie = getConfigCookie();
@@ -520,7 +521,7 @@ describe('Store config UID2', () => {
   beforeEach(() => {
     localStorage.removeItem('UID2-sdk-identity_config');
     document.cookie =
-      productDetails.cookieName + '_config' + '=;expires=Tue, 1 Jan 1980 23:59:59 GMT;path=/';
+      uid2ProductDetails.cookieName + '_config' + '=;expires=Tue, 1 Jan 1980 23:59:59 GMT;path=/';
   });
 
   describe('when useCookie is true', () => {
@@ -529,14 +530,14 @@ describe('Store config UID2', () => {
       const cookie = getConfigCookie();
       expect(cookie).toBeInstanceOf(Object);
       expect(cookie).toHaveProperty('cookieDomain');
-      const storageConfig = loadConfig(productDetails);
+      const storageConfig = getConfigStorage();
       expect(storageConfig).toBeNull();
     });
   });
   describe('when useCookie is false', () => {
     test('should store config in local storage', () => {
       uid2.init({ callback: callback, identity: identity, ...options });
-      const storageConfig = loadConfig(productDetails);
+      const storageConfig = getConfigStorage();
       expect(storageConfig).toBeInstanceOf(Object);
       expect(storageConfig).toHaveProperty('cookieDomain');
       const cookie = getConfigCookie();
@@ -546,11 +547,11 @@ describe('Store config UID2', () => {
   describe('when useCookie is false', () => {
     test('can successfully clear the config in storage', () => {
       uid2.init({ callback: callback, identity: identity, ...options });
-      let storageConfig = loadConfig(productDetails);
+      let storageConfig = loadConfig(uid2ProductDetails);
       expect(storageConfig).toBeInstanceOf(Object);
       expect(storageConfig).toHaveProperty('cookieDomain');
-      removeConfig(previousOptions, productDetails);
-      storageConfig = loadConfig(productDetails);
+      removeConfig(previousOptions, uid2ProductDetails);
+      storageConfig = loadConfig(uid2ProductDetails);
       expect(storageConfig).toBeNull();
     });
   });

src/mocks.ts

@@ -1,6 +1,5 @@
 import * as jsdom from 'jsdom';
 import { Cookie } from 'tough-cookie';
-import { UID2 } from './uid2Sdk';
 import { Identity } from './Identity';
 import { base64ToBytes, bytesToBase64 } from './encoding/base64';
 import * as crypto from 'crypto';