Rename offset to rywToken for future-proofing

Motivation: we may need to send tokens as JWT to include more data in the future
OneSignal · Sep 18, 2024 · 555dbc5 · 555dbc5
1 parent ae2ed04
commit 555dbc5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/...ignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt b/...ignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt
@@ -184,8 +184,8 @@ internal class HttpClient(
                         }
                     }
 
-                    if (headers?.offset != null) {
-                        con.setRequestProperty("Onesignal-Offset", headers.offset.toString())
+                    if (headers?.rywToken != null) {
+                        con.setRequestProperty("OneSignal-RYW-Token", headers.rywToken.toString())
                     }
 
                     if (headers?.retryCount != null) {

diff --git a/...SDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/OptionalHeaders.kt b/...SDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/OptionalHeaders.kt
@@ -8,7 +8,7 @@ data class OptionalHeaders(
     /**
      * Used for read your write consistency
      */
-    val offset: Long? = null,
+    val rywToken: Long? = null,
     /**
      * Current retry count
      */

diff --git a/...core/src/main/java/com/onesignal/user/internal/backend/impl/SubscriptionBackendService.kt b/...core/src/main/java/com/onesignal/user/internal/backend/impl/SubscriptionBackendService.kt
@@ -33,12 +33,12 @@ internal class SubscriptionBackendService(
             return null
         }
 
-        var offset: Long? = null
-        if (responseJSON.has("offset")) {
-            offset = responseJSON.getLong("offset")
+        var rywToken: Long? = null
+        if (responseJSON.has("ryw_token")) {
+            rywToken = responseJSON.getLong("ryw_token")
         }
 
-        return Pair(subscriptionJSON.getString("id"), offset)
+        return Pair(subscriptionJSON.getString("id"), rywToken)
     }
 
     override suspend fun updateSubscription(
@@ -57,8 +57,8 @@ internal class SubscriptionBackendService(
         }
 
         val responseBody = JSONObject(response.payload)
-        return if (responseBody.has("offset")) {
-            responseBody.getLong("offset")
+        return if (responseBody.has("ryw_token")) {
+            responseBody.getLong("ryw_token")
         } else {
             null
         }

diff --git a/...esignal/core/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt b/...esignal/core/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt
@@ -72,8 +72,8 @@ internal class UserBackendService(
         }
 
         val responseBody = JSONObject(response.payload)
-        return if (responseBody.has("offset")) {
-            responseBody.getLong("offset")
+        return if (responseBody.has("ryw_token")) {
+            responseBody.getLong("ryw_token")
         } else {
             null
         }

diff --git a/...es/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt b/...es/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt
@@ -215,7 +215,7 @@ internal class InAppBackendService(
             val retryCount = if (attempts > 1) attempts - 1 else null
             val values =
                 OptionalHeaders(
-                    offset = offset,
+                    rywToken = offset,
                     sessionDuration = sessionDurationProvider(),
                     retryCount = retryCount,
                 )
@@ -259,7 +259,7 @@ internal class InAppBackendService(
                 url,
                 OptionalHeaders(
                     sessionDuration = sessionDurationProvider(),
-                    offset = 0,
+                    rywToken = 0,
                 ),
             )
 

diff --git a/...es/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt b/...es/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt
@@ -134,7 +134,7 @@ class InAppBackendServiceTests :
                 mockHttpClient.get(
                     "apps/appId/subscriptions/subscriptionId/iams",
                     match {
-                        it.offset == 1234L && it.retryCount == null && it.sessionDuration == mockSessionDurationProvider()
+                        it.rywToken == 1234L && it.retryCount == null && it.sessionDuration == mockSessionDurationProvider()
                     },
                 )
             }
@@ -144,7 +144,7 @@ class InAppBackendServiceTests :
                 mockHttpClient.get(
                     "apps/appId/subscriptions/subscriptionId/iams",
                     match {
-                        it.offset == 1234L && it.sessionDuration == mockSessionDurationProvider() && it.retryCount != null
+                        it.rywToken == 1234L && it.sessionDuration == mockSessionDurationProvider() && it.retryCount != null
                     },
                 )
             }
@@ -154,7 +154,7 @@ class InAppBackendServiceTests :
                 mockHttpClient.get(
                     "apps/appId/subscriptions/subscriptionId/iams",
                     match {
-                        it.offset == 0L && it.sessionDuration == mockSessionDurationProvider() && it.retryCount == null
+                        it.rywToken == 0L && it.sessionDuration == mockSessionDurationProvider() && it.retryCount == null
                     },
                 )
             }