Send timezone_id on createuser

Author: emawby

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt

@@ -14,10 +14,11 @@ interface IUserBackendService {
      * the application.
      * @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.
+     * @param properties The properties for this user. For new users this should include the timezone_id property.
      *
      * @return The backend response
      */
-    suspend fun createUser(appId: String, identities: Map<String, String>, subscriptions: List<SubscriptionObject>): CreateUserResponse
+    suspend fun createUser(appId: String, identities: Map<String, String>, subscriptions: List<SubscriptionObject>, properties: Map<String, String>): CreateUserResponse
     // TODO: Change to send only the push subscription, optimally
 
     /**

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt

@@ -14,7 +14,7 @@ internal class UserBackendService(
     private val _httpClient: IHttpClient,
 ) : IUserBackendService {
 
-    override suspend fun createUser(appId: String, identities: Map<String, String>, subscriptions: List<SubscriptionObject>): CreateUserResponse {
+    override suspend fun createUser(appId: String, identities: Map<String, String>, subscriptions: List<SubscriptionObject>, properties: Map<String, String>): CreateUserResponse {
         val requestJSON = JSONObject()
 
         if (identities.isNotEmpty()) {
@@ -26,6 +26,10 @@ internal class UserBackendService(
                 .put("subscriptions", JSONConverter.convertToJSON(subscriptions))
         }
 
+        if (properties.isNotEmpty()) {
+            requestJSON.put("properties", JSONObject().putMap(properties))
+        }
+
         val response = _httpClient.post("apps/$appId/users", requestJSON)
 
         if (!response.isSuccess) {

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt

@@ -1,11 +1,7 @@
 package com.onesignal.user.internal.operations.impl.executors
 
 import android.os.Build
-import com.onesignal.common.AndroidUtils
-import com.onesignal.common.DeviceUtils
-import com.onesignal.common.NetworkUtils
-import com.onesignal.common.OneSignalUtils
-import com.onesignal.common.RootToolsInternalMethods
+import com.onesignal.common.*
 import com.onesignal.common.exceptions.BackendException
 import com.onesignal.common.modeling.ModelChangeTags
 import com.onesignal.core.internal.application.IApplicationService
@@ -16,10 +12,8 @@ import com.onesignal.core.internal.operations.ExecutionResult
 import com.onesignal.core.internal.operations.IOperationExecutor
 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.*
 import com.onesignal.user.internal.backend.IdentityConstants
-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.DeleteSubscriptionOperation
@@ -99,6 +93,8 @@ internal class LoginUserOperationExecutor(
     private suspend fun createUser(createUserOperation: LoginUserOperation, operations: List<Operation>): ExecutionResponse {
         var identities = mapOf<String, String>()
         var subscriptions = mapOf<String, SubscriptionObject>()
+        val properties = mutableMapOf<String, String>()
+        properties["timezone_id"] = TimeUtils.getTimeZoneId()!!
 
         if (createUserOperation.externalId != null) {
             val mutableIdentities = identities.toMutableMap()
@@ -118,7 +114,7 @@ internal class LoginUserOperationExecutor(
 
         try {
             val subscriptionList = subscriptions.toList()
-            val response = _userBackend.createUser(createUserOperation.appId, identities, subscriptionList.map { it.second })
+            val response = _userBackend.createUser(createUserOperation.appId, identities, subscriptionList.map { it.second }, properties)
             val idTranslations = mutableMapOf<String, String>()
             // Add the "local-to-backend" ID translation to the IdentifierTranslator for any operations that were
             // *not* executed but still reference the locally-generated IDs.