remove isCreatingUser logic

Author: fadi-george

src/core/executors/LoginUserOperationExecutor.ts

@@ -1,6 +1,5 @@
 import { ModelChangeTags } from 'src/core/types/models';
 import { ExecutionResult, IOperationExecutor } from 'src/core/types/operation';
-import User from 'src/onesignal/User';
 import OneSignalError from 'src/shared/errors/OneSignalError';
 import Environment from 'src/shared/helpers/Environment';
 import EventHelper from 'src/shared/helpers/EventHelper';
@@ -60,9 +59,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
     const startingOp = operations[0];
 
     if (startingOp instanceof LoginUserOperation)
-      return this.loginUser(startingOp, operations.slice(1)).finally(() => {
-        User.createOrGetInstance().isCreatingUser = false;
-      });
+      return this.loginUser(startingOp, operations.slice(1));
 
     throw new Error(`Unrecognized operation: ${startingOp.name}`);
   }

src/onesignal/User.ts

@@ -12,8 +12,6 @@ import {
 import { isObject, isValidEmail, logMethodCall } from '../shared/utils/utils';
 
 export default class User {
-  isCreatingUser = false;
-
   static singletonInstance?: User = undefined;
 
   /**

src/onesignal/UserDirector.ts

@@ -5,13 +5,9 @@ import { LoginUserOperation } from 'src/core/operations/LoginUserOperation';
 import Log from 'src/shared/libraries/Log';
 import { IDManager } from 'src/shared/managers/IDManager';
 import MainHelper from '../shared/helpers/MainHelper';
-import User from './User';
 
 export default class UserDirector {
   static async createUserOnServer(): Promise<void> {
-    const user = User.createOrGetInstance();
-    if (user.isCreatingUser) return;
-
     const identityModel = OneSignal.coreDirector.getIdentityModel();
     const appId = MainHelper.getAppId();
 
@@ -21,7 +17,6 @@ export default class UserDirector {
     pushOp.id = pushOp.id ?? IDManager.createLocalId();
     const { id, ...rest } = pushOp.toJSON();
 
-    User.createOrGetInstance().isCreatingUser = true;
     OneSignal.coreDirector.operationRepo.enqueue(
       new LoginUserOperation(
         appId,
@@ -39,11 +34,6 @@ export default class UserDirector {
     );
   }
 
-  static resetUserMetaProperties() {
-    const user = User.createOrGetInstance();
-    user.isCreatingUser = false;
-  }
-
   // Resets models similar to Android SDK
   // https://github.com/OneSignal/OneSignal-Android-SDK/blob/ed2e87618ea3af81b75f97b0a4cbb8f658c7fc80/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/internal/OneSignalImp.kt#L448
   static resetUserModels() {

src/page/managers/LoginManager.ts

@@ -1,7 +1,6 @@
 import { LoginUserOperation } from 'src/core/operations/LoginUserOperation';
 import { TransferSubscriptionOperation } from 'src/core/operations/TransferSubscriptionOperation';
 import { ModelChangeTags } from 'src/core/types/models';
-import User from 'src/onesignal/User';
 import MainHelper from 'src/shared/helpers/MainHelper';
 import OneSignal from '../../onesignal/OneSignal';
 import UserDirector from '../../onesignal/UserDirector';
@@ -46,8 +45,6 @@ export default class LoginManager {
     );
     const newIdentityOneSignalId = identityModel.onesignalId;
 
-    User.createOrGetInstance().isCreatingUser = true;
-
     const appId = MainHelper.getAppId();
 
     const pushOp = await OneSignal.coreDirector.getPushSubscriptionModel();
@@ -81,7 +78,6 @@ export default class LoginManager {
     if (!identityModel.externalId)
       return Log.debug('Logout: User is not logged in, skipping logout');
 
-    UserDirector.resetUserMetaProperties();
     UserDirector.resetUserModels();
 
     // create a new anonymous user