diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt index 958dc8d699..b2e66548ee 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt @@ -12,13 +12,13 @@ interface IUserBackendService { * @param appId The ID of the OneSignal application this user will be created under. * @param identities The identities to retrieve/modify this user in subsequent requests. Each identity key/value pair must be unique within * the application. - * @param properties The properties for this user. * @param subscriptions The subscriptions that should also be created and associated with the user. If subscriptions are already owned by a different user * they will be transferred to this user. * * @return The backend response */ - suspend fun createUser(appId: String, identities: Map, properties: PropertiesObject, subscriptions: List): CreateUserResponse + suspend fun createUser(appId: String, identities: Map, subscriptions: List): CreateUserResponse + // TODO: Change to send only the push subscription, optimally /** * Update the user identified by the [appId]/[aliasId]/[aliasLabel] on the backend. diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt index 8fadfa2f34..ce2901f4a6 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt @@ -14,17 +14,13 @@ internal class UserBackendService( private val _httpClient: IHttpClient, ) : IUserBackendService { - override suspend fun createUser(appId: String, identities: Map, properties: PropertiesObject, subscriptions: List): CreateUserResponse { + override suspend fun createUser(appId: String, identities: Map, subscriptions: List): CreateUserResponse { val requestJSON = JSONObject() if (identities.isNotEmpty()) { requestJSON.put("identity", JSONObject().putMap(identities)) } - if (properties.hasAtLeastOnePropertySet) { - requestJSON.put("properties", JSONConverter.convertToJSON(properties)) - } - if (subscriptions.isNotEmpty()) { requestJSON .put("subscriptions", JSONConverter.convertToJSON(subscriptions)) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteAliasOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteAliasOperation.kt index cb5ba29cf4..8eb614de1d 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteAliasOperation.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteAliasOperation.kt @@ -31,7 +31,7 @@ class DeleteAliasOperation() : Operation(IdentityOperationExecutor.DELETE_ALIAS) get() = getStringProperty(::label.name) private set(value) { setStringProperty(::label.name, value) } - override val createComparisonKey: String get() = "$appId.User.$onesignalId" + override val createComparisonKey: String get() = "" override val modifyComparisonKey: String get() = "$appId.User.$onesignalId.Alias.$label" override val groupComparisonType: GroupComparisonType = GroupComparisonType.NONE override val canStartExecute: Boolean get() = !IDManager.isLocalId(onesignalId) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteTagOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteTagOperation.kt index f6e2081731..9be3fd2b69 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteTagOperation.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteTagOperation.kt @@ -32,7 +32,7 @@ class DeleteTagOperation() : Operation(UpdateUserOperationExecutor.DELETE_TAG) { get() = getStringProperty(::key.name) private set(value) { setStringProperty(::key.name, value) } - override val createComparisonKey: String get() = "$appId.User.$onesignalId" + override val createComparisonKey: String get() = "" override val modifyComparisonKey: String get() = createComparisonKey override val groupComparisonType: GroupComparisonType = GroupComparisonType.ALTER override val canStartExecute: Boolean get() = !IDManager.isLocalId(onesignalId) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetAliasOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetAliasOperation.kt index 28fbddbf25..64a5859f0b 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetAliasOperation.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetAliasOperation.kt @@ -39,7 +39,7 @@ class SetAliasOperation() : Operation(IdentityOperationExecutor.SET_ALIAS) { get() = getStringProperty(::value.name) private set(value) { setStringProperty(::value.name, value) } - override val createComparisonKey: String get() = "$appId.User.$onesignalId" + override val createComparisonKey: String get() = "" override val modifyComparisonKey: String get() = "$appId.User.$onesignalId.Identity.$label" override val groupComparisonType: GroupComparisonType = GroupComparisonType.ALTER override val canStartExecute: Boolean get() = !IDManager.isLocalId(onesignalId) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetPropertyOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetPropertyOperation.kt index ca951fcdff..d735e93b33 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetPropertyOperation.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetPropertyOperation.kt @@ -38,7 +38,7 @@ class SetPropertyOperation() : Operation(UpdateUserOperationExecutor.SET_PROPERT get() = getOptAnyProperty(::value.name) private set(value) { setOptAnyProperty(::value.name, value) } - override val createComparisonKey: String get() = "$appId.User.$onesignalId" + override val createComparisonKey: String get() = "" override val modifyComparisonKey: String get() = createComparisonKey override val groupComparisonType: GroupComparisonType = GroupComparisonType.ALTER override val canStartExecute: Boolean get() = !IDManager.isLocalId(onesignalId) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetTagOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetTagOperation.kt index ab83e69090..8eca0026e6 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetTagOperation.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetTagOperation.kt @@ -39,7 +39,7 @@ class SetTagOperation() : Operation(UpdateUserOperationExecutor.SET_TAG) { get() = getStringProperty(::value.name) private set(value) { setStringProperty(::value.name, value) } - override val createComparisonKey: String get() = "$appId.User.$onesignalId" + override val createComparisonKey: String get() = "" override val modifyComparisonKey: String get() = createComparisonKey override val groupComparisonType: GroupComparisonType = GroupComparisonType.ALTER override val canStartExecute: Boolean get() = !IDManager.isLocalId(onesignalId) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt index 1313542380..8fd531da2b 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt @@ -18,18 +18,13 @@ import com.onesignal.core.internal.operations.Operation import com.onesignal.debug.internal.logging.Logging import com.onesignal.user.internal.backend.IUserBackendService import com.onesignal.user.internal.backend.IdentityConstants -import com.onesignal.user.internal.backend.PropertiesObject import com.onesignal.user.internal.backend.SubscriptionObject import com.onesignal.user.internal.backend.SubscriptionObjectType import com.onesignal.user.internal.identity.IdentityModelStore import com.onesignal.user.internal.operations.CreateSubscriptionOperation -import com.onesignal.user.internal.operations.DeleteAliasOperation import com.onesignal.user.internal.operations.DeleteSubscriptionOperation -import com.onesignal.user.internal.operations.DeleteTagOperation import com.onesignal.user.internal.operations.LoginUserOperation import com.onesignal.user.internal.operations.SetAliasOperation -import com.onesignal.user.internal.operations.SetPropertyOperation -import com.onesignal.user.internal.operations.SetTagOperation import com.onesignal.user.internal.operations.TransferSubscriptionOperation import com.onesignal.user.internal.operations.UpdateSubscriptionOperation import com.onesignal.user.internal.properties.PropertiesModel @@ -103,7 +98,6 @@ internal class LoginUserOperationExecutor( private suspend fun createUser(createUserOperation: LoginUserOperation, operations: List): ExecutionResponse { var identities = mapOf() - var propertiesObject = PropertiesObject() var subscriptions = mapOf() if (createUserOperation.externalId != null) { @@ -115,21 +109,16 @@ internal class LoginUserOperationExecutor( // go through the operations grouped with this create user and apply them to the appropriate objects. for (operation in operations) { when (operation) { - is SetAliasOperation -> identities = createIdentityFromOperation(operation, identities) - is DeleteAliasOperation -> identities = createIdentityFromOperation(operation, identities) is CreateSubscriptionOperation -> subscriptions = createSubscriptionsFromOperation(operation, subscriptions) is TransferSubscriptionOperation -> subscriptions = createSubscriptionsFromOperation(operation, subscriptions) is UpdateSubscriptionOperation -> subscriptions = createSubscriptionsFromOperation(operation, subscriptions) is DeleteSubscriptionOperation -> subscriptions = createSubscriptionsFromOperation(operation, subscriptions) - is SetTagOperation -> propertiesObject = PropertyOperationHelper.createPropertiesFromOperation(operation, propertiesObject) - is DeleteTagOperation -> propertiesObject = PropertyOperationHelper.createPropertiesFromOperation(operation, propertiesObject) - is SetPropertyOperation -> propertiesObject = PropertyOperationHelper.createPropertiesFromOperation(operation, propertiesObject) } } try { val subscriptionList = subscriptions.toList() - val response = _userBackend.createUser(createUserOperation.appId, identities, propertiesObject, subscriptionList.map { it.second }) + val response = _userBackend.createUser(createUserOperation.appId, identities, subscriptionList.map { it.second }) val idTranslations = mutableMapOf() // Add the "local-to-backend" ID translation to the IdentifierTranslator for any operations that were // *not* executed but still reference the locally-generated IDs. @@ -181,18 +170,6 @@ internal class LoginUserOperationExecutor( } } - private fun createIdentityFromOperation(operation: SetAliasOperation, identity: Map): Map { - val mutableIdentity = identity.toMutableMap() - mutableIdentity[operation.label] = operation.value - return mutableIdentity - } - - private fun createIdentityFromOperation(operation: DeleteAliasOperation, identity: Map): Map { - val mutableIdentity = identity.toMutableMap() - mutableIdentity.remove(operation.label) - return mutableIdentity - } - private fun createSubscriptionsFromOperation(operation: TransferSubscriptionOperation, subscriptions: Map): Map { val mutableSubscriptions = subscriptions.toMutableMap() if (mutableSubscriptions.containsKey(operation.subscriptionId)) { diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/backend/UserBackendServiceTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/backend/UserBackendServiceTests.kt index 52c6ce8faf..8a9bd1fc5b 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/backend/UserBackendServiceTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/backend/UserBackendServiceTests.kt @@ -28,12 +28,11 @@ class UserBackendServiceTests : FunSpec({ coEvery { spyHttpClient.post(any(), any()) } returns HttpResponse(403, "FORBIDDEN") val userBackendService = UserBackendService(spyHttpClient) val identities = mapOf() - val properties = PropertiesObject() val subscriptions = listOf() /* When */ val exception = shouldThrowUnit { - userBackendService.createUser("appId", identities, properties, subscriptions) + userBackendService.createUser("appId", identities, subscriptions) } /* Then */ @@ -48,11 +47,10 @@ class UserBackendServiceTests : FunSpec({ coEvery { spyHttpClient.post(any(), any()) } returns HttpResponse(202, "{identity:{onesignal_id: \"$osId\", aliasLabel1: \"aliasValue1\"}}") val userBackendService = UserBackendService(spyHttpClient) val identities = mapOf("aliasLabel1" to "aliasValue1") - val properties = PropertiesObject() val subscriptions = listOf() /* When */ - val response = userBackendService.createUser("appId", identities, properties, subscriptions) + val response = userBackendService.createUser("appId", identities, subscriptions) /* Then */ response.identities["onesignal_id"] shouldBe osId @@ -79,12 +77,11 @@ class UserBackendServiceTests : FunSpec({ coEvery { spyHttpClient.post(any(), any()) } returns HttpResponse(202, "{identity:{onesignal_id: \"$osId\"}, subscriptions:[{id:\"subscriptionId1\", type:\"AndroidPush\"}]}") val userBackendService = UserBackendService(spyHttpClient) val identities = mapOf() - val properties = PropertiesObject() val subscriptions = mutableListOf() subscriptions.add(SubscriptionObject("SHOULDNOTUSE", SubscriptionObjectType.ANDROID_PUSH)) /* When */ - val response = userBackendService.createUser("appId", identities, properties, subscriptions) + val response = userBackendService.createUser("appId", identities, subscriptions) /* Then */ response.identities["onesignal_id"] shouldBe osId @@ -107,40 +104,6 @@ class UserBackendServiceTests : FunSpec({ } } - test("create user with an alias and properties creates a new user") { - /* Given */ - val osId = "11111111-1111-1111-1111-111111111111" - val spyHttpClient = mockk() - coEvery { spyHttpClient.post(any(), any()) } returns HttpResponse(202, "{identity:{onesignal_id: \"$osId\", aliasLabel1: \"aliasValue1\"}, properties: { tags: {tagKey1: tagValue1}}}") - val userBackendService = UserBackendService(spyHttpClient) - val identities = mapOf("aliasLabel1" to "aliasValue1") - val properties = PropertiesObject(tags = mapOf("tagkey1" to "tagValue1")) - val subscriptions = listOf() - - /* When */ - val response = userBackendService.createUser("appId", identities, properties, subscriptions) - - /* Then */ - response.identities["onesignal_id"] shouldBe osId - response.identities["aliasLabel1"] shouldBe "aliasValue1" - response.subscriptions.count() shouldBe 0 - coVerify { - spyHttpClient.post( - "apps/appId/users", - withArg { - it.has("identity") shouldBe true - it.getJSONObject("identity").has("aliasLabel1") shouldBe true - it.getJSONObject("identity").getString("aliasLabel1") shouldBe "aliasValue1" - it.has("properties") shouldBe true - it.getJSONObject("properties").has("tags") shouldBe true - it.getJSONObject("properties").getJSONObject("tags").has("tagkey1") shouldBe true - it.getJSONObject("properties").getJSONObject("tags").getString("tagkey1") shouldBe "tagValue1" - it.has("subscriptions") shouldBe false - }, - ) - } - } - test("update user tags") { /* Given */ val aliasLabel = "onesignal_id" diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt index 97d0498492..9c86a51d4b 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt @@ -46,7 +46,7 @@ class LoginUserOperationExecutorTests : FunSpec({ test("login anonymous user successfully creates user") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } returns + coEvery { mockUserBackendService.createUser(any(), any(), any()) } returns CreateUserResponse( mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId), PropertiesObject(), @@ -80,7 +80,6 @@ class LoginUserOperationExecutorTests : FunSpec({ appId, mapOf(), any(), - any(), ) } } @@ -88,7 +87,7 @@ class LoginUserOperationExecutorTests : FunSpec({ test("login anonymous user fails with retry when network condition exists") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } throws BackendException(408, "TIMEOUT") + coEvery { mockUserBackendService.createUser(any(), any(), any()) } throws BackendException(408, "TIMEOUT") val mockIdentityOperationExecutor = mockk() @@ -104,13 +103,13 @@ class LoginUserOperationExecutorTests : FunSpec({ /* Then */ response.result shouldBe ExecutionResult.FAIL_RETRY - coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(), any(), any()) } + coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(), any()) } } test("login anonymous user fails with no retry when backend error condition exists") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } throws BackendException(404, "NOT FOUND") + coEvery { mockUserBackendService.createUser(any(), any(), any()) } throws BackendException(404, "NOT FOUND") val mockIdentityOperationExecutor = mockk() @@ -126,13 +125,13 @@ class LoginUserOperationExecutorTests : FunSpec({ /* Then */ response.result shouldBe ExecutionResult.FAIL_NORETRY - coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(), any(), any()) } + coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(), any()) } } test("login identified user without association successfully creates user") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } returns + coEvery { mockUserBackendService.createUser(any(), any(), any()) } returns CreateUserResponse(mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId), PropertiesObject(), listOf()) val mockIdentityOperationExecutor = mockk() @@ -149,7 +148,7 @@ class LoginUserOperationExecutorTests : FunSpec({ /* Then */ response.result shouldBe ExecutionResult.SUCCESS - coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(IdentityConstants.EXTERNAL_ID to "externalId"), any(), any()) } + coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(IdentityConstants.EXTERNAL_ID to "externalId"), any()) } } test("login identified user with association succeeds when association is successful") { @@ -188,7 +187,7 @@ class LoginUserOperationExecutorTests : FunSpec({ test("login identified user with association fails with retry when association fails with retry") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } returns + coEvery { mockUserBackendService.createUser(any(), any(), any()) } returns CreateUserResponse(mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId), PropertiesObject(), listOf()) val mockIdentityOperationExecutor = mockk() @@ -223,7 +222,7 @@ class LoginUserOperationExecutorTests : FunSpec({ test("login identified user with association successfully creates user when association fails with no retry") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } returns + coEvery { mockUserBackendService.createUser(any(), any(), any()) } returns CreateUserResponse(mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId), PropertiesObject(), listOf()) val mockIdentityOperationExecutor = mockk() @@ -253,13 +252,13 @@ class LoginUserOperationExecutorTests : FunSpec({ }, ) } - coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(IdentityConstants.EXTERNAL_ID to "externalId"), any(), any()) } + coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(IdentityConstants.EXTERNAL_ID to "externalId"), any()) } } test("login identified user with association fails with retry when association fails with no retry and network condition exists") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } throws BackendException(408, "TIMEOUT") + coEvery { mockUserBackendService.createUser(any(), any(), any()) } throws BackendException(408, "TIMEOUT") val mockIdentityOperationExecutor = mockk() coEvery { mockIdentityOperationExecutor.execute(any()) } returns ExecutionResponse(ExecutionResult.FAIL_NORETRY) @@ -288,13 +287,13 @@ class LoginUserOperationExecutorTests : FunSpec({ }, ) } - coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(IdentityConstants.EXTERNAL_ID to "externalId"), any(), any()) } + coVerify(exactly = 1) { mockUserBackendService.createUser(appId, mapOf(IdentityConstants.EXTERNAL_ID to "externalId"), any()) } } test("creating user will merge operations into one backend call") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } returns + coEvery { mockUserBackendService.createUser(any(), any(), any()) } returns CreateUserResponse( mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId), PropertiesObject(), @@ -351,14 +350,6 @@ class LoginUserOperationExecutorTests : FunSpec({ mockUserBackendService.createUser( appId, mapOf("aliasLabel1" to "aliasValue1-2"), - withArg { - it.country shouldBe "country" - it.language shouldBe "lang2" - it.timezoneId shouldBe "timezone" - it.latitude shouldBe 123.45 - it.longitude shouldBe 678.90 - it.tags shouldBe mapOf("tagKey1" to "tagValue1-2") - }, withArg { it.count() shouldBe 1 it[0].type shouldBe SubscriptionObjectType.ANDROID_PUSH @@ -373,7 +364,7 @@ class LoginUserOperationExecutorTests : FunSpec({ test("creating user will hydrate when the user hasn't changed") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } returns + coEvery { mockUserBackendService.createUser(any(), any(), any()) } returns CreateUserResponse( mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId), PropertiesObject(), @@ -432,7 +423,6 @@ class LoginUserOperationExecutorTests : FunSpec({ appId, mapOf(), any(), - any(), ) } } @@ -440,7 +430,7 @@ class LoginUserOperationExecutorTests : FunSpec({ test("creating user will not hydrate when the user has changed") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } returns + coEvery { mockUserBackendService.createUser(any(), any(), any()) } returns CreateUserResponse( mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId), PropertiesObject(), @@ -499,7 +489,6 @@ class LoginUserOperationExecutorTests : FunSpec({ appId, mapOf(), any(), - any(), ) } } @@ -507,7 +496,7 @@ class LoginUserOperationExecutorTests : FunSpec({ test("creating user will provide local to remote translations") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.createUser(any(), any(), any(), any()) } returns + coEvery { mockUserBackendService.createUser(any(), any(), any()) } returns CreateUserResponse( mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId), PropertiesObject(), @@ -547,7 +536,6 @@ class LoginUserOperationExecutorTests : FunSpec({ appId, mapOf(), any(), - any(), ) } }