Fix OAuth2 login handling

Author: elesey

composer.lock

@@ -64,17 +64,30 @@ kotlin {
         }
     }
 
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.binaries.framework {
+    iosX64 {
+        // Create a framework binary with additional options
+        binaries.framework {
             baseName = "shared"
             isStatic = true
             binaryOption("bundleId", "io.appwrite.shared")
         }
-        it.withSourcesJar(publish = false)
+        withSourcesJar(publish = false)
+    }
+    iosArm64 {
+        binaries.framework {
+            baseName = "shared"
+            isStatic = true
+            binaryOption("bundleId", "io.appwrite.shared")
+        }
+        withSourcesJar(publish = false)
+    }
+    iosSimulatorArm64 {
+        binaries.framework {
+            baseName = "shared"
+            isStatic = true
+            binaryOption("bundleId", "io.appwrite.shared")
+        }
+        withSourcesJar(publish = false)
     }
 
     sourceSets {
@@ -137,9 +150,11 @@ kotlin {
 
 publishing {
     publications.withType<MavenPublication> {
-        when (name) {
-            "jvm" -> artifactId = "sdk-for-kmp-jvm"
-            else -> artifactId = project.ext["PUBLISH_ARTIFACT_ID"].toString()
+        artifactId = if (name != "kotlinMultiplatform") {
+            // Append the target name to the artifactId so each publication is unique.
+            "${project.ext["PUBLISH_ARTIFACT_ID"].toString()}-$name"
+        } else {
+            project.ext["PUBLISH_ARTIFACT_ID"].toString()
         }
 
         pom {
@@ -211,4 +226,4 @@ dependencies {
     implementation(libs.androidx.browser)
     implementation(libs.androidx.espresso.core)
     implementation(libs.firebase.crashlytics.buildtools)
-}
+}

templates/kmp/shared/build.gradle.kts.twig

@@ -1,8 +1,8 @@
 package {{ sdk.namespace | caseDot }}
 
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import androidx.activity.ComponentActivity
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -17,7 +17,7 @@ import kotlin.collections.set
  * Used to authenticate with external OAuth2 providers. Launches browser windows and handles
  * suspension until the user completes the process or otherwise returns to the app.
  */
-actual class WebAuthComponent(private val activity: ComponentActivity) {
+actual class WebAuthComponent(private val context: Context) {
 
     companion object : DefaultLifecycleObserver {
         private var suspended = false
@@ -27,59 +27,30 @@ actual class WebAuthComponent(private val activity: ComponentActivity) {
             suspended = false
         }
 
-        /**
-         * Authenticate Session with OAuth2
-         *
-         * Launches a chrome custom tab from the given activity and directs to the given url,
-         * suspending until the user returns to the app, at which point the given [onComplete] callback
-         * will run, passing the callback url from the intent used to launch the [CallbackActivity],
-         * or an [IllegalStateException] in the case the user closed the window or returned to the
-         * app without passing through the [CallbackActivity].
-         *
-         *
-         * @param activity              The activity to launch the browser from and observe the lifecycle of
-         * @param url                   The url to launch
-         * @param callbackUrlScheme     The callback url scheme used to key the given callback
-         * @param onComplete            The callback to run when a result (success or failure) is received
-         */
         suspend fun authenticate(
-            activity: ComponentActivity,
+            context: Context,
             url: String,
             callbackUrlScheme: String,
             onComplete: ((Result<String>) -> Unit)?
         ) {
             val intent = CustomTabsIntent.Builder().build()
-            val keepAliveIntent = Intent(activity, KeepAliveService::class.java)
+            val keepAliveIntent = Intent(context, KeepAliveService::class.java)
 
             callbacks[callbackUrlScheme] = onComplete
 
             intent.intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
             intent.intent.putExtra("android.support.customtabs.extra.KEEP_ALIVE", keepAliveIntent)
-            intent.launchUrl(activity, Uri.parse(url))
+            intent.launchUrl(context, Uri.parse(url))
 
-            activity.runOnUiThread {
-                activity.lifecycle.addObserver(this)
-            }
-
-            // Need to dirty poll block so execution doesn't continue at the callsite of this function
+            // Dirty poll block so execution doesn't continue at the callsite of this function
             suspended = true
             while (suspended) {
                 delay(200)
             }
             cleanUp()
         }
 
-        /**
-         * Trigger a web auth callback
-         *
-         * Attempts to find a callback for the given [scheme] and if found, invokes it, passing the
-         * given [url]. Calling this method stops auth suspension, so any calls to [authenticate]
-         * will continue execution from their suspension points immediately after this method
-         * is called.
-         *
-         * @param scheme    The scheme to match to a callback's key
-         * @param url       The url received through intent data from the [CallbackActivity]
-         */
+        
         fun onCallback(scheme: String, url: String) {
             callbacks.remove(scheme)?.invoke(
                 Result.success(url)
@@ -104,7 +75,7 @@ actual class WebAuthComponent(private val activity: ComponentActivity) {
         onComplete: ((Result<String>) -> Unit)?
     ) {
         authenticate(
-            activity,
+            context,
             url,
             callbackUrlScheme,
             onComplete,