Merge pull request #568 from supabase-community/auth-tests

Rework Auth tests

GoTrue/build.gradle.kts

@@ -76,6 +76,7 @@ kotlin {
         val commonTest by getting {
             dependencies {
                 implementation(libs.bundles.testing)
+                implementation(project(":test-common"))
             }
         }
         val jvmMain by getting {

GoTrue/src/commonMain/kotlin/io/github/jan/supabase/gotrue/Auth.kt

@@ -144,12 +144,13 @@ sealed interface Auth : MainPlugin<AuthConfig>, CustomSerializationPlugin {
      * @param provider The OAuth provider
      * @param redirectUrl The redirect url to use. If you don't specify this, the platform specific will be used, like deeplinks on android.
      * @param config Extra configuration
+     * @return The OAuth url to open in the browser if [ExternalAuthConfigDefaults.automaticallyOpenUrl] is false, otherwise null.
      */
     suspend fun linkIdentity(
         provider: OAuthProvider,
         redirectUrl: String? = defaultRedirectUrl(),
         config: ExternalAuthConfigDefaults.() -> Unit = {}
-    )
+    ): String?
 
     /**
      * Unlinks an OAuth Identity from an existing user.
@@ -289,7 +290,7 @@ sealed interface Auth : MainPlugin<AuthConfig>, CustomSerializationPlugin {
     /**
      * Imports a user session and starts auto-refreshing if [autoRefresh] is true
      */
-    suspend fun importSession(session: UserSession, autoRefresh: Boolean = true, source: SessionSource = SessionSource.Unknown)
+    suspend fun importSession(session: UserSession, autoRefresh: Boolean = config.alwaysAutoRefresh, source: SessionSource = SessionSource.Unknown)
 
     /**
      * Imports the jwt token and retrieves the user profile.

GoTrue/src/commonMain/kotlin/io/github/jan/supabase/gotrue/AuthImpl.kt

@@ -132,20 +132,28 @@ internal class AuthImpl(
         provider: OAuthProvider,
         redirectUrl: String?,
         config: ExternalAuthConfigDefaults.() -> Unit
-    ) {
+    ): String? {
+        val automaticallyOpen = ExternalAuthConfigDefaults().apply(config).automaticallyOpenUrl
+        val fetchUrl: suspend (String?) -> String = { redirectTo: String? ->
+            val url = getOAuthUrl(provider, redirectTo, "user/identities/authorize", config)
+            val response = api.rawRequest(url) {
+                method = HttpMethod.Get
+            }
+            response.request.url.toString()
+        }
+        if(!automaticallyOpen) {
+            return fetchUrl(redirectUrl ?: "")
+        }
         startExternalAuth(
             redirectUrl = redirectUrl,
             getUrl = {
-                val url = getOAuthUrl(provider, it, "user/identities/authorize", config)
-                val response = api.rawRequest(url) {
-                    method = HttpMethod.Get
-                }
-                response.request.url.toString()
+                fetchUrl(it)
             },
             onSessionSuccess = {
                 importSession(it, source = SessionSource.UserIdentitiesChanged(it))
             }
         )
+        return null
     }
 
     override suspend fun unlinkIdentity(identityId: String, updateLocalUser: Boolean) {

GoTrue/src/commonMain/kotlin/io/github/jan/supabase/gotrue/CodeVerifierCache.kt

@@ -28,9 +28,9 @@ interface CodeVerifierCache {
 /**
  * A [CodeVerifierCache] that uses the [AtomicRef] API.
  */
-class MemoryCodeVerifierCache: CodeVerifierCache {
+class MemoryCodeVerifierCache(codeVerifier: String? = null): CodeVerifierCache {
 
-    private var codeVerifier by atomic<String?>(null)
+    private var codeVerifier by atomic(codeVerifier)
 
     override suspend fun saveCodeVerifier(codeVerifier: String) {
         this.codeVerifier = codeVerifier

GoTrue/src/commonMain/kotlin/io/github/jan/supabase/gotrue/PKCE.kt

@@ -8,7 +8,7 @@ import kotlin.io.encoding.ExperimentalEncodingApi
 
 internal object PKCEConstants {
     const val VERIFIER_LENGTH = 64
-    const val CHALLENGE_METHOD = "S256"
+    const val CHALLENGE_METHOD = "s256"
 }
 
 @OptIn(ExperimentalEncodingApi::class)

GoTrue/src/commonMain/kotlin/io/github/jan/supabase/gotrue/providers/ExternalAuthConfig.kt

@@ -1,5 +1,7 @@
 package io.github.jan.supabase.gotrue.providers
 
+import io.github.jan.supabase.gotrue.Auth
+
 /**
  * Configuration for external authentication providers like Google, Twitter, etc.
  */
@@ -20,4 +22,9 @@ open class ExternalAuthConfigDefaults {
      */
     val queryParams = mutableMapOf<String, String>()
 
+    /**
+     * Automatically open the URL in the browser. Only applies to [Auth.linkIdentity].
+     */
+    var automaticallyOpenUrl: Boolean = true
+
 }

GoTrue/src/commonMain/kotlin/io/github/jan/supabase/gotrue/providers/builtin/DefaultAuthProvider.kt

@@ -9,6 +9,7 @@ import io.github.jan.supabase.gotrue.auth
 import io.github.jan.supabase.gotrue.generateCodeChallenge
 import io.github.jan.supabase.gotrue.generateCodeVerifier
 import io.github.jan.supabase.gotrue.providers.AuthProvider
+import io.github.jan.supabase.gotrue.putCodeChallenge
 import io.github.jan.supabase.gotrue.redirectTo
 import io.github.jan.supabase.gotrue.user.UserSession
 import io.github.jan.supabase.putJsonObject
@@ -19,7 +20,6 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.decodeFromJsonElement
-import kotlinx.serialization.json.put
 
 /**
  * A default authentication provider
@@ -88,9 +88,8 @@ sealed interface DefaultAuthProvider<C, R> : AuthProvider<C, R> {
         }
         val response = gotrue.api.postJson(url, buildJsonObject {
             putJsonObject(body)
-            codeChallenge?.let {
-                put("code_challenge", it)
-                put("code_challenge_method", "s256")
+            if (codeChallenge != null) {
+                putCodeChallenge(codeChallenge)
             }
         }) {
             redirectUrl?.let { redirectTo(it) }

GoTrue/src/commonMain/kotlin/io/github/jan/supabase/gotrue/providers/builtin/OTP.kt

@@ -10,6 +10,7 @@ import io.github.jan.supabase.gotrue.auth
 import io.github.jan.supabase.gotrue.generateCodeChallenge
 import io.github.jan.supabase.gotrue.generateCodeVerifier
 import io.github.jan.supabase.gotrue.providers.AuthProvider
+import io.github.jan.supabase.gotrue.putCaptchaToken
 import io.github.jan.supabase.gotrue.user.UserSession
 import io.github.jan.supabase.putJsonObject
 import kotlinx.serialization.json.JsonObject
@@ -32,14 +33,15 @@ data object OTP: AuthProvider<OTP.Config, Unit> {
      * @param phone The phone number of the user
      * @param data Additional data to store with the user
      * @param createUser Whether to create a new user if the user doesn't exist
-     *
+     * @param captchaToken The captcha token for the request
      */
     class Config(
         @PublishedApi internal val serializer: SupabaseSerializer,
         var email: String? = null,
         var phone: String? = null,
         var data: JsonObject? = null,
         var createUser: Boolean = true,
+        var captchaToken: String? = null
     ) {
 
         /**
@@ -87,6 +89,7 @@ data object OTP: AuthProvider<OTP.Config, Unit> {
                 put("code_challenge", it)
                 put("code_challenge_method", "s256")
             }
+            otpConfig.captchaToken?.let { putCaptchaToken(it) }
         }) {
             redirectUrl?.let { url.parameters.append("redirect_to", it) }
         }
@@ -97,6 +100,6 @@ data object OTP: AuthProvider<OTP.Config, Unit> {
         onSuccess: suspend (UserSession) -> Unit,
         redirectUrl: String?,
         config: (Config.() -> Unit)?
-    ): Unit? = login(supabaseClient, onSuccess, redirectUrl, config)
+    ): Unit = login(supabaseClient, onSuccess, redirectUrl, config)
 
 }

GoTrue/src/commonMain/kotlin/io/github/jan/supabase/gotrue/user/UserSession.kt

@@ -21,7 +21,7 @@ data class UserSession(
     val expiresIn: Long,
     @SerialName("token_type")
     val tokenType: String,
-    val user: UserInfo?,
+    val user: UserInfo? = null,
     @SerialName("type")
     val type: String = "",
     val expiresAt: Instant = Clock.System.now() + (expiresIn.seconds),

GoTrue/src/commonTest/kotlin/AdminApiTest.kt

@@ -0,0 +1,5 @@
+class AdminApiTest {
+
+    //TODO: Implement tests
+
+}