fixes for web2web (#99)

Author: ren6

gradle.properties

@@ -19,4 +19,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-sdkVersion=2.8.2
+sdkVersion=2.8.3

sdk/src/main/java/com/apphud/sdk/ApphudInternal+Attribution.kt

@@ -202,7 +202,7 @@ internal fun ApphudInternal.tryWebAttribution(data: Map<String, Any>, callback:
 
         ApphudLog.logI("Found a match from web click, updating User ID to $userId")
 
-        updateUserId(userId) {
+        updateUserId(userId, web2Web = true) {
             if (it?.userId == userId) {
                 callback.invoke(true, it)
             } else {

sdk/src/main/java/com/apphud/sdk/ApphudInternal.kt

@@ -816,7 +816,7 @@ internal object ApphudInternal {
         forceFlushUserProperties(false) { _ -> }
     }
 
-    internal fun updateUserId(userId: UserId, callback: ((ApphudUser?) -> Unit)?) {
+    internal fun updateUserId(userId: UserId, web2Web: Boolean? = false, callback: ((ApphudUser?) -> Unit)?) {
         if (userId.isBlank()) {
             ApphudLog.log("Invalid UserId=$userId")
             callback?.invoke(currentUser)
@@ -834,8 +834,12 @@ internal object ApphudInternal {
                 RequestManager.setParams(this.context, this.apiKey)
 
                 coroutineScope.launch(errorHandler) {
+                    if (web2Web == true) {
+                        ApphudInternal.userId = userId
+                        ApphudInternal.fromWeb2Web = true
+                    }
                     val needPlacementsPaywalls = !didRegisterCustomerAtThisLaunch && !deferPlacements && !observerMode
-                    val customer = RequestManager.registrationSync(needPlacementsPaywalls, is_new, true)
+                    val customer = RequestManager.registrationSync(needPlacementsPaywalls, is_new, true, userId = userId)
                     customer?.let {
                         mainScope.launch {
                             notifyLoadingCompleted(it)

sdk/src/main/java/com/apphud/sdk/managers/RequestManager.kt

@@ -341,6 +341,7 @@ object RequestManager {
         needPaywalls: Boolean,
         isNew: Boolean,
         forceRegistration: Boolean = false,
+        userId: UserId? = null,
     ): ApphudUser? =
         suspendCancellableCoroutine { continuation ->
             if (!canPerformRequest()) {
@@ -351,7 +352,7 @@ object RequestManager {
             }
 
             if (currentUser == null || forceRegistration) {
-                registration(needPaywalls, isNew, forceRegistration) { customer, error ->
+                registration(needPaywalls, isNew, forceRegistration, userId) { customer, error ->
                     if (continuation.isActive) {
                         continuation.resume(customer)
                     }
@@ -368,6 +369,7 @@ object RequestManager {
         needPaywalls: Boolean,
         isNew: Boolean,
         forceRegistration: Boolean = false,
+        userId: UserId? = null,
         completionHandler: (ApphudUser?, ApphudError?) -> Unit,
     ) {
         if (!canPerformRequest()) {
@@ -383,7 +385,7 @@ object RequestManager {
                     .path("customers")
                     .build()
 
-            val request = buildPostRequest(URL(apphudUrl.url), mkRegistrationBody(needPaywalls, isNew))
+            val request = buildPostRequest(URL(apphudUrl.url), mkRegistrationBody(needPaywalls, isNew, userId))
             val httpClient = getOkHttpClient(request, !fallbackMode)
             try {
                 val serverResponse = performRequestSync(httpClient, request)
@@ -968,6 +970,7 @@ object RequestManager {
     private fun mkRegistrationBody(
         needPaywalls: Boolean,
         isNew: Boolean,
+        userId: UserId? = null,
     ): RegistrationBody {
         val deviceIds = storage.deviceIdentifiers
         val idfa = deviceIds[0]
@@ -992,7 +995,7 @@ object RequestManager {
             idfv = if (ApphudUtils.optOutOfTracking || appSetId.isEmpty()) null else appSetId,
             idfa = if (ApphudUtils.optOutOfTracking || idfa.isEmpty()) null else idfa,
             android_id = if (ApphudUtils.optOutOfTracking || androidId.isEmpty()) null else androidId,
-            user_id = ApphudInternal.userId,
+            user_id = userId ?: ApphudInternal.userId,
             device_id = ApphudInternal.deviceId,
             time_zone = TimeZone.getDefault().id,
             is_sandbox = this.applicationContext.isDebuggable(),