rebased to 5.1.12

jinliu9508 · jinliu9508 · commit 4d1a0b400795 · 2024-05-15T13:56:42.000-04:00
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/IUserJwtInvalidatedListener.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/IUserJwtInvalidatedListener.kt
@@ -13,4 +13,4 @@ interface IUserJwtInvalidatedListener {
      * @param event The user JWT that expired.
      */
     fun onUserJwtInvalidated(event: UserJwtInvalidatedEvent)
-}
+}
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/UserJwtInvalidatedEvent.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/UserJwtInvalidatedEvent.kt
@@ -6,7 +6,5 @@ package com.onesignal
  *
  */
 class UserJwtInvalidatedEvent(
-        val externalId: String
-) {
-
-}
+    val externalId: String,
+)
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/IHttpClient.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/IHttpClient.kt
@@ -18,7 +18,7 @@ interface IHttpClient {
     suspend fun post(
         url: String,
         body: JSONObject,
-        jwt: String? = null
+        jwt: String? = null,
     ): HttpResponse
 
     /**
@@ -35,7 +35,7 @@ interface IHttpClient {
     suspend fun get(
         url: String,
         cacheKey: String? = null,
-        jwt: String? = null
+        jwt: String? = null,
     ): HttpResponse
 
     /**
@@ -49,7 +49,7 @@ interface IHttpClient {
     suspend fun put(
         url: String,
         body: JSONObject,
-        jwt: String? = null
+        jwt: String? = null,
     ): HttpResponse
 
     /**
@@ -63,7 +63,7 @@ interface IHttpClient {
     suspend fun patch(
         url: String,
         body: JSONObject,
-        jwt: String? = null
+        jwt: String? = null,
     ): HttpResponse
 
     /**
@@ -75,7 +75,7 @@ interface IHttpClient {
      */
     suspend fun delete(
         url: String,
-        jwt: String? = null
+        jwt: String? = null,
     ): HttpResponse
 }
 
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt
@@ -87,7 +87,7 @@ internal class HttpClient(
         jsonBody: JSONObject?,
         timeout: Int,
         cacheKey: String?,
-        jwt: String? = null
+        jwt: String? = null,
     ): HttpResponse {
         // If privacy consent is required but not yet given, any non-GET request should be blocked.
         if (method != null && _configModelStore.model.consentRequired == true && _configModelStore.model.consentGiven != true) {
@@ -119,7 +119,7 @@ internal class HttpClient(
         jsonBody: JSONObject?,
         timeout: Int,
         cacheKey: String?,
-        jwt: String? = null
+        jwt: String? = null,
     ): HttpResponse {
         var retVal: HttpResponse? = null
 
@@ -210,7 +210,9 @@ internal class HttpClient(
                                     PreferenceStores.ONESIGNAL,
                                     PreferenceOneSignalKeys.PREFS_OS_HTTP_CACHE_PREFIX + cacheKey,
                                 )
-                            Logging.debug("HttpClient: Got Response = ${method ?: "GET"} ${con.url} - Using Cached response due to 304: " + cachedResponse)
+                            Logging.debug(
+                                "HttpClient: Got Response = ${method ?: "GET"} ${con.url} - Using Cached response due to 304: " + cachedResponse,
+                            )
 
                             // TODO: SHOULD RETURN OK INSTEAD OF NOT_MODIFIED TO MAKE TRANSPARENT?
                             retVal = HttpResponse(httpResponse, cachedResponse, retryAfterSeconds = retryAfter)
@@ -220,7 +222,9 @@ internal class HttpClient(
                             val scanner = Scanner(inputStream, "UTF-8")
                             val json = if (scanner.useDelimiter("\\A").hasNext()) scanner.next() else ""
                             scanner.close()
-                            Logging.debug("HttpClient: Got Response = ${method ?: "GET"} ${con.url} - STATUS: $httpResponse - Body: " + json)
+                            Logging.debug(
+                                "HttpClient: Got Response = ${method ?: "GET"} ${con.url} - STATUS: $httpResponse - Body: " + json,
+                            )
 
                             if (cacheKey != null) {
                                 val eTag = con.getHeaderField("etag")
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/identity/IdentityModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/identity/IdentityModelStore.kt
@@ -10,8 +10,8 @@ open class IdentityModelStore(prefs: IPreferencesService) : SingletonModelStore<
 ) {
     fun invalidateJwt() {
         model.setStringProperty(
-                IdentityConstants.JWT_TOKEN,
-                "",
+            IdentityConstants.JWT_TOKEN,
+            "",
         )
     }
 }
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/CreateSubscriptionOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/CreateSubscriptionOperation.kt
@@ -1,6 +1,5 @@
 package com.onesignal.user.internal.operations
 
-import com.onesignal.OneSignal
 import com.onesignal.common.IDManager
 import com.onesignal.core.internal.operations.GroupComparisonType
 import com.onesignal.core.internal.operations.Operation
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteSubscriptionOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteSubscriptionOperation.kt
@@ -1,6 +1,5 @@
 package com.onesignal.user.internal.operations
 
-import com.onesignal.OneSignal
 import com.onesignal.common.IDManager
 import com.onesignal.core.internal.operations.GroupComparisonType
 import com.onesignal.core.internal.operations.Operation
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/LoginUserOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/LoginUserOperation.kt
@@ -1,6 +1,5 @@
 package com.onesignal.user.internal.operations
 
-import com.onesignal.OneSignal
 import com.onesignal.common.IDManager
 import com.onesignal.core.internal.operations.GroupComparisonType
 import com.onesignal.core.internal.operations.Operation
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/TransferSubscriptionOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/TransferSubscriptionOperation.kt
@@ -1,6 +1,5 @@
 package com.onesignal.user.internal.operations
 
-import com.onesignal.OneSignal
 import com.onesignal.common.IDManager
 import com.onesignal.core.internal.operations.GroupComparisonType
 import com.onesignal.core.internal.operations.Operation
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/UpdateSubscriptionOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/UpdateSubscriptionOperation.kt
@@ -1,6 +1,5 @@
 package com.onesignal.user.internal.operations
 
-import com.onesignal.OneSignal
 import com.onesignal.common.IDManager
 import com.onesignal.core.internal.operations.GroupComparisonType
 import com.onesignal.core.internal.operations.Operation
diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt
@@ -1,8 +1,6 @@
 package com.onesignal.user.internal
 
 import com.onesignal.IUserJwtInvalidatedListener
-import com.onesignal.common.modeling.ModelChangeTags
-import com.onesignal.common.modeling.ModelChangedArgs
 import com.onesignal.core.internal.language.ILanguageContext
 import com.onesignal.core.internal.operations.ExecutionResponse
 import com.onesignal.core.internal.operations.ExecutionResult
@@ -157,7 +155,8 @@ class UserManagerTests : FunSpec({
                 it.tags["my-tag-key1"] = "my-tag-value1"
             }
 
-        val userManager = UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext())
+        val userManager =
+            UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext())
 
         // When
         val tagSnapshot1 = userManager.getTags()
@@ -224,19 +223,29 @@ class UserManagerTests : FunSpec({
         // mock backend service
         val mockUserBackendService = mockk<IUserBackendService>()
         coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } returns
-                CreateUserResponse(mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId), PropertiesObject(), listOf())
+            CreateUserResponse(mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId), PropertiesObject(), listOf())
 
         // mock operation for login user
         val mockIdentityOperationExecutor = mockk<IdentityOperationExecutor>()
         coEvery { mockIdentityOperationExecutor.execute(any()) } returns
-                ExecutionResponse(ExecutionResult.FAIL_UNAUTHORIZED)
+            ExecutionResponse(ExecutionResult.FAIL_UNAUTHORIZED)
         val loginUserOperationExecutor =
-                LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore(), mockLanguageContext)
+            LoginUserOperationExecutor(
+                mockIdentityOperationExecutor,
+                MockHelper.applicationService(),
+                MockHelper.deviceService(),
+                mockUserBackendService,
+                mockIdentityModelStore,
+                mockPropertiesModelStore,
+                mockSubscriptionsModelStore,
+                MockHelper.configModelStore(),
+                mockLanguageContext,
+            )
         val operations = listOf<Operation>(LoginUserOperation(appId, localOneSignalId, "externalId", "existingOneSignalId"))
 
         // mock user manager with jwtInvalidatedListener added
         val userManager =
-                UserManager(mockSubscriptionManager, mockIdentityModelStore, mockPropertiesModelStore, mockLanguageContext)
+            UserManager(mockSubscriptionManager, mockIdentityModelStore, mockPropertiesModelStore, mockLanguageContext)
         mockIdentityModelStore.subscribe(userManager)
         val spyJwtInvalidatedListener = spyk<IUserJwtInvalidatedListener>()
         userManager.addUserJwtInvalidatedListner(spyJwtInvalidatedListener)

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ open class IdentityModelStore(prefs: IPreferencesService) : SingletonModelStore<`
`10`	`10`	`) {`
`11`	`11`	`fun invalidateJwt() {`
`12`	`12`	`model.setStringProperty(`
`13`		`- IdentityConstants.JWT_TOKEN,`
`14`		`- "",`
	`13`	`+ IdentityConstants.JWT_TOKEN,`
	`14`	`+ "",`
`15`	`15`	`)`
`16`	`16`	`}`
`17`	`17`	`}`