Merge branch 'main' into ans-UID2-3834-allow-js-sdk-accept-multiple-init-calls

Author: ashleysmithTTD

examples/cstg/html/index.html

@@ -29,6 +29,9 @@
         $('#login_required').text(
           sdk.isLoginRequired() || sdk.isLoginRequired() === undefined ? 'yes' : 'no'
         );
+        $(`#has_opted_out`).text(
+                sdk.hasOptedOut() ? 'yes' : 'no'
+        );
         $('#update_counter').text(callbackCounter);
         $('#identity_state').text(String(JSON.stringify(state, null, 2)));
 
@@ -109,6 +112,10 @@ <h1>UID2 Publisher Client-Side Integration Example using UID2 JavaScript SDK</h1
         <td class="label">Is Login Required?</td>
         <td class="value"><pre id="login_required"></pre></td>
       </tr>
+      <tr>
+        <td class="label">Has opted out?</td>
+        <td class="value"><pre id="has_opted_out"></pre></td>
+      </tr>
       <tr>
         <td class="label">Identity Updated Counter:</td>
         <td class="value"><pre id="update_counter"></pre></td>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@uid2/uid2-sdk",
-  "version": "3.3.2",
+  "version": "3.4.5",
   "description": "UID2 Client SDK",
   "author": "The Trade Desk",
   "repository": {

package.json

@@ -1,6 +1,7 @@
 import { EventType, CallbackHandler } from './callbackManager';
 import { CallbackContainer, sdkAssertErrorText, SdkBase, SDKSetup } from './sdkBase';
 import { ProductDetails } from './product';
+import { UidSecureSignalProviderType } from './secureSignal_types';
 
 export * from './exports';
 
@@ -51,6 +52,7 @@ export class EUID extends SdkBase {
 declare global {
   interface Window {
     __euid: EUID | SDKSetup | undefined;
+    __euidSecureSignalProvider?: UidSecureSignalProviderType;
   }
 }
 export function assertEUID(sdk: typeof window.__euid): asserts sdk is EUID {

src/euidSdk.ts

@@ -1,11 +1,12 @@
 import { isDebugModeOn, UidSecureSignalProvider } from './secureSignal_shared';
+import { UidSecureSignalProviderType } from './secureSignal_types';
 
 const INTEG_BASE_URL = 'https://cdn.integ.euid.eu/';
 
 declare global {
   interface Window {
     getEuidAdvertisingToken?: () => Promise<string | null | undefined>;
-    __euidSecureSignalProvider?: UidSecureSignalProvider;
+    __euidSecureSignalProvider?: UidSecureSignalProviderType;
   }
 }
 

src/secureSignalEuid.ts

@@ -1,11 +1,12 @@
 import { isDebugModeOn, UidSecureSignalProvider } from './secureSignal_shared';
+import { UidSecureSignalProviderType } from './secureSignal_types';
 
 const INTEG_BASE_URL = 'https://cdn.integ.uidapi.com/';
 
 declare global {
   interface Window {
     getUid2AdvertisingToken?: () => Promise<string | null | undefined>;
-    __uid2SecureSignalProvider?: UidSecureSignalProvider;
+    __uid2SecureSignalProvider?: UidSecureSignalProviderType;
   }
 }
 

src/secureSignalUid2.ts

@@ -1,5 +1,7 @@
+import { UidSecureSignalProviderType } from './secureSignal_types';
+
 const MAXIMUM_RETRY = 3;
-export class UidSecureSignalProvider {
+export class UidSecureSignalProvider implements UidSecureSignalProviderType {
   debug: boolean;
   isEuid: boolean;
 
@@ -73,9 +75,7 @@ export class UidSecureSignalProvider {
 
       async function attempt(error?: unknown) {
         if (attempts >= retries) {
-          window.__uid2SecureSignalProvider?.logging(
-            `getUidAdvertisingTokenWithRetry failed with error after retry: ${error}`
-          );
+          that.logging(`getUidAdvertisingTokenWithRetry failed with error after retry: ${error}`);
 
           reject(error);
           return;

src/secureSignal_shared.ts

@@ -0,0 +1,3 @@
+export interface UidSecureSignalProviderType {
+  registerSecureSignalProvider: () => void;
+}

src/secureSignal_types.ts

@@ -8,6 +8,7 @@ import { isBase64Hash } from './hashedDii';
 import { hashAndEncodeIdentifier, hashIdentifier } from './encoding/hash';
 import { CallbackContainer, sdkAssertErrorText, SdkBase, SDKSetup } from './sdkBase';
 import { ProductDetails } from './product';
+import { UidSecureSignalProviderType } from './secureSignal_types';
 
 export * from './exports';
 
@@ -100,6 +101,7 @@ declare global {
   interface Window {
     __uid2: UID2 | SDKSetup | undefined;
     __uid2Helper: UID2Helper | undefined;
+    __uid2SecureSignalProvider?: UidSecureSignalProviderType;
   }
 }
 

src/uid2Sdk.ts

@@ -1,11 +1 @@
-{
-  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "3.3",
-  "publicReleaseRefSpec": ["^refs/heads/main$", "^refs/heads/v\\d+(?:\\.\\d+)?$"],
-  "cloudBuild": {
-    "buildNumber": {
-      "enabled": true,
-      "includeCommitId": { "when": "always" }
-    }
-  }
-}
+{ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", "version": "3.4", "publicReleaseRefSpec": [ "^refs/heads/main$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { "buildNumber": { "enabled": true, "includeCommitId": { "when": "always" } } } }