Merge pull request #10

feat: Add flow type option for Supabase authentication and refactor related configurations

Author: sunildhiman90

convention-plugins/src/main/kotlin/root.publication.gradle.kts

@@ -5,5 +5,5 @@ plugins {
 // these will be used for all projects ie. kmauth-core, kmauth-google etc.
 allprojects {
     group = "io.github.sunildhiman90"
-    version = "0.3.0"
+    version = "0.3.1"
 }

kmauth-core/src/commonMain/kotlin/com/sunildhiman90/kmauth/core/KMAuthConfig.kt

@@ -14,7 +14,7 @@ data class KMAuthConfig(
      * A unique identifier for the provider (e.g., "google", "supabase").
      * This is used to store and retrieve the configuration for different providers.
      */
-    val providerId: String,
+    val providerId: String = "default",
 
     val kmAuthPlatformContext: KMAuthPlatformContext? = null,
     val webClientId: String? = null,
@@ -26,7 +26,8 @@ data class KMAuthConfig(
     val autoLoadFromStorage: Boolean = true,
     val autoRefreshToken: Boolean = true,
     val deepLinkHost: String? = null,
-    val deepLinkScheme: String? = null
+    val deepLinkScheme: String? = null,
+    val flowType: KMAuthSupabaseFlowType? = null
 ) {
     init {
         // Validate Supabase configuration if URL or key is provided
@@ -40,51 +41,48 @@ data class KMAuthConfig(
         /**
          * Creates a [KMAuthConfig] for Supabase authentication.
          *
-         * @param providerId A unique identifier for this provider
          * @param kmAuthPlatformContext The platform-specific context (e.g., Android Context).
          * @param supabaseUrl The Supabase project URL.
          * @param supabaseKey The Supabase anon/public key.
          * @param autoLoadFromStorage Whether to automatically load authentication data from storage.
          * @param autoRefreshToken Whether to automatically refresh access tokens.
          * @param deepLinkHost The host for Android/ios deep links for oauth.
          * @param deepLinkScheme The scheme for Android/ios deep links for oauth.
+         * @param kmAuthSupabaseFlowType The flow type for Supabase authentication.
          */
         fun forSupabase(
-            providerId: String = "supabase",
             supabaseUrl: String,
             supabaseKey: String,
             kmAuthPlatformContext: KMAuthPlatformContext? = null,
             autoLoadFromStorage: Boolean = true,
             autoRefreshToken: Boolean = true,
             deepLinkHost: String? = null,
-            deepLinkScheme: String? = null
+            deepLinkScheme: String? = null,
+            kmAuthSupabaseFlowType: KMAuthSupabaseFlowType? = null
         ): KMAuthConfig = KMAuthConfig(
-            providerId = providerId,
             kmAuthPlatformContext = kmAuthPlatformContext,
             supabaseUrl = supabaseUrl,
             supabaseKey = supabaseKey,
             autoLoadFromStorage = autoLoadFromStorage,
             autoRefreshToken = autoRefreshToken,
             deepLinkHost = deepLinkHost,
-            deepLinkScheme = deepLinkScheme
+            deepLinkScheme = deepLinkScheme,
+            flowType = kmAuthSupabaseFlowType
         )
 
         /**
          * Creates a [KMAuthConfig] for Google authentication.
          *
-         * @param providerId A unique identifier for this provider (e.g., "google-main", "google-backup").
          * @param kmAuthPlatformContext The platform-specific context (e.g., Android Context).
          * @param webClientId The OAuth web client ID.
          * @param clientSecret The OAuth client secret.
          */
         fun forGoogle(
             webClientId: String,
-            providerId: String = "google",
             kmAuthPlatformContext: KMAuthPlatformContext? = null,
             clientSecret: String? = null
         ): KMAuthConfig {
             val kmAuthConfig = KMAuthConfig(
-                providerId = providerId,
                 webClientId = webClientId,
                 clientSecret = clientSecret
             )

kmauth-core/src/commonMain/kotlin/com/sunildhiman90/kmauth/core/KMAuthSupabaseFlowType.kt

@@ -0,0 +1,16 @@
+package com.sunildhiman90.kmauth.core
+
+
+/**
+ * Enum class for Supabase authentication flow types.
+ */
+enum class KMAuthSupabaseFlowType {
+    IMPLICIT,
+    PKCE;
+
+    companion object {
+        fun fromValue(value: String): KMAuthSupabaseFlowType {
+            return entries.firstOrNull { it.name == value } ?: throw IllegalArgumentException("Invalid KMAuthSupabaseFlowType: $value")
+        }
+    }
+}

kmauth-google/kmauth_google.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'kmauth_google'
-    spec.version                  = '0.3.0'
+    spec.version                  = '0.3.1'
     spec.homepage                 = ''
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

kmauth-supabase/src/commonMain/kotlin/com/sunildhiman90/kmauth/supabase/KMAuthSupabase.kt

@@ -10,8 +10,10 @@ import com.sunildhiman90.kmauth.supabase.model.SupabaseDefaultAuthProvider
 import com.sunildhiman90.kmauth.supabase.model.SupabaseOAuthProvider
 import com.sunildhiman90.kmauth.supabase.model.SupabaseUser
 import com.sunildhiman90.kmauth.supabase.model.toSupabaseUser
+import com.sunildhiman90.kmauth.supabase.utils.toFlowType
 import io.github.jan.supabase.SupabaseClient
 import io.github.jan.supabase.auth.Auth
+import io.github.jan.supabase.auth.FlowType
 import io.github.jan.supabase.auth.auth
 import io.github.jan.supabase.auth.status.SessionStatus
 import io.github.jan.supabase.createSupabaseClient
@@ -67,6 +69,7 @@ object KMAuthSupabase : CoroutineScope {
                     this.autoLoadFromStorage = config.autoLoadFromStorage
                     this.alwaysAutoRefresh = config.autoRefreshToken
                     redirectUrl?.let { this.defaultRedirectUrl = it }
+                    flowType = config.flowType?.toFlowType() ?: FlowType.IMPLICIT
 
                     //Android and ios deep links
                     config.deepLinkHost?.let { this.host = it }

kmauth-supabase/src/commonMain/kotlin/com/sunildhiman90/kmauth/supabase/model/SupabaseOAuthProvider.kt

@@ -9,6 +9,7 @@ import io.github.jan.supabase.auth.providers.Github
 import io.github.jan.supabase.auth.providers.Gitlab
 import io.github.jan.supabase.auth.providers.Google
 import io.github.jan.supabase.auth.providers.IDTokenProvider
+import io.github.jan.supabase.auth.providers.Keycloak
 import io.github.jan.supabase.auth.providers.LinkedIn
 import io.github.jan.supabase.auth.providers.OAuthProvider
 import io.github.jan.supabase.auth.providers.Slack
@@ -29,6 +30,7 @@ enum class SupabaseOAuthProvider {
     SPOTIFY,
     TWITCH,
     LINKEDIN,
+    KEYCLOAK,
 
     // IDTokenProviders
     GOOGLE,
@@ -51,6 +53,7 @@ enum class SupabaseOAuthProvider {
             LINKEDIN -> LinkedIn
             APPLE -> Apple
             AZURE -> Azure
+            KEYCLOAK -> Keycloak
         }
     }
 

kmauth-supabase/src/commonMain/kotlin/com/sunildhiman90/kmauth/supabase/utils/SupabaseUtils.kt

@@ -0,0 +1,9 @@
+package com.sunildhiman90.kmauth.supabase.utils
+
+import com.sunildhiman90.kmauth.core.KMAuthSupabaseFlowType
+import io.github.jan.supabase.auth.FlowType
+
+fun KMAuthSupabaseFlowType.toFlowType(): FlowType = when (this) {
+    KMAuthSupabaseFlowType.IMPLICIT -> FlowType.IMPLICIT
+    KMAuthSupabaseFlowType.PKCE -> FlowType.PKCE
+}