fix user info not persists when reset (#179)

* fix reset not persisted in disk * add unit tests * update sample apps permission
segmentio · Aug 2, 2023 · 310c020 · 310c020
1 parent 980ae87
commit 310c020
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 13 deletions.
diff --git a/android/src/test/java/com/segment/analytics/kotlin/android/StorageTests.kt b/android/src/test/java/com/segment/analytics/kotlin/android/StorageTests.kt
@@ -95,6 +95,19 @@ class StorageTests {
             assertEquals("{}", traits)
         }
 
+        @Test
+        fun `userInfo reset action removes userInfo`() = runTest {
+            store.dispatch(UserInfo.ResetAction(), UserInfo::class)
+
+            val userId = androidStorage.read(Storage.Constants.UserId)
+            val anonId = androidStorage.read(Storage.Constants.AnonymousId)
+            val traits = androidStorage.read(Storage.Constants.Traits)
+
+            assertNotNull(anonId)
+            assertEquals(null, userId)
+            assertEquals(null, traits)
+        }
+
         @Test
         fun `system update calls write for settings`() = runTest {
             val action = object : Action<System> {
@@ -137,6 +150,20 @@ class StorageTests {
             )
         }
 
+        @Test
+        fun `system reset action removes system`() = runTest {
+            val action = object : Action<System> {
+                override fun reduce(state: System): System {
+                    return System(state.configuration, null, state.running, state.initialSettingsDispatched, state.enabled)
+                }
+            }
+            store.dispatch(action, System::class)
+
+            val settings = androidStorage.read(Storage.Constants.Settings)
+
+            assertEquals(null, settings)
+        }
+
         @Nested
         inner class KeyValueStorage {
             val map = getWorkingMap(mockContext.getSharedPreferences("", 0))

diff --git a/core/src/main/java/com/segment/analytics/kotlin/core/Storage.kt b/core/src/main/java/com/segment/analytics/kotlin/core/Storage.kt
@@ -57,21 +57,25 @@ interface Storage {
 
     suspend fun userInfoUpdate(userInfo: UserInfo) {
         write(Constants.AnonymousId, userInfo.anonymousId)
-        userInfo.userId?.let { write(Constants.UserId, it) }
+
+        userInfo.userId?.let {
+            write(Constants.UserId, it)
+        } ?: run {
+            remove(Constants.UserId)
+        }
+
         userInfo.traits?.let {
-            write(
-                Constants.Traits,
-                Json.encodeToString(JsonObject.serializer(), it)
-            )
+            write(Constants.Traits, Json.encodeToString(JsonObject.serializer(), it))
+        } ?: run {
+            remove(Constants.Traits)
         }
     }
 
     suspend fun systemUpdate(system: System) {
         system.settings?.let {
-            write(
-                Constants.Settings,
-                Json.encodeToString(Settings.serializer(), it)
-            )
+            write(Constants.Settings, Json.encodeToString(Settings.serializer(), it))
+        } ?: run {
+            remove(Constants.Settings)
         }
     }
 }

diff --git a/core/src/test/kotlin/com/segment/analytics/kotlin/core/AnalyticsTests.kt b/core/src/test/kotlin/com/segment/analytics/kotlin/core/AnalyticsTests.kt
@@ -704,12 +704,14 @@ class AnalyticsTests {
 
                 analytics.identify("oldUserId",
                         buildJsonObject { put("behaviour", "bad") })
-                assertEquals(analytics.userIdAsync(), "oldUserId")
-                assertEquals(analytics.traitsAsync(), buildJsonObject { put("behaviour", "bad") })
+                assertEquals(analytics.userId(), "oldUserId")
+                assertEquals(analytics.traits(), buildJsonObject { put("behaviour", "bad") })
 
                 analytics.reset()
-                assertEquals(analytics.userIdAsync(), null)
-                assertEquals(analytics.traitsAsync(), null)
+                assertEquals(analytics.userId(), null)
+                assertEquals(analytics.traits(), null)
+                assertEquals(analytics.storage.read(Storage.Constants.UserId), null)
+                assertEquals(analytics.storage.read(Storage.Constants.Traits), null)
                 verify { plugin.reset() }
             }
         }

diff --git a/core/src/test/kotlin/com/segment/analytics/kotlin/core/compat/JavaAnalyticsTest.kt b/core/src/test/kotlin/com/segment/analytics/kotlin/core/compat/JavaAnalyticsTest.kt
@@ -528,6 +528,8 @@ internal class JavaAnalyticsTest {
             analytics.reset()
             assertEquals(analytics.userId(), null)
             assertEquals(analytics.traits(), null)
+            assertEquals(analytics.storage.read(Storage.Constants.UserId), null)
+            assertEquals(analytics.storage.read(Storage.Constants.Traits), null)
             verify { plugin.reset() }
         }
     }

diff --git a/core/src/test/kotlin/com/segment/analytics/kotlin/core/utilities/StorageImplTest.kt b/core/src/test/kotlin/com/segment/analytics/kotlin/core/utilities/StorageImplTest.kt
@@ -91,6 +91,19 @@ internal class StorageImplTest {
         assertEquals("{}", traits)
     }
 
+    @Test
+    fun `userInfo reset action removes userInfo`() = runTest {
+        store.dispatch(UserInfo.ResetAction(), UserInfo::class)
+
+        val userId = storage.read(Storage.Constants.UserId)
+        val anonId = storage.read(Storage.Constants.AnonymousId)
+        val traits = storage.read(Storage.Constants.Traits)
+
+        assertNotNull(anonId)
+        assertEquals(null, userId)
+        assertEquals(null, traits)
+    }
+
     @Test
     fun `system update calls write for settings`() = runTest {
         val action = object : Action<System> {
@@ -135,6 +148,20 @@ internal class StorageImplTest {
         )
     }
 
+    @Test
+    fun `system reset action removes system`() = runTest {
+        val action = object : Action<System> {
+            override fun reduce(state: System): System {
+                return System(state.configuration, null, state.running, state.initialSettingsDispatched, state.enabled)
+            }
+        }
+        store.dispatch(action, System::class)
+
+        val settings = storage.read(Storage.Constants.Settings)
+
+        assertEquals(null, settings)
+    }
+
     @Nested
     inner class EventsStorage() {
 

diff --git a/samples/kotlin-android-app-destinations/src/main/AndroidManifest.xml b/samples/kotlin-android-app-destinations/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
     <!-- Allows location to be tracked. -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".MainApplication"

diff --git a/samples/kotlin-android-app/src/main/AndroidManifest.xml b/samples/kotlin-android-app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
     <!-- Allows location to be tracked. -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".MainApplication"