Merge pull request #922 from hieuwu/master

Fix null result when sign up with Email provider

Author: jan-tennert

Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/DefaultAuthProvider.kt

@@ -1,8 +1,8 @@
 package io.github.jan.supabase.auth.providers.builtin
 
 import io.github.jan.supabase.SupabaseClient
-import io.github.jan.supabase.annotations.SupabaseExperimental
 import io.github.jan.supabase.annotations.SupabaseInternal
+import io.github.jan.supabase.auth.Auth
 import io.github.jan.supabase.auth.AuthImpl
 import io.github.jan.supabase.auth.FlowType
 import io.github.jan.supabase.auth.auth
@@ -12,6 +12,7 @@ import io.github.jan.supabase.auth.providers.AuthProvider
 import io.github.jan.supabase.auth.putCodeChallenge
 import io.github.jan.supabase.auth.redirectTo
 import io.github.jan.supabase.auth.user.UserSession
+import io.github.jan.supabase.logging.w
 import io.github.jan.supabase.putJsonObject
 import io.github.jan.supabase.supabaseJson
 import io.ktor.client.call.body
@@ -20,6 +21,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.decodeFromJsonElement
+import kotlinx.serialization.json.jsonObject
 
 /**
  * A default authentication provider
@@ -65,7 +67,6 @@ sealed interface DefaultAuthProvider<C, R> : AuthProvider<C, R> {
         }
     }
 
-    @OptIn(SupabaseExperimental::class)
     override suspend fun signUp(
         supabaseClient: SupabaseClient,
         onSuccess: suspend (UserSession) -> Unit,
@@ -95,10 +96,16 @@ sealed interface DefaultAuthProvider<C, R> : AuthProvider<C, R> {
             redirectUrl?.let { redirectTo(it) }
         }
         val json = response.body<JsonObject>()
-        if(json.containsKey("access_token")) {
-            val userSession = supabaseJson.decodeFromJsonElement<UserSession>(json)
-            onSuccess(userSession)
-            return null
+        if (json.containsKey("access_token")) {
+            runCatching {
+                val userSession = supabaseJson.decodeFromJsonElement<UserSession>(json)
+                onSuccess(userSession)
+                val userJson = json["user"]?.jsonObject ?: buildJsonObject { }
+                return decodeResult(userJson)
+            }.onFailure { exception ->
+                Auth.logger.w(exception) { "Failed to decode user info" }
+                return null
+            }
         }
         return decodeResult(json)
     }

Auth/src/commonTest/kotlin/AuthApiTest.kt

@@ -43,7 +43,7 @@ class AuthRequestTest {
     }
 
     @Test
-    fun testSignUpWithEmailNoAutoconfirm() {
+    fun testSignUpWithEmailNoAutoConfirm() {
         runTest {
             val expectedEmail = "[email protected]"
             val expectedPassword = "password"
@@ -79,7 +79,43 @@ class AuthRequestTest {
     }
 
     @Test
-    fun testSignUpWithEmailAutoconfirm() {
+    fun testSignUpWithEmailAutoConfirm() {
+        runTest {
+            val expectedEmail = "[email protected]"
+            val expectedPassword = "password"
+            val captchaToken = "captchaToken"
+            val userData = buildJsonObject {
+                put("key", "value")
+            }
+            val client = createMockedSupabaseClient(configuration = configuration) {
+                val body = it.body.toJsonElement().jsonObject
+                val metaSecurity = body["gotrue_meta_security"]!!.jsonObject
+                assertMethodIs(HttpMethod.Post, it.method)
+                assertPathIs("/signup", it.url.pathAfterVersion())
+                assertEquals(expectedEmail, body["email"]?.jsonPrimitive?.content)
+                assertEquals(expectedPassword, body["password"]?.jsonPrimitive?.content)
+                assertEquals(captchaToken, metaSecurity["captcha_token"]?.jsonPrimitive?.content)
+                assertEquals(userData, body["data"]!!.jsonObject)
+                containsCodeChallenge(body)
+                respondJson(
+                    sampleSessionWithUserData(email = "[email protected]", phone = "+1234567890")
+                )
+            }
+            val user = client.auth.signUpWith(Email) {
+                email = expectedEmail
+                password = expectedPassword
+                this.captchaToken = captchaToken
+                data = userData
+            }
+            assertNotNull(user)
+            assertEquals(expectedEmail, user?.email, "Email should be equal")
+            assertNotNull(client.auth.currentSessionOrNull(), "Session should not be null")
+            assertEquals(client.auth.sessionSource(), SessionSource.SignUp(Email))
+        }
+    }
+
+    @Test
+    fun testSignUpWithEmailAutoConfirmWithoutUserData() {
         runTest {
             val expectedEmail = "[email protected]"
             val expectedPassword = "password"
@@ -114,7 +150,7 @@ class AuthRequestTest {
     }
 
     @Test
-    fun testSignUpWithPhoneAutoconfirm() {
+    fun testSignUpWithPhoneAutoConfirm() {
         runTest {
             val expectedPhone = "+1234567890"
             val expectedPassword = "password"
@@ -133,7 +169,7 @@ class AuthRequestTest {
                 assertEquals(userData, body["data"]!!.jsonObject)
                 containsCodeChallenge(body)
                 respondJson(
-                    sampleUserSession()
+                    sampleSessionWithUserData()
                 )
             }
             val user = client.auth.signUpWith(Phone) {
@@ -142,14 +178,14 @@ class AuthRequestTest {
                 this.captchaToken = captchaToken
                 data = userData
             }
-            assertNull(user)
+            assertNotNull(user)
             assertNotNull(client.auth.currentSessionOrNull(), "Session should not be null")
             assertEquals(client.auth.sessionSource(), SessionSource.SignUp(Phone))
         }
     }
 
     @Test
-    fun testSignUpWithPhoneNoAutoconfirm() {
+    fun testSignUpWithPhoneNoAutoConfirm() {
         runTest {
             val expectedPhone = "+1234567890"
             val expectedPassword = "password"
@@ -690,6 +726,25 @@ class AuthRequestTest {
         }
     """.trimIndent()
 
+    private fun sampleSessionWithUserData(email: String? = null, phone: String? = null) = """
+        {   
+            "id": "id",
+            "aud": "aud",
+            "email": "$email",
+            "phone": "$phone",
+            "access_token": "token",
+            "refresh_token": "refresh",
+            "token_type": "bearer",
+            "expires_in": 3600,
+            "user": {
+                "id": "id",
+                "aud": "aud",
+                "email": "$email",
+                "phone": "$phone"
+            }
+        }
+    """.trimIndent()
+
     private fun containsCodeChallenge(body: JsonObject) {
         assertNotNull(body["code_challenge"])
         assertEquals(PKCEConstants.CHALLENGE_METHOD, body["code_challenge_method"]?.jsonPrimitive?.content)