Merge pull request #484 from supabase-community/development

Release 2.2.0

Author: jan-tennert

Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/Functions.kt

@@ -46,7 +46,7 @@ import io.ktor.http.HttpStatusCode
 class Functions(override val config: Config, override val supabaseClient: SupabaseClient) : MainPlugin<Functions.Config>, CustomSerializationPlugin {
 
     override val apiVersion: Int
-        get() = Functions.API_VERSION
+        get() = API_VERSION
 
     override val pluginKey: String
         get() = key
@@ -120,10 +120,7 @@ class Functions(override val config: Config, override val supabaseClient: Supaba
      * @param jwtToken A jwt token to use for the requests. If not provided, the token from the [Auth] plugin, or the supabaseKey will be used
      * @property serializer A serializer used for serializing/deserializing objects e.g. in [Functions.invoke] or [EdgeFunction.invoke]. Defaults to [KotlinXSerializer]
      */
-    data class Config(
-        override var customUrl: String? = null,
-        override var jwtToken: String? = null,
-    ) : MainConfig, CustomSerializationConfig {
+    class Config : MainConfig(), CustomSerializationConfig {
 
         override var serializer: SupabaseSerializer? = null
 
@@ -133,6 +130,8 @@ class Functions(override val config: Config, override val supabaseClient: Supaba
 
         override val key = "functions"
 
+        override val logger = SupabaseClient.createLogger("Supabase-Functions")
+
         /**
          * The current functions api version
          */

GoTrue/build.gradle.kts

@@ -63,7 +63,14 @@ kotlin {
          //       api(libs.cache4k)
             }
         }
-        val nonJvmMain by creating {
+        val desktopMain by creating {
+            dependsOn(commonMain)
+            dependencies {
+                api(libs.ktor.server.core)
+                api(libs.ktor.server.cio)
+            }
+        }
+        val nonDesktopMain by creating {
             dependsOn(commonMain)
         }
         val nonLinuxMain by creating {
@@ -79,9 +86,7 @@ kotlin {
         }
         val jvmMain by getting {
             dependsOn(nonLinuxMain)
-            dependencies {
-                implementation(libs.javalin)
-            }
+            dependsOn(desktopMain)
         }
         val androidMain by getting {
             dependsOn(nonLinuxMain)
@@ -90,20 +95,32 @@ kotlin {
                 api(libs.androidx.browser)
             }
         }
-        val mingwX64Main by getting {
+        val mingwMain by getting {
             dependsOn(nonLinuxMain)
-            dependsOn(nonJvmMain)
+            dependsOn(nonDesktopMain) //no ktor server engine supports the windows target
+            //dependsOn(desktopMain)
         }
         val appleMain by getting {
             dependsOn(nonLinuxMain)
-            dependsOn(nonJvmMain)
         }
         val jsMain by getting {
             dependsOn(nonLinuxMain)
-            dependsOn(nonJvmMain)
+            dependsOn(nonDesktopMain)
         }
         val linuxMain by getting {
-            dependsOn(nonJvmMain)
+            dependsOn(desktopMain)
+        }
+        val iosMain by getting {
+            dependsOn(nonDesktopMain)
+        }
+        val tvosMain by getting {
+            dependsOn(nonDesktopMain)
+        }
+        val watchosMain by getting {
+            dependsOn(nonDesktopMain)
+        }
+        val macosMain by getting {
+            dependsOn(desktopMain)
         }
     }
 }

GoTrue/src/androidMain/kotlin/io/github/jan/supabase/gotrue/AuthConfig.kt

@@ -3,22 +3,11 @@ package io.github.jan.supabase.gotrue
 import io.github.jan.supabase.gotrue.ExternalAuthAction.CUSTOM_TABS
 import io.github.jan.supabase.gotrue.ExternalAuthAction.EXTERNAL_BROWSER
 import io.github.jan.supabase.plugins.CustomSerializationConfig
-import io.github.jan.supabase.plugins.MainConfig
 
 /**
  * The configuration for [Auth]
  */
-actual class AuthConfig : MainConfig, CustomSerializationConfig, AuthConfigDefaults() {
-
-    /**
-     * The scheme for the redirect url, when using deep linking
-     */
-    var scheme: String? = null
-
-    /**
-     * The host for the redirect url, when using deep linking
-     */
-    var host: String? = null
+actual class AuthConfig : CustomSerializationConfig, AuthConfigDefaults() {
 
     /**
      * Whether to stop auto-refresh on focus loss, and resume it on focus again

GoTrue/src/androidMain/kotlin/io/github/jan/supabase/gotrue/RedirectUrl.android.kt

@@ -0,0 +1,6 @@
+package io.github.jan.supabase.gotrue
+
+import io.github.jan.supabase.annotations.SupabaseInternal
+
+@SupabaseInternal
+internal actual fun Auth.defaultPlatformRedirectUrl(): String? = config.deepLinkOrNull

GoTrue/src/androidMain/kotlin/io/github/jan/supabase/gotrue/RedirectUrl.kt

@@ -5,8 +5,8 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.startup.Initializer
-import co.touchlab.kermit.Logger
 import io.github.jan.supabase.annotations.SupabaseInternal
+import io.github.jan.supabase.logging.d
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -37,17 +37,17 @@ private fun addLifecycleCallbacks(gotrue: Auth) {
 
                 override fun onStart(owner: LifecycleOwner) {
                     if(!gotrue.isAutoRefreshRunning && gotrue.config.alwaysAutoRefresh) {
-                        Logger.d("Auth") {
+                        Auth.logger.d {
                             "Trying to re-load session from storage..."
                         }
                         scope.launch {
                             val sessionFound = gotrue.loadFromStorage()
                             if(!sessionFound) {
-                                Logger.d("Auth") {
+                                Auth.logger.d {
                                     "No session found, not starting auto refresh"
                                 }
                             } else {
-                                Logger.d("Auth") {
+                                Auth.logger.d {
                                     "Session found, auto refresh started"
                                 }
                             }
@@ -56,7 +56,7 @@ private fun addLifecycleCallbacks(gotrue: Auth) {
                 }
                 override fun onStop(owner: LifecycleOwner) {
                     if(gotrue.isAutoRefreshRunning) {
-                        Logger.d("Auth") { "Cancelling auto refresh because app is switching to the background" }
+                        Auth.logger.d { "Cancelling auto refresh because app is switching to the background" }
                         scope.launch {
                             gotrue.stopAutoRefreshForCurrentSession()
                             gotrue.resetLoadingState()

GoTrue/src/androidMain/kotlin/io/github/jan/supabase/gotrue/setupPlatform.kt

@@ -1,8 +1,8 @@
 package io.github.jan.supabase.gotrue
 
-import co.touchlab.kermit.Logger
 import io.github.jan.supabase.SupabaseClient
 import io.github.jan.supabase.gotrue.user.UserSession
+import io.github.jan.supabase.logging.d
 import kotlinx.coroutines.launch
 import platform.Foundation.NSURL
 import platform.Foundation.NSURLComponents
@@ -16,14 +16,14 @@ import platform.Foundation.NSURLQueryItem
  */
 fun SupabaseClient.handleDeeplinks(url: NSURL, onSessionSuccess: (UserSession) -> Unit = {}) {
     if (url.scheme != auth.config.scheme || url.host != auth.config.host) {
-        Logger.d("Auth") { "Received deeplink with wrong scheme or host" }
+        Auth.logger.d { "Received deeplink with wrong scheme or host" }
         return
     }
     when (auth.config.flowType) {
         FlowType.IMPLICIT -> {
             val fragment = url.fragment
             if (fragment == null) {
-                Logger.d("Auth") { "No fragment for deeplink" }
+                Auth.logger.d { "No fragment for deeplink" }
                 return
             }
             auth.parseFragmentAndImportSession(fragment, onSessionSuccess)

GoTrue/src/appleMain/kotlin/io/github/jan/supabase/gotrue/Apple.kt

@@ -0,0 +1,6 @@
+package io.github.jan.supabase.gotrue
+
+import io.github.jan.supabase.annotations.SupabaseInternal
+
+@SupabaseInternal
+internal actual fun Auth.defaultPlatformRedirectUrl(): String? = config.deepLinkOrNull