Merge pull request #977 from OneSignal/user-model/post-backend-fixes

User model/post backend fixes

Author: rgomezp

src/core/executors/ExecutorBase.ts

@@ -49,7 +49,11 @@ export default abstract class ExecutorBase {
 
   public enqueueDelta(delta: CoreDelta<SupportedModel>): void {
     logMethodCall("ExecutorBase.enqueueDelta", { delta });
-    // deep copy (snapshot)
+    /**
+     * deep copy (snapshot)
+     * if we add alias and then login to a user, we want to ensure that the external id of the
+     * login call doesn't get included in the add alias call so this helps keep the changes separate
+     */
     const deltaCopy = JSON.parse(JSON.stringify(delta));
     this._deltaQueue.push(deltaCopy);
   }

src/core/operationRepo/Operation.ts

@@ -17,7 +17,7 @@ export class Operation<Model> {
   constructor(readonly changeType: CoreChangeType, readonly modelName: ModelName, deltas?: CoreDelta<Model>[]) {
     this.operationId = Math.random().toString(36).substring(2);
     this.payload = deltas ? this.getPayload(deltas) : undefined;
-    this.model = deltas ? deltas[0].model : undefined;
+    this.model = deltas ? deltas[deltas.length-1].model : undefined;
     this.timestamp = Date.now();
     this.jwtTokenAvailable = new Promise<void>(async resolve => {
       this.jwtToken = await Database.getJWTToken();

src/core/requestService/RequestService.ts

@@ -152,7 +152,7 @@ export class RequestService {
     subscription: Partial<SubscriptionModel>)
     : Promise<OneSignalApiBaseResponse> {
       const { appId } = requestMetadata;
-      return OneSignalApiBase.patch(`apps/${appId}/subscriptions/${subscriptionId}`, subscription);
+      return OneSignalApiBase.patch(`apps/${appId}/subscriptions/${subscriptionId}`, { subscription });
   }
 
   /**
@@ -192,7 +192,7 @@ export class RequestService {
       const { appId } = requestMetadata;
       return OneSignalApiBase.patch(
         `apps/${appId}/users/by/subscriptions/${subscriptionId}/identity`,
-        identity,
+        { identity },
         requestMetadata.jwtHeader
       );
   }
@@ -214,7 +214,7 @@ export class RequestService {
     retainPreviousOwner: boolean): Promise<OneSignalApiBaseResponse> {
       const { appId } = requestMetadata;
       return OneSignalApiBase.patch(`apps/${appId}/subscriptions/${subscriptionId}/owner`, {
-        identity,
+        identity: { ...identity },
         retain_previous_owner: retainPreviousOwner
       }, requestMetadata.jwtHeader);
     }

src/core/requestService/SubscriptionRequests.ts

@@ -41,14 +41,19 @@ export default class SubscriptionRequests {
   static async updateSubscription<Model>(operation: Operation<Model>): Promise<ExecutorResult<SupportedSubscription>> {
     logMethodCall("SubscriptionRequests.updateSubscription", operation);
 
-    const { subscription, subscriptionId } = processSubscriptionOperation(operation);
+    const { payload, subscriptionId } = processSubscriptionOperation(operation);
 
     if (!subscriptionId) {
       throw new OneSignalError("updateSubscription: subscriptionId is not defined");
     }
+
+    if (!payload) {
+      throw new OneSignalError("updateSubscription: payload is not defined");
+    }
+
     const appId = await MainHelper.getAppId();
 
-    const response = await RequestService.updateSubscription({ appId }, subscriptionId, subscription);
+    const response = await RequestService.updateSubscription({ appId }, subscriptionId, payload);
     return SubscriptionRequests._processSubscriptionResponse(response);
   }
 

src/core/requestService/helpers.ts

@@ -11,6 +11,7 @@ export function processSubscriptionOperation<Model>(operation: Operation<Model>)
   subscription: SupportedSubscription;
   aliasPair: AliasPair;
   subscriptionId?: string;
+  payload?: Partial<SupportedSubscription>
 } {
   const subscriptionOSModel = operation.model;
   const subscription = subscriptionOSModel?.data;
@@ -25,20 +26,21 @@ export function processSubscriptionOperation<Model>(operation: Operation<Model>)
     throw new OneSignalError(`processSubscriptionModel: bad subscription object: ${JSON.stringify(subscription)}`);
   }
 
-  let subscriptionId;
-  if (isCompleteSubscriptionObject(subscription)) {
-    subscriptionId = subscription?.id;
-  }
-
   // fixes typescript errors
   if (!subscriptionOSModel.onesignalId) {
     throw new OneSignalError(`processSubscriptionModel: missing onesignalId: ${JSON.stringify(subscriptionOSModel)}`);
   }
 
+  let subscriptionId;
+  if (isCompleteSubscriptionObject(subscription)) {
+    subscriptionId = subscription?.id;
+  }
+
   return {
     subscription,
     aliasPair: new AliasPair(AliasPair.ONESIGNAL_ID, subscriptionOSModel.onesignalId),
     subscriptionId,
+    payload: operation.payload as Partial<SupportedSubscription>
   };
 }
 
@@ -54,14 +56,17 @@ export function processIdentityOperation<Model>(operation: Operation<Model>): {
   }
 
   const { onesignal_id: onesignalId } = identity;
+  // delete onesignal_id from identity object, backend expects it to be in the URI only
+  const identityCopy = JSON.parse(JSON.stringify(identity));
+  delete identityCopy['onesignal_id'];
 
   // fixes typescript errors
   if (!onesignalId) {
     throw new OneSignalError(`processIdentityModel: missing onesignalId: ${JSON.stringify(identity)}`);
   }
 
   return {
-    identity,
+    identity: identityCopy,
     aliasPair: new AliasPair(AliasPair.ONESIGNAL_ID, onesignalId)
   };
 }

src/page/managers/LoginManager.ts

@@ -46,14 +46,18 @@ export default class LoginManager {
   static async identifyUser(userData: UserData, pushSubscriptionId?: string): Promise<Partial<UserData>> {
     logMethodCall("LoginManager.identifyUser", { userData, pushSubscriptionId });
 
+    const { onesignal_id: onesignalId } = userData.identity;
+
+    // only accepts one alias, so remove other aliases only leaving external_id
+    this.prepareIdentityForUpsert(userData);
     let { identity } = userData;
 
-    if (!identity || !identity.onesignal_id) {
+    if (!identity || !onesignalId) {
       throw new OneSignalError("identifyUser failed: no identity found");
     }
 
     const appId = await MainHelper.getAppId();
-    const aliasPair = new AliasPair(AliasPair.ONESIGNAL_ID, identity.onesignal_id);
+    const aliasPair = new AliasPair(AliasPair.ONESIGNAL_ID, onesignalId);
     const identifyUserResponse = await RequestService.addAlias({ appId }, aliasPair, identity);
 
     const identifyResponseStatus = identifyUserResponse?.status;
@@ -63,8 +67,6 @@ export default class LoginManager {
       Log.info(`identifyUser failed: externalId already exists. Attempting to transfer push subscription...`);
 
       const retainPreviousOwner = false;
-      // only accepts one alias, so remove other aliases only leaving external_id
-      this.prepareIdentityForUpsert(userData);
       identity = userData.identity;
       const transferResponse = await RequestService.transferSubscription(
         { appId },

src/shared/managers/SubscriptionManager.ts

@@ -180,6 +180,12 @@ export class SubscriptionManager {
         );
     }
     pushModel.set("notification_types", notificationTypes);
+
+    if (notificationTypes === 1) {
+      pushModel.set('enabled', true);
+    } else if (notificationTypes === -2) {
+      pushModel.set('enabled', false);
+    }
   }
 
   /**