Add experimental support for IOS native targets (#53)

supabase-community · Apr 6, 2023 · 73f1b30 · 73f1b30
1 parent 03967e2
commit 73f1b30
Show file tree

Hide file tree

Showing 17 changed files with 96 additions and 27 deletions.
diff --git a/Functions/build.gradle.kts b/Functions/build.gradle.kts
@@ -31,7 +31,8 @@ kotlin {
             }
         }
     }
-    //ios()
+    ios()
+    iosSimulatorArm64()
     sourceSets {
         all {
             languageSettings.optIn("kotlin.RequiresOptIn")
@@ -46,6 +47,10 @@ kotlin {
         val jvmMain by getting
         val androidMain by getting
         val jsMain by getting
+        val iosMain by getting
+        val iosSimulatorArm64Main by getting {
+            dependsOn(iosMain)
+        }
     }
 }
 

diff --git a/GoTrue/build.gradle.kts b/GoTrue/build.gradle.kts
@@ -32,7 +32,8 @@ kotlin {
             }
         }
     }
-    //ios()
+    ios()
+    iosSimulatorArm64()
     sourceSets {
         all {
             languageSettings.optIn("kotlin.RequiresOptIn")
@@ -63,7 +64,14 @@ kotlin {
             }
         }
         val jsMain by getting
-        //val iosMain by getting
+        val iosMain by getting
+        val iosTest by getting
+        val iosSimulatorArm64Main by getting {
+            dependsOn(iosMain)
+        }
+        val iosSimulatorArm64Test by getting {
+            dependsOn(iosTest)
+        }
     }
 }
 

diff --git a/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/GoTrueConfig.kt b/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/GoTrueConfig.kt
@@ -0,0 +1,17 @@
+package io.github.jan.supabase.gotrue
+
+import io.github.jan.supabase.plugins.MainConfig
+
+actual class GoTrueConfig : MainConfig, GoTrueConfigDefaults() {
+
+    /**
+     * The scheme for the redirect url, when using deep linking
+     */
+    var scheme: String = "supabase"
+
+    /**
+     * The host for the redirect url, when using deep linking
+     */
+    var host: String = "login"
+
+}
diff --git a/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/IOS.kt b/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/IOS.kt
@@ -6,18 +6,6 @@ import io.github.jan.supabase.gotrue.user.UserSession
 import platform.Foundation.NSURL
 import platform.Foundation.NSURLComponents
 
