wrote separate identity function for callback instead

Author: ashleysmithTTD

src/callbackManager.ts

@@ -19,14 +19,14 @@ export type PayloadWithIdentity = {
 };
 
 export class CallbackManager {
-  private _getIdentity: (isForCallback: boolean) => Identity | null | undefined;
+  private _getIdentity: () => Identity | null | undefined;
   private _logger: Logger;
   private _sdk: SdkBase;
   private _productName: string;
   constructor(
     sdk: SdkBase,
     productName: string,
-    getIdentity: (isForCallback: boolean) => Identity | null | undefined,
+    getIdentity: () => Identity | null | undefined,
     logger: Logger
   ) {
     this._productName = productName;
@@ -44,7 +44,7 @@ export class CallbackManager {
         this.safeRunCallback(c, EventType.SdkLoaded, {});
       if (this._sentInit)
         this.safeRunCallback(c, EventType.InitCompleted, {
-          identity: this._getIdentity(true) ?? null,
+          identity: this._getIdentity() ?? null,
         });
     }
     return Array.prototype.push.apply(this._sdk.callbacks, args);
@@ -56,7 +56,7 @@ export class CallbackManager {
 
     const enrichedPayload = {
       ...payload,
-      identity: this._getIdentity(true) ?? null,
+      identity: this._getIdentity() ?? null,
     };
     for (const callback of this._sdk.callbacks) {
       this.safeRunCallback(callback, event, enrichedPayload);

src/sdkBase.ts

@@ -84,7 +84,7 @@ export abstract class SdkBase {
     this._callbackManager = new CallbackManager(
       this,
       this._product.name,
-      () => this.getIdentity(true),
+      () => this.getIdentityForCallback(),
       this._logger
     );
   }
@@ -161,20 +161,25 @@ export abstract class SdkBase {
     this.isIdentityAvailable();
   }
 
-  public getIdentity(isForCallback?: boolean): Identity | null {
+  public getIdentity(): Identity | null {
     const identity = this._identity ?? this.getIdentityNoInit();
     const isValid =
       identity && !this.temporarilyUnavailable(identity) && !isOptoutIdentity(identity);
     if (!isValid) {
-      if (!isForCallback) {
-        this._callbackManager.runCallbacks(EventType.NoIdentityAvailable, {});
-      }
+      this._callbackManager.runCallbacks(EventType.NoIdentityAvailable, {});
       return null;
     } else {
       return identity;
     }
   }
 
+  private getIdentityForCallback(): Identity | null {
+    const identity = this._identity ?? this.getIdentityNoInit();
+    return identity && !this.temporarilyUnavailable(identity) && !isOptoutIdentity(identity)
+      ? identity
+      : null;
+  }
+
   // When the SDK has been initialized, this function should return the token
   // from the most recent refresh request, if there is a request, wait for the
   // new token. Otherwise, returns a promise which will be resolved after init.