rebase and merge GitLiveApp#729 with auth support

Author: DatL4g

README.md

@@ -17,6 +17,7 @@ This is a (temporary?) fork with the following merged upstream pull requests, up
 ### Pull Requests
 
 - https://github.com/GitLiveApp/firebase-kotlin-sdk/pull/738
+- https://github.com/GitLiveApp/firebase-kotlin-sdk/pull/729
 - https://github.com/GitLiveApp/firebase-kotlin-sdk/pull/698
 
 ### Firebase SDK

firebase-analytics/build.gradle.kts

@@ -105,8 +105,15 @@ kotlin {
         iosArm64()
         iosX64()
         iosSimulatorArm64()
+        tvosArm64()
+        tvosX64()
+        tvosSimulatorArm64()
+        macosArm64()
+        macosX64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
+            tvos.deploymentTarget = libs.versions.tvos.deploymentTarget.get()
+            osx.deploymentTarget = libs.versions.macos.deploymentTarget.get()
             framework {
                 baseName = "FirebaseAnalytics"
             }
@@ -140,7 +147,11 @@ kotlin {
         all {
             languageSettings.apply {
                 progressiveMode = true
-                if (name.lowercase().contains("ios")) {
+                if (name.lowercase().contains("ios")
+                    || name.lowercase().contains("apple")
+                    || name.lowercase().contains("tvos")
+                    || name.lowercase().contains("macos")
+                    ) {
                     optIn("kotlinx.cinterop.ExperimentalForeignApi")
                 }
             }

firebase-analytics/src/iosMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt renamed to firebase-analytics/src/appleMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -106,9 +106,16 @@ kotlin {
         iosArm64()
         iosX64()
         iosSimulatorArm64()
+        tvosArm64()
+        tvosX64()
+        tvosSimulatorArm64()
+        macosArm64()
+        macosX64()
 
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
+            tvos.deploymentTarget = libs.versions.tvos.deploymentTarget.get()
+            osx.deploymentTarget = libs.versions.macos.deploymentTarget.get()
             framework {
                 baseName = "FirebaseApp"
             }
@@ -142,7 +149,11 @@ kotlin {
         all {
             languageSettings.apply {
                 progressiveMode = true
-                if (name.lowercase().contains("ios")) {
+                if (name.lowercase().contains("ios")
+                    || name.lowercase().contains("apple")
+                    || name.lowercase().contains("tvos")
+                    || name.lowercase().contains("macos")
+                ) {
                     optIn("kotlinx.cinterop.ExperimentalForeignApi")
                 }
             }

firebase-analytics/src/iosTest/kotlin/dev/gitlive/firebase/analytics/analytics.kt renamed to firebase-analytics/src/appleTest/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -106,8 +106,15 @@ kotlin {
         iosArm64()
         iosX64().enableKeychainForTests()
         iosSimulatorArm64().enableKeychainForTests()
+        tvosArm64()
+        tvosX64()
+        tvosSimulatorArm64()
+        macosArm64()
+        macosX64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
+            tvos.deploymentTarget = libs.versions.tvos.deploymentTarget.get()
+            osx.deploymentTarget = libs.versions.macos.deploymentTarget.get()
             framework {
                 baseName = "FirebaseAuth"
             }
@@ -142,7 +149,11 @@ kotlin {
             languageSettings.apply {
                 progressiveMode = true
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
-                if (name.lowercase().contains("ios")) {
+                if (name.lowercase().contains("ios")
+                    || name.lowercase().contains("apple")
+                    || name.lowercase().contains("tvos")
+                    || name.lowercase().contains("macos")
+                ) {
                     optIn("kotlinx.cinterop.ExperimentalForeignApi")
                     optIn("kotlinx.cinterop.BetaInteropApi")
                 }

firebase-app/build.gradle.kts

@@ -19,92 +19,6 @@ import platform.Foundation.NSError
 import platform.Foundation.NSString
 import platform.Foundation.NSURL
 
-public actual val Firebase.auth: FirebaseAuth
-    get() = FirebaseAuth(FIRAuth.auth())
-
-public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = FirebaseAuth(
-    FIRAuth.authWithApp(app.ios as objcnames.classes.FIRApp),
-)
-
-public actual class FirebaseAuth internal constructor(public val ios: FIRAuth) {
-
-    public actual val currentUser: FirebaseUser?
-        get() = ios.currentUser()?.let { FirebaseUser(it) }
-
-    public actual val authStateChanged: Flow<FirebaseUser?> get() = callbackFlow {
-        val handle = ios.addAuthStateDidChangeListener { _, user -> trySend(user?.let { FirebaseUser(it) }) }
-        awaitClose { ios.removeAuthStateDidChangeListener(handle) }
-    }
-
-    public actual val idTokenChanged: Flow<FirebaseUser?> get() = callbackFlow {
-        val handle = ios.addIDTokenDidChangeListener { _, user -> trySend(user?.let { FirebaseUser(it) }) }
-        awaitClose { ios.removeIDTokenDidChangeListener(handle) }
-    }
-
-    public actual var languageCode: String
-        get() = ios.languageCode() ?: ""
-        set(value) {
-            ios.setLanguageCode(value)
-        }
-
-    public actual suspend fun applyActionCode(code: String): Unit = ios.await { applyActionCode(code, it) }
-    public actual suspend fun confirmPasswordReset(code: String, newPassword: String): Unit = ios.await { confirmPasswordResetWithCode(code, newPassword, it) }
-
-    public actual suspend fun createUserWithEmailAndPassword(email: String, password: String): AuthResult = AuthResult(ios.awaitResult { createUserWithEmail(email = email, password = password, completion = it) })
-
-    @Suppress("UNCHECKED_CAST")
-    public actual suspend fun fetchSignInMethodsForEmail(email: String): List<String> = ios.awaitResult<FIRAuth, List<*>?> { fetchSignInMethodsForEmail(email, it) }.orEmpty() as List<String>
-
-    public actual suspend fun sendPasswordResetEmail(email: String, actionCodeSettings: ActionCodeSettings?) {
-        ios.await { actionCodeSettings?.let { actionSettings -> sendPasswordResetWithEmail(email, actionSettings.toIos(), it) } ?: sendPasswordResetWithEmail(email = email, completion = it) }
-    }
-
-    public actual suspend fun sendSignInLinkToEmail(email: String, actionCodeSettings: ActionCodeSettings): Unit = ios.await { sendSignInLinkToEmail(email, actionCodeSettings.toIos(), it) }
-
-    public actual fun isSignInWithEmailLink(link: String): Boolean = ios.isSignInWithEmailLink(link)
-
-    public actual suspend fun signInWithEmailAndPassword(email: String, password: String): AuthResult = AuthResult(ios.awaitResult { signInWithEmail(email = email, password = password, completion = it) })
-
-    public actual suspend fun signInWithCustomToken(token: String): AuthResult = AuthResult(ios.awaitResult { signInWithCustomToken(token, it) })
-
-    public actual suspend fun signInAnonymously(): AuthResult = AuthResult(ios.awaitResult { signInAnonymouslyWithCompletion(it) })
-
-    public actual suspend fun signInWithCredential(authCredential: AuthCredential): AuthResult = AuthResult(ios.awaitResult { signInWithCredential(authCredential.ios, it) })
-
-    public actual suspend fun signInWithEmailLink(email: String, link: String): AuthResult = AuthResult(ios.awaitResult { signInWithEmail(email = email, link = link, completion = it) })
-
-    public actual suspend fun signOut(): Unit = ios.throwError { signOut(it) }
-
-    public actual suspend fun updateCurrentUser(user: FirebaseUser): Unit = ios.await { updateCurrentUser(user.ios, it) }
-    public actual suspend fun verifyPasswordResetCode(code: String): String = ios.awaitResult { verifyPasswordResetCode(code, it) }
-
-    public actual suspend fun <T : ActionCodeResult> checkActionCode(code: String): T {
-        val result: FIRActionCodeInfo = ios.awaitResult { checkActionCode(code, it) }
-        @Suppress("UNCHECKED_CAST")
-        return when (result.operation()) {
-            FIRActionCodeOperationEmailLink -> SignInWithEmailLink
-            FIRActionCodeOperationVerifyEmail -> VerifyEmail(result.email())
-            FIRActionCodeOperationPasswordReset -> PasswordReset(result.email())
-            FIRActionCodeOperationRecoverEmail -> RecoverEmail(result.email(), result.previousEmail()!!)
-            FIRActionCodeOperationVerifyAndChangeEmail -> VerifyBeforeChangeEmail(result.email(), result.previousEmail()!!)
-            FIRActionCodeOperationRevertSecondFactorAddition -> RevertSecondFactorAddition(result.email(), null)
-            FIRActionCodeOperationUnknown -> throw UnsupportedOperationException(result.operation().toString())
-            else -> throw UnsupportedOperationException(result.operation().toString())
-        } as T
-    }
-
-    public actual fun useEmulator(host: String, port: Int): Unit = ios.useEmulatorWithHost(host, port.toLong())
-}
-
-public actual class AuthResult(public val ios: FIRAuthDataResult) {
-    public actual val user: FirebaseUser?
-        get() = FirebaseUser(ios.user())
-    public actual val credential: AuthCredential?
-        get() = ios.credential()?.let { AuthCredential(it) }
-    public actual val additionalUserInfo: AdditionalUserInfo?
-        get() = ios.additionalUserInfo()?.let { AdditionalUserInfo(it) }
-}
-
 public actual class AdditionalUserInfo(
     public val ios: FIRAdditionalUserInfo,
 ) {

firebase-app/src/iosMain/kotlin/dev/gitlive/firebase/firebase.kt renamed to firebase-app/src/appleMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.gitlive.firebase.auth
+
+import cocoapods.FirebaseAuth.*
+
+public actual open class AuthCredential(public open val ios: FIRAuthCredential) {
+    public actual val providerId: String
+        get() = ios.provider()
+}
+
+public actual class PhoneAuthCredential(override val ios: FIRPhoneAuthCredential) : AuthCredential(ios)
+public actual class OAuthCredential(override val ios: FIROAuthCredential) : AuthCredential(ios)
+
+public actual object EmailAuthProvider {
+    public actual fun credential(
+        email: String,
+        password: String,
+    ): AuthCredential = AuthCredential(FIREmailAuthProvider.credentialWithEmail(email = email, password = password))
+
+    public actual fun credentialWithLink(
+        email: String,
+        emailLink: String,
+    ): AuthCredential = AuthCredential(FIREmailAuthProvider.credentialWithEmail(email = email, link = emailLink))
+}
+
+public actual object FacebookAuthProvider {
+    public actual fun credential(accessToken: String): AuthCredential = AuthCredential(FIRFacebookAuthProvider.credentialWithAccessToken(accessToken))
+}
+
+public actual object GithubAuthProvider {
+    public actual fun credential(token: String): AuthCredential = AuthCredential(FIRGitHubAuthProvider.credentialWithToken(token))
+}
+
+public actual object GoogleAuthProvider {
+    public actual fun credential(idToken: String?, accessToken: String?): AuthCredential {
+        requireNotNull(idToken) { "idToken must not be null" }
+        requireNotNull(accessToken) { "accessToken must not be null" }
+        return AuthCredential(FIRGoogleAuthProvider.credentialWithIDToken(idToken, accessToken))
+    }
+}
+
+public actual object TwitterAuthProvider {
+    public actual fun credential(token: String, secret: String): AuthCredential = AuthCredential(FIRTwitterAuthProvider.credentialWithToken(token, secret))
+}