refactor(auth): inline userDirector functions

Author: fadi-george

package.json

@@ -81,7 +81,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "43.793 kB",
+      "limit": "43.75 kB",
       "gzip": true
     },
     {

src/onesignal/OneSignal.test.ts

@@ -819,9 +819,12 @@ describe('OneSignal - No Consent Required', () => {
           await promise;
 
           // accepting permissions patches the existing subscription with the token
-          await vi.waitUntil(() => updateSubscriptionFn.mock.calls.length >= 1, {
-            interval: 1,
-          });
+          await vi.waitUntil(
+            () => updateSubscriptionFn.mock.calls.length >= 1,
+            {
+              interval: 1,
+            },
+          );
 
           let pushSub: SubscriptionSchema | undefined;
           await vi.waitUntil(

src/onesignal/userDirector.ts

@@ -1,14 +1,15 @@
 import { IdentityConstants } from 'src/core/constants';
+import { IdentityModel } from 'src/core/models/IdentityModel';
+import { PropertiesModel } from 'src/core/models/PropertiesModel';
 import { SubscriptionModel } from 'src/core/models/SubscriptionModel';
 import { LoginUserOperation } from 'src/core/operations/LoginUserOperation';
 import { TransferSubscriptionOperation } from 'src/core/operations/TransferSubscriptionOperation';
 import { ModelChangeTags } from 'src/core/types/models';
 import { db } from 'src/shared/database/client';
 import { getSubscriptionType } from 'src/shared/environment/detect';
 import { getAppId } from 'src/shared/helpers/main';
+import Log from 'src/shared/libraries/Log';
 import { IDManager } from 'src/shared/managers/IDManager';
-import { resetUserModels } from '../../onesignal/userDirector';
-import Log from '../../shared/libraries/Log';
 
 export default class LoginManager {
   // Other internal classes should await on this if they access users
@@ -73,7 +74,16 @@ export default class LoginManager {
   }
 
   private static _resetAndGetIdentityModel() {
-    resetUserModels();
+    const newIdentityModel = new IdentityModel();
+    const newPropertiesModel = new PropertiesModel();
+
+    const sdkId = IDManager._createLocalId();
+    newIdentityModel._onesignalId = sdkId;
+    newPropertiesModel._onesignalId = sdkId;
+
+    OneSignal._coreDirector._identityModelStore._replace(newIdentityModel);
+    OneSignal._coreDirector._propertiesModelStore._replace(newPropertiesModel);
+
     return OneSignal._coreDirector._getIdentityModel();
   }
 

src/page/managers/LoginManager.ts

@@ -1,4 +1,6 @@
-import { createUserOnServer } from 'src/onesignal/userDirector';
+import type { SubscriptionModel } from 'src/core/models/SubscriptionModel';
+import { CreateSubscriptionOperation } from 'src/core/operations/CreateSubscriptionOperation';
+import { LoginUserOperation } from 'src/core/operations/LoginUserOperation';
 import LoginManager from 'src/page/managers/LoginManager';
 import FuturePushSubscriptionRecord from 'src/page/userModel/FuturePushSubscriptionRecord';
 import type { ContextInterface } from 'src/shared/context/types';
@@ -12,6 +14,7 @@ import {
   PermissionBlockedError,
   SWRegistrationError,
 } from 'src/shared/errors/common';
+import { getAppId } from 'src/shared/helpers/main';
 import {
   incrementPageViewCount,
   isFirstPageView,
@@ -48,25 +51,48 @@ function executeCallback<T>(callback?: (...args: any[]) => T, ...args: any[]) {
   }
 }
 
+async function createSubscribedUser(
+  pushModel: SubscriptionModel,
+): Promise<void> {
+  const identityModel = OneSignal._coreDirector._getIdentityModel();
+  const appId = getAppId();
+
+  OneSignal._coreDirector._operationRepo._enqueue(
+    new LoginUserOperation(
+      appId,
+      identityModel._onesignalId,
+      identityModel._externalId,
+    ),
+  );
+  await OneSignal._coreDirector._operationRepo._enqueueAndWait(
+    new CreateSubscriptionOperation({
+      ...pushModel.toJSON(),
+      appId,
+      onesignalId: identityModel._onesignalId,
+      subscriptionId: pushModel.id!,
+    }),
+  );
+}
+
 export const updatePushSubscriptionModelWithRawSubscription = async (
   rawPushSubscription: RawPushSubscription,
 ) => {
   // incase a login op was called before user accepts the notifcations permissions, we need to wait for it to finish
   // otherwise there would be two login ops in the same bucket for LoginOperationExecutor which would error
   await LoginManager._switchingUsersPromise;
 
+  // for new Anonymous/not-logged-in users, we need to create a new push subscription model and also save its push id to IndexedDB
   let pushModel = await OneSignal._coreDirector._getPushSubscriptionModel();
-  // for new users, we need to create a new push subscription model and also save its push id to IndexedDB
   if (!pushModel) {
     pushModel =
       OneSignal._coreDirector._generatePushSubscriptionModel(
         rawPushSubscription,
       );
-    return createUserOnServer();
+    return createSubscribedUser(pushModel);
   }
   // for users with data failed to create a user or user + subscription on the server
   if (IDManager._isLocalId(pushModel.id)) {
-    return createUserOnServer();
+    return createSubscribedUser(pushModel);
   }
 
   // in case of notification state changes, we need to update its web_auth, web_p256, and other keys