-var GoTrue.Config.scheme: String
-    get() = (params["scheme"] as? String) ?: "supabase"
-    set(value) {
-        params["scheme"] = value
-    }
-
-var GoTrue.Config.host: String
-    get() = (params["host"] as? String) ?: "login"
-    set(value) {
-        params["host"] = value
-    }
-
 @SupabaseExperimental
 fun SupabaseClient.handleDeeplinks(url: NSURL, onSessionSuccess: (UserSession) -> Unit = {}) {
     val components = NSURLComponents(url, true)

diff --git a/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/RedirectUrl.kt b/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/RedirectUrl.kt
@@ -0,0 +1,7 @@
+package io.github.jan.supabase.gotrue
+
+actual fun GoTrue.generateRedirectUrl(fallbackUrl: String?): String? {
+    if(fallbackUrl != null) return fallbackUrl
+    this as GoTrueImpl
+    return "${config.scheme}://${config.host}"
+}
diff --git a/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/providers/ExternalAuthConfig.kt b/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/providers/ExternalAuthConfig.kt
@@ -0,0 +1,3 @@
+package io.github.jan.supabase.gotrue.providers
+
+actual class ExternalAuthConfig
diff --git a/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/providers/OAuthProvider.kt b/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/providers/OAuthProvider.kt
@@ -3,15 +3,13 @@ package io.github.jan.supabase.gotrue.providers
 import io.github.aakira.napier.Napier
 import io.github.jan.supabase.SupabaseClient
 import io.github.jan.supabase.gotrue.gotrue
-import io.github.jan.supabase.gotrue.host
-import io.github.jan.supabase.gotrue.scheme
 import io.github.jan.supabase.gotrue.user.UserSession
 import platform.Foundation.NSURL
 import platform.UIKit.UIApplication
 
 actual abstract class OAuthProvider : AuthProvider<ExternalAuthConfig, Unit> {
 
-    actual abstract fun provider(): String
+    actual abstract val name: String
 
     actual override suspend fun login(
         supabaseClient: SupabaseClient,
@@ -34,7 +32,7 @@ actual abstract class OAuthProvider : AuthProvider<ExternalAuthConfig, Unit> {
     private fun openOAuth(redirectUrl: String? = null, supabaseClient: SupabaseClient) {
         val gotrue = supabaseClient.gotrue
         val deepLink = "${gotrue.config.scheme}://${gotrue.config.host}"
-        val url = NSURL(supabaseClient.gotrue.resolveUrl("authorize?provider=${provider()}&redirect_to=${redirectUrl ?: deepLink}"))
+        val url = NSURL(string = supabaseClient.gotrue.resolveUrl("authorize?provider=$name&redirect_to=${redirectUrl ?: deepLink}"))
         UIApplication.sharedApplication.openURL(url, emptyMap<Any?, Any>()) {
             if(it) Napier.d { "Successfully opened provider url in safari" } else Napier.e { "Failed to open provider url in safari" }
         }

diff --git a/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/setupPlatform.kt b/GoTrue/src/iosMain/kotlin/io/github/jan/supabase/gotrue/setupPlatform.kt
@@ -0,0 +1,7 @@
+package io.github.jan.supabase.gotrue
+
+import io.github.aakira.napier.Napier
+
+actual fun GoTrue.setupPlatform() {
+    Napier.w { "IOS support is highly experimental, please report any bugs you find!" }
+}
diff --git a/GoTrue/src/iosTest/kotlin/platformSettings.kt b/GoTrue/src/iosTest/kotlin/platformSettings.kt
@@ -0,0 +1,4 @@
+import io.github.jan.supabase.gotrue.GoTrueConfig
+
+actual fun GoTrueConfig.platformSettings() {
+}
diff --git a/GoTrue/src/jvmMain/kotlin/io/github/jan/supabase/gotrue/compose/ComposeUtils.kt b/GoTrue/src/jvmMain/kotlin/io/github/jan/supabase/gotrue/compose/ComposeUtils.kt
diff --git a/Postgrest/build.gradle.kts b/Postgrest/build.gradle.kts
@@ -31,7 +31,8 @@ kotlin {
             }
         }
     }
-    //ios()
+    ios()
+    iosSimulatorArm64()
     sourceSets {
         all {
             languageSettings.optIn("kotlin.RequiresOptIn")
@@ -50,6 +51,10 @@ kotlin {
         val jvmMain by getting
         val androidMain by getting
         val jsMain by getting
+        val iosMain by getting
+        val iosSimulatorArm64Main by getting {
+            dependsOn(iosMain)
+        }
     }
 }
 

diff --git a/Postgrest/src/iosMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt b/Postgrest/src/iosMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt
@@ -0,0 +1,5 @@
+package io.github.jan.supabase.postgrest
+
+import kotlin.reflect.KProperty1
+
+actual fun <T, V> getColumnName(property: KProperty1<T, V>) = property.name
diff --git a/Realtime/build.gradle.kts b/Realtime/build.gradle.kts
@@ -35,7 +35,8 @@ kotlin {
             }
         }
     }
-    //ios()
+    ios()
+    iosSimulatorArm64()
     sourceSets {
         all {
             languageSettings.optIn("kotlin.RequiresOptIn")
@@ -49,6 +50,10 @@ kotlin {
         val jvmMain by getting
         val androidMain by getting
         val jsMain by getting
+        val iosMain by getting
+        val iosSimulatorArm64Main by getting {
+            dependsOn(iosMain)
+        }
     }
 }
 

diff --git a/Storage/build.gradle.kts b/Storage/build.gradle.kts
@@ -31,7 +31,8 @@ kotlin {
             }
         }
     }
-    //ios()
+    ios()
+    iosSimulatorArm64()
     sourceSets {
         all {
             languageSettings.optIn("kotlin.RequiresOptIn")
@@ -49,6 +50,10 @@ kotlin {
             dependsOn(nonJsMain)
         }
         val jsMain by getting
+        val iosMain by getting
+        val iosSimulatorArm64Main by getting {
+            dependsOn(iosMain)
+        }
     }
 }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -112,7 +112,8 @@ kotlin {
             }
         }
     }
-    //ios()
+    ios()
+    iosSimulatorArm64()
     sourceSets {
         all {
             languageSettings.optIn("kotlin.RequiresOptIn")
@@ -151,6 +152,14 @@ kotlin {
               //  api(compose.web.core)
             }
         }
+        val iosTest by getting
+        val iosMain by getting
+        val iosSimulatorArm64Main by getting {
+            dependsOn(iosMain)
+        }
+        val iosSimulatorArm64Test by getting {
+            dependsOn(iosTest)
+        }
     }
 }
 

diff --git a/plugins/ApolloGraphQL/build.gradle.kts b/plugins/ApolloGraphQL/build.gradle.kts
@@ -35,7 +35,8 @@ kotlin {
             }
         }
     }
-    //ios()
+    ios()
+    iosSimulatorArm64()
     sourceSets {
         all {
             languageSettings.optIn("kotlin.RequiresOptIn")
@@ -51,6 +52,10 @@ kotlin {
         val jvmMain by getting
         val androidMain by getting
         val jsMain by getting
+        val iosMain by getting
+        val iosSimulatorArm64Main by getting {
+            dependsOn(iosMain)
+        }
     }
 }
 

diff --git a/src/jsMain/kotlin/io/github/jan/supabase/PlatformTarget.kt b/src/jsMain/kotlin/io/github/jan/supabase/PlatformTarget.kt
@@ -1,3 +1,3 @@
 package io.github.jan.supabase
 
-actual val CurrentPlatformTarget = PlatformTarget.WEB
+actual val CurrentPlatformTarget: PlatformTarget = PlatformTarget.WEB