Save new player_id if returned from on_sessionThis happens when the player id deleted via the OneSignal dashboardand the user returns to the site

Author: jkasten2

src/managers/UpdateManager.ts

@@ -81,8 +81,15 @@ export class UpdateManager {
     }
 
     try {
-      await OneSignalApiShared.updateUserSession(deviceId, deviceRecord);
+      const newPlayerId = await OneSignalApiShared.updateUserSession(deviceId, deviceRecord);
       this.onSessionSent = true;
+
+      // If the returned player id is different, save the new id.
+      if (newPlayerId !== deviceId) {
+        const subscription = await Database.getSubscription();
+        subscription.deviceId = newPlayerId;
+        await Database.setSubscription(subscription);
+      }
     } catch(e) {
       Log.error(`Failed to update user session. Error "${e.message}" ${e.stack}`);
     }

test/unit/managers/UpdateManager.ts

@@ -1,4 +1,5 @@
 import test from "ava";
+import nock from "nock";
 import sinon, { SinonSandbox } from "sinon";
 import { TestEnvironment, HttpHttpsEnvironment } from "../../support/sdk/TestEnvironment";
 import { UpdateManager } from "../../../src/managers/UpdateManager";
@@ -8,6 +9,7 @@ import OneSignalApiShared from "../../../src/OneSignalApiShared";
 import MainHelper from "../../../src/helpers/MainHelper";
 import { SubscriptionStateKind } from "../../../src/models/SubscriptionStateKind";
 import { PushDeviceRecord } from "../../../src/models/PushDeviceRecord";
+import { Subscription } from '../../../src/models/Subscription';
 
 // manually create and restore the sandbox
 const sandbox: SinonSandbox = sinon.sandbox.create();
@@ -98,6 +100,29 @@ test("sendOnSessionUpdate triggers on_session for existing subscribed user if ha
   t.is(OneSignal.context.updateManager.onSessionAlreadyCalled(), true);
 });
 
+test("on_session saves new player id if returned from onesignal.com", async t => {
+  // 1. Setup existing player id in indexDB
+  const playerId = Random.getRandomUuid();
+  const subscription = new Subscription();
+  subscription.deviceId = playerId;
+  await Database.setSubscription(subscription);
+
+  // 2. Mock on_session endpoint to give a new player_id
+  const newPlayerId = Random.getRandomUuid();
+  nock('https://onesignal.com')
+   .post(`/api/v1/players/${playerId}/on_session`)
+   .reply(200, { success: true, id: newPlayerId });
+
+  // 3. Make on_session call
+  sandbox.stub(OneSignal.context.sessionManager, "isFirstPageView").returns(true);
+  sandbox.stub(MainHelper, "getCurrentNotificationType").resolves(SubscriptionStateKind.Subscribed);
+  await OneSignal.context.updateManager.sendOnSessionUpdate();
+
+  // 4. Ensure we have the new playe_id saved in indexDB
+  const newSubscription = await Database.getSubscription();
+  t.is(newSubscription.deviceId, newPlayerId);
+});
+
 test("sendOnSessionUpdate triggers on_session for existing unsubscribed user if hasn't done so already and if enableOnSession flag is present", async t => {
   sandbox.stub(Database, "getSubscription").resolves({ deviceId: Random.getRandomUuid() });
   sandbox.stub(OneSignal.context.sessionManager, "isFirstPageView").returns(true);