Merge remote-tracking branch 'origin/main' into fix-loading-extension-from-jar

Author: simolus3

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 1.0.0-BETA32
 
 * Added `onChange` method to the PowerSync client. This allows for observing table changes.
+* Removed unnecessary `User-Id` header from internal PowerSync service requests.
 * Fix loading native PowerSync extension for Java targets.
 
 ## 1.0.0-BETA31

README.md

@@ -47,9 +47,6 @@ Current limitations:
 
 - Integration with SQLDelight schema and API generation (ORM) is not yet supported.
 
-Future work/ideas:
-- Attachments helper package.
-
 ## Installation
 
 Add the PowerSync Kotlin Multiplatform SDK to your project by adding the following to your `build.gradle.kts` file:

connectors/supabase/src/commonMain/kotlin/com/powersync/connector/supabase/SupabaseConnector.kt

@@ -164,11 +164,9 @@ public class SupabaseConnector(
 
             check(session.user != null) { "No user data" }
 
-            // userId is for debugging purposes only
             PowerSyncCredentials(
                 endpoint = powerSyncEndpoint,
                 token = session.accessToken, // Use the access token to authenticate against PowerSync
-                userId = session.user!!.id,
             )
         }
 

core/src/commonIntegrationTest/kotlin/com/powersync/testutils/TestUtils.kt

@@ -100,7 +100,6 @@ internal class ActiveDatabaseTest(
             everySuspend { getCredentialsCached() } returns
                 PowerSyncCredentials(
                     token = "test-token",
-                    userId = "test-user",
                     endpoint = "https://test.com",
                 )
 

core/src/commonMain/kotlin/com/powersync/connectors/PowerSyncCredentials.kt

@@ -19,7 +19,12 @@ public data class PowerSyncCredentials(
     /**
      * User ID.
      */
-    @SerialName("user_id") val userId: String?,
+    @Deprecated(
+        message = "This property is no longer used and should be removed.",
+        level = DeprecationLevel.WARNING,
+    )
+    @SerialName("user_id")
+    val userId: String? = null,
 ) {
     override fun toString(): String = "PowerSyncCredentials<endpoint: $endpoint userId: $userId>"
 

core/src/commonMain/kotlin/com/powersync/sync/SyncStream.kt

@@ -174,7 +174,6 @@ internal class SyncStream(
                 contentType(ContentType.Application.Json)
                 headers {
                     append(HttpHeaders.Authorization, "Token ${credentials.token}")
-                    append("User-Id", credentials.userId ?: "")
                 }
             }
         if (response.status.value == 401) {
@@ -202,7 +201,6 @@ internal class SyncStream(
                     contentType(ContentType.Application.Json)
                     headers {
                         append(HttpHeaders.Authorization, "Token ${credentials.token}")
-                        append("User-Id", credentials.userId ?: "")
                     }
                     timeout { socketTimeoutMillis = Long.MAX_VALUE }
                     setBody(bodyJson)

core/src/commonTest/kotlin/com/powersync/TestConnector.kt

@@ -7,7 +7,6 @@ class TestConnector : PowerSyncBackendConnector() {
     var fetchCredentialsCallback: suspend () -> PowerSyncCredentials? = {
         PowerSyncCredentials(
             token = "test-token",
-            userId = "test-user",
             endpoint = "https://test.com",
         )
     }

core/src/commonTest/kotlin/com/powersync/sync/SyncStreamTest.kt

@@ -86,7 +86,6 @@ class SyncStreamTest {
                 everySuspend { getCredentialsCached() } returns
                     PowerSyncCredentials(
                         token = "test-token",
-                        userId = "test-user",
                         endpoint = "https://test.com",
                     )
             }