Merge pull request #1740 from OneSignal/user-model/remove-retain-previous-owner

brismithers · web-flow · commit 9f7171ebc86c · 2023-03-07T10:12:58.000-05:00
[User Model] Remove `retain_previous_owner` attribute from "Create User" and "Create Subscription"
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/SubscriptionBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/SubscriptionBackendService.kt
@@ -15,7 +15,6 @@ internal class SubscriptionBackendService(
     override suspend fun createSubscription(appId: String, aliasLabel: String, aliasValue: String, subscription: SubscriptionObject): String? {
         val requestJSON = JSONObject()
             .put("subscription", JSONConverter.convertToJSON(subscription))
-            .put("retain_previous_owner", true)
 
         val response = _httpClient.post("apps/$appId/users/by/$aliasLabel/$aliasValue/subscriptions", requestJSON)
 
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
@@ -29,9 +29,6 @@ internal class UserBackendService(
         if (subscriptions.isNotEmpty()) {
             requestJSON
                 .put("subscriptions", JSONConverter.convertToJSON(subscriptions))
-                .putJSONObject("subscription_options") {
-                    it.put("retain_previous_owner", true)
-                }
         }
 
         val response = _httpClient.post("apps/$appId/users", requestJSON)

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,6 @@ internal class UserBackendService(`
`29`	`29`	`if (subscriptions.isNotEmpty()) {`
`30`	`30`	`requestJSON`
`31`	`31`	`.put("subscriptions", JSONConverter.convertToJSON(subscriptions))`
`32`		`- .putJSONObject("subscription_options") {`
`33`		`- it.put("retain_previous_owner", true)`
`34`		`- }`
`35`	`32`	`}`
`36`	`33`
`37`	`34`	`val response = _httpClient.post("apps/$appId/users", requestJSON)`