addEmail and addSms now save onesignal_id

When a pushSubscription is created it creates and then hydrates the user. We are mkaing this consistent for email and sms. Introduced a new createAndHydrateUser function to encapsulate this logic.
OneSignal · Nov 14, 2023 · 36b8b7b · 36b8b7b
1 parent 0cdc867
commit 36b8b7b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/onesignal/User.ts b/src/onesignal/User.ts
@@ -115,7 +115,7 @@ export default class User {
     });
   }
 
-  public addEmail(email: string): void {
+  public async addEmail(email: string): Promise<void> {
     logMethodCall('addEmail', { email });
 
     if (typeof email !== 'string') {
@@ -157,7 +157,7 @@ export default class User {
         newSubscription,
         false,
       );
-      UserDirector.createUserOnServer();
+      await UserDirector.createAndHydrateUser();
     }
 
     UserDirector.updateModelWithCurrentUserOneSignalId(newSubscription).catch(
@@ -167,7 +167,7 @@ export default class User {
     );
   }
 
-  public addSms(sms: string): void {
+  public async addSms(sms: string): Promise<void> {
     logMethodCall('addSms', { sms });
 
     if (typeof sms !== 'string') {
@@ -206,7 +206,7 @@ export default class User {
         newSubscription,
         false,
       );
-      UserDirector.createUserOnServer();
+      await UserDirector.createAndHydrateUser();
     }
 
     UserDirector.updateModelWithCurrentUserOneSignalId(newSubscription).catch(

diff --git a/src/onesignal/UserDirector.ts b/src/onesignal/UserDirector.ts
@@ -104,6 +104,13 @@ export default class UserDirector {
     }
   }
 
+  static async createAndHydrateUser(): Promise<void> {
+    const userData = await UserDirector.createUserOnServer();
+    if (userData) {
+      OneSignal.coreDirector.hydrateUser(userData);
+    }
+  }
+
   static async getAllUserData(): Promise<UserData> {
     logMethodCall('LoginManager.getAllUserData');
 

diff --git a/src/shared/managers/SubscriptionManager.ts b/src/shared/managers/SubscriptionManager.ts
@@ -192,10 +192,7 @@ export class SubscriptionManager {
 
     if (!pushModel) {
       OneSignal.coreDirector.generatePushSubscriptionModel(rawPushSubscription);
-      const userData = await UserDirector.createUserOnServer();
-      if (userData) {
-        OneSignal.coreDirector.hydrateUser(userData);
-      }
+      await UserDirector.createAndHydrateUser();
       return;
     } else {
       // resubscribing. update existing push subscription model