This partially fixes issue #1177 (deregistration does not clear devic…

…e details) and only resets clientId, since it affects push device registration with a different clientId (after deregistration with previous clientId). This only affects clients that do not restart their apps after deregistration, since clientId is loaded into deviceId once per app launch. This commit resets clientId after deregistration.
ably · Nov 12, 2023 · 821d7e4 · 821d7e4
1 parent 244dc3b
commit 821d7e4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Source/ARTLocalDevice.m b/Source/ARTLocalDevice.m
@@ -147,6 +147,9 @@ - (void)setAndPersistIdentityTokenDetails:(ARTDeviceIdentityTokenDetails *)token
     if (self.clientId == nil) {
         self.clientId = tokenDetails.clientId;
     }
+    if (tokenDetails == nil) {
+        self.clientId = nil;
+    }
 }
 
 - (BOOL)isRegistered {

diff --git a/Test/Tests/PushActivationStateMachineTests.swift b/Test/Tests/PushActivationStateMachineTests.swift
@@ -822,8 +822,16 @@ class PushActivationStateMachineTests: XCTestCase {
 
     // RSH3g2
     func test__054__Activation_state_machine__State_WaitingForDeregistration__on_Event_Deregistered() {
-        beforeEach__Activation_state_machine__State_WaitingForDeregistration()
-
+        storage = MockDeviceStorage(startWith: ARTPushActivationStateWaitingForDeregistration(machine: initialStateMachine, logger: .init(core: MockInternalLogCore())))
+
+        let options = ARTClientOptions(key: "xxxx:xxxx")
+        options.clientId = "client1"
+        let rest = ARTRest(options: options)
+        rest.internal.storage = storage
+        stateMachine = ARTPushActivationStateMachine(rest: rest.internal, delegate: StateMachineDelegate(), logger: .init(core: MockInternalLogCore()))
+
+        XCTAssertEqual(stateMachine.rest.device.clientId, "client1")
+
         var deactivatedCallbackCalled = false
         let hook = stateMachine.testSuite_injectIntoMethod(after: NSSelectorFromString("callDeactivatedCallback:")) {
             deactivatedCallbackCalled = true
@@ -841,6 +849,7 @@ class PushActivationStateMachineTests: XCTestCase {
         XCTAssertTrue(deactivatedCallbackCalled)
         XCTAssertTrue(setAndPersistIdentityTokenDetailsCalled)
         // RSH3g2a
+        XCTAssertNil(stateMachine.rest.device.clientId)
         XCTAssertNil(stateMachine.rest.device.identityTokenDetails)
     }