For user login, send correct data based on identified status of prev user

Motivation: we want to make sure to send the correct data based on whether the previous user was identified or not.

If we are identifying an anonymous user, we should send the entire user data.

If we are upserting a user, we should only send the push subscription and external id.

Author: rgomezp

src/onesignal/OneSignal.ts

@@ -45,6 +45,7 @@ import { OneSignalDeferredLoadedCallback } from "../page/models/OneSignalDeferre
 import UserDirector from "./UserDirector";
 import { ModelName, SupportedModel } from "../core/models/SupportedModels";
 import { OSModel } from "../core/modelRepo/OSModel";
+import UserData from "../core/models/UserData";
 
 export default class OneSignal {
   private static async _initializeCoreModuleAndUserNamespace() {
@@ -128,7 +129,21 @@ export default class OneSignal {
       // set the external id on the user locally
       LoginManager.setExternalId(identityModel, externalId);
 
-      const userData = await UserDirector.getAllUserData();
+      let userData: Partial<UserData>;
+      const pushSubscription = await this.coreDirector.getCurrentPushSubscriptionModel();
+      if (!isIdentified) {
+        userData = await UserDirector.getAllUserData();
+      } else {
+        userData = {
+          identity: {
+            external_id: externalId,
+          }
+        };
+
+        if (pushSubscription) {
+          userData.subscriptions = [pushSubscription.data];
+        }
+      }
       await this.coreDirector.resetModelRepoAndCache();
       await UserDirector.initializeUser(true);
       await OneSignal.User.PushSubscription._resubscribeToPushModelChanges();

src/page/managers/LoginManager.ts

@@ -26,7 +26,7 @@ export default class LoginManager {
     return identity.external_id !== undefined;
   }
 
-  static async upsertUser(userData: UserData): Promise<UserData> {
+  static async upsertUser(userData: Partial<UserData>): Promise<UserData> {
     logMethodCall("LoginManager.upsertUser", { userData });
     const appId = await MainHelper.getAppId();
     this.prepareIdentityForUpsert(userData);
@@ -89,18 +89,19 @@ export default class LoginManager {
     return { identity: identityResult };
   }
 
-  static async identifyOrUpsertUser(userData: UserData, isIdentified: boolean, subscriptionId?: string)
+  static async identifyOrUpsertUser(userData: Partial<UserData>, isIdentified: boolean, subscriptionId?: string)
     : Promise<Partial<UserData>> {
     logMethodCall("LoginManager.identifyOrUpsertUser", { userData, isIdentified, subscriptionId });
 
       let result: Partial<UserData>;
 
       if (isIdentified) {
-        // if started off identified, create a new user
+        // if started off identified, upsert a user
         result = await this.upsertUser(userData);
       } else {
         // promoting anonymous user to identified user
-        result = await this.identifyUser(userData, subscriptionId);
+        // from user data, we only use identity (and we remove all aliases except external_id)
+        result = await this.identifyUser(userData as UserData, subscriptionId);
       }
       return result;
   }
@@ -121,7 +122,7 @@ export default class LoginManager {
    * if logging in from identified user a to identified user b, the identity object would
    * otherwise contain any existing user a aliases
    */
-  static prepareIdentityForUpsert(userData: UserData): void {
+  static prepareIdentityForUpsert(userData: Partial<UserData>): void {
     logMethodCall("LoginManager.prepareIdentityForUpsert", { userData });
 
     const { identity } = userData;