Merge pull request #933 from supabase-community/custom-url-launcher

Add support for providing a custom url launcher

Author: jan-tennert

Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/Utils.android.kt

@@ -14,5 +14,5 @@ internal actual suspend fun Auth.startExternalAuth(
     getUrl: suspend (redirectTo: String?) -> String,
     onSessionSuccess: suspend (UserSession) -> Unit
 ) {
-    supabaseClient.openExternalUrl(getUrl(redirectUrl))
+    config.urlLauncher.openUrl(supabaseClient, getUrl(redirectUrl))
 }

Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt

@@ -2,6 +2,7 @@ package io.github.jan.supabase.auth
 
 import io.github.jan.supabase.SupabaseClientBuilder
 import io.github.jan.supabase.SupabaseSerializer
+import io.github.jan.supabase.annotations.SupabaseExperimental
 import io.github.jan.supabase.plugins.CustomSerializationConfig
 import io.github.jan.supabase.plugins.MainConfig
 import kotlinx.coroutines.CoroutineDispatcher
@@ -96,6 +97,12 @@ open class AuthConfigDefaults : MainConfig() {
      */
     var enableLifecycleCallbacks: Boolean = true
 
+    /**
+     * The URL launcher used to open OAuth links in the system browser.
+     */
+    @SupabaseExperimental
+    var urlLauncher: UrlLauncher = UrlLauncher.DEFAULT
+
 }
 
 /**

Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/UrlLauncher.kt

@@ -0,0 +1,29 @@
+package io.github.jan.supabase.auth
+
+import io.github.jan.supabase.SupabaseClient
+import io.github.jan.supabase.annotations.SupabaseExperimental
+
+/**
+ * A [UrlLauncher] is used to open a URL in the system browser.
+ */
+@SupabaseExperimental
+fun interface UrlLauncher {
+
+    /**
+     * Open the given URL in the system browser.
+     * @param url The URL to open.
+     */
+    suspend fun openUrl(supabase: SupabaseClient, url: String)
+
+    companion object {
+
+        /**
+         * Default implementation of [UrlLauncher] that opens the URL in the system browser.
+         */
+        val DEFAULT = UrlLauncher { supabase, url ->
+            supabase.openExternalUrl(url)
+        }
+
+    }
+
+}

Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/Utils.desktop.kt

@@ -13,7 +13,7 @@ internal actual suspend fun Auth.startExternalAuth(
 ) {
     withContext(Dispatchers.IO) {
         if(redirectUrl != null) {
-            supabaseClient.openExternalUrl(getUrl(redirectUrl))
+            config.urlLauncher.openUrl(supabaseClient, getUrl(redirectUrl))
             return@withContext
         }
         createServer({

Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/server/HttpCallbackServer.kt

@@ -2,7 +2,6 @@ package io.github.jan.supabase.auth.server
 
 import io.github.jan.supabase.auth.Auth
 import io.github.jan.supabase.auth.AuthImpl
-import io.github.jan.supabase.auth.openExternalUrl
 import io.github.jan.supabase.auth.user.UserSession
 import io.github.jan.supabase.logging.d
 import io.ktor.http.ContentType
@@ -42,7 +41,8 @@ internal suspend fun createServer(
             Auth.logger.d {
                 "Started OAuth callback server on port $port. Opening url in browser..."
             }
-            auth.supabaseClient.openExternalUrl(
+            auth.config.urlLauncher.openUrl(
+                auth.supabaseClient,
                 url(
                     "http://localhost:$port"
                 )

Auth/src/nonDesktopMain/kotlin/io/github/jan/supabase/auth/Utils.kt

@@ -8,5 +8,5 @@ internal actual suspend fun Auth.startExternalAuth(
     getUrl: suspend (redirectTo: String?) -> String,
     onSessionSuccess: suspend (UserSession) -> Unit
 ) {
-    supabaseClient.openExternalUrl(getUrl(redirectUrl))
+    config.urlLauncher.openUrl(supabaseClient, getUrl(redirectUrl))
 }

gradle.properties

@@ -11,5 +11,5 @@ org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.wasm.enabled=true
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 
-supabase-version = 3.2.0-beta-1
+supabase-version = 3.2.0-beta-2
 base-group = io.github.jan-tennert.supabase