Sign in with credential implementation (#63)

* Sign in with credential implementation

* js fix

* minor changes

* Replace internal constructors with public

* Credentials tests

* Add EmailAuthProvider

* Review fixes

Co-authored-by: Nicholas Bransby-Williams <[email protected]>

Author: mksmdvdff

firebase-auth/build.gradle.kts

@@ -100,6 +100,7 @@ kotlin {
                 implementation(project(":firebase-common"))
             }
         }
+
         val androidMain by getting {
             dependencies {
                 api("com.google.firebase:firebase-auth:19.1.0")

firebase-auth/src/androidAndroidTest/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -10,4 +10,4 @@ import kotlinx.coroutines.runBlocking
 
 actual val context: Any = InstrumentationRegistry.getInstrumentation().targetContext
 
-actual fun runTest(test: suspend () -> Unit) = runBlocking { test() }
+actual fun runTest(test: suspend () -> Unit) = runBlocking { test() }

firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -4,6 +4,7 @@
 
 package dev.gitlive.firebase.auth
 
+import com.google.firebase.auth.EmailAuthProvider
 import com.google.firebase.auth.FirebaseAuth.AuthStateListener
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
@@ -45,10 +46,14 @@ actual class FirebaseAuth internal constructor(val android: com.google.firebase.
         android.addAuthStateListener(listener)
         awaitClose { android.removeAuthStateListener(listener) }
     }
+    actual suspend fun signInWithCredential(authCredential: AuthCredential) =
+        AuthResult(android.signInWithCredential(authCredential.android).await())
 
     actual suspend fun signOut() = android.signOut()
 }
 
+actual class AuthCredential(val android: com.google.firebase.auth.AuthCredential)
+
 actual class AuthResult internal constructor(val android: com.google.firebase.auth.AuthResult) {
     actual val user: FirebaseUser?
         get() = android.user?.let { FirebaseUser(it) }
@@ -79,3 +84,9 @@ actual typealias FirebaseAuthRecentLoginRequiredException = com.google.firebase.
 actual typealias FirebaseAuthUserCollisionException = com.google.firebase.auth.FirebaseAuthUserCollisionException
 actual typealias FirebaseAuthWebException = com.google.firebase.auth.FirebaseAuthWebException
 
+actual object EmailAuthProvider {
+    actual fun credentialWithEmail(
+        email: String,
+        password: String
+    ): AuthCredential = AuthCredential(EmailAuthProvider.getCredential(email, password))
+}

firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -3,6 +3,7 @@
  */
 
 @file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+
 package dev.gitlive.firebase.auth
 
 import dev.gitlive.firebase.Firebase
@@ -22,6 +23,7 @@ expect class FirebaseAuth {
     suspend fun createUserWithEmailAndPassword(email: String, password: String): AuthResult
     suspend fun signInWithCustomToken(token: String): AuthResult
     suspend fun signInAnonymously(): AuthResult
+    suspend fun signInWithCredential(authCredential: AuthCredential): AuthResult
     suspend fun signOut()
 }
 
@@ -40,12 +42,18 @@ expect class FirebaseUser {
     suspend fun sendEmailVerification()
 }
 
-expect open class FirebaseAuthException: FirebaseException
-expect class FirebaseAuthActionCodeException: FirebaseAuthException
-expect class FirebaseAuthEmailException: FirebaseAuthException
-expect class FirebaseAuthInvalidCredentialsException: FirebaseAuthException
-expect class FirebaseAuthInvalidUserException: FirebaseAuthException
-expect class FirebaseAuthRecentLoginRequiredException: FirebaseAuthException
-expect class FirebaseAuthUserCollisionException: FirebaseAuthException
-expect class FirebaseAuthWebException: FirebaseAuthException
+expect open class FirebaseAuthException : FirebaseException
+expect class FirebaseAuthActionCodeException : FirebaseAuthException
+expect class FirebaseAuthEmailException : FirebaseAuthException
+expect class FirebaseAuthInvalidCredentialsException : FirebaseAuthException
+expect class FirebaseAuthInvalidUserException : FirebaseAuthException
+expect class FirebaseAuthRecentLoginRequiredException : FirebaseAuthException
+expect class FirebaseAuthUserCollisionException : FirebaseAuthException
+expect class FirebaseAuthWebException : FirebaseAuthException
+
+expect class AuthCredential
+
+expect object EmailAuthProvider{
+    fun credentialWithEmail(email: String, password: String): AuthCredential
+}
 

firebase-auth/src/commonTest/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -26,7 +26,7 @@ class FirebaseAuthTest {
                     storageBucket = "fir-kotlin-sdk.appspot.com",
                     projectId = "fir-kotlin-sdk"
                 )
-        )
+            )
     }
 
     @Test
@@ -70,4 +70,12 @@ class FirebaseAuthTest {
 
         createResult.user!!.delete()
     }
-}
+
+    @Test
+    fun testSignInWithCredential() = runTest {
+        val credential = EmailAuthProvider.credentialWithEmail("[email protected]", "test123")
+        val result = Firebase.auth.signInWithCredential(credential)
+        assertEquals("mn8kgIFnxLO7il8GpTa5g0ObP6I2", result.user!!.uid)
+
+    }
+}

firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -42,6 +42,9 @@ actual class FirebaseAuth internal constructor(val ios: FIRAuth) {
     actual suspend fun signInAnonymously() =
         AuthResult(ios.awaitResult { signInAnonymouslyWithCompletion(it) })
 
+    actual suspend fun signInWithCredential(authCredential: AuthCredential) =
+        AuthResult(ios.awaitResult { signInWithCredential(authCredential.ios, it) })
+
     actual suspend fun signOut() = ios.throwError { signOut(it) }.run { Unit }
 
     actual val authStateChanged get() = callbackFlow {
@@ -80,6 +83,16 @@ actual open class FirebaseAuthRecentLoginRequiredException(message: String): Fir
 actual open class FirebaseAuthUserCollisionException(message: String): FirebaseAuthException(message)
 actual open class FirebaseAuthWebException(message: String): FirebaseAuthException(message)
 
+actual class AuthCredential(val ios: FIRAuthCredential)
+
+actual object EmailAuthProvider {
+    actual fun credentialWithEmail(
+        email: String,
+        password: String
+    ): AuthCredential =
+        AuthCredential(FIREmailAuthProvider.credentialWithEmail(email = email, password = password))
+}
+
 
 private fun <T, R> T.throwError(block: T.(errorPointer: CPointer<ObjCObjectVar<NSError?>>) -> R): R {
     memScoped {

firebase-auth/src/iosTest/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -19,4 +19,4 @@ actual fun runTest(test: suspend () -> Unit) = runBlocking {
         yield()
     }
     testRun.await()
-}
+}

firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -43,8 +43,13 @@ actual class FirebaseAuth internal constructor(val js: firebase.auth.Auth) {
         }
         awaitClose { unsubscribe() }
     }
+
+    actual suspend fun signInWithCredential(authCredential: AuthCredential) =
+        rethrow { AuthResult(js.signInWithCredential(authCredential.js).await()) }
 }
 
+actual class AuthCredential(val js: firebase.auth.AuthCredential)
+
 actual class AuthResult internal constructor(val js: firebase.auth.AuthResult) {
     actual val user: FirebaseUser?
         get() = rethrow { js.user?.let { FirebaseUser(it) } }
@@ -103,3 +108,10 @@ private fun errorToException(cause: Throwable) = when(val code = cause.asDynamic
 //                "auth/unauthorized-domain" ->
     else -> FirebaseAuthException(code, cause)
 }
+
+actual object EmailAuthProvider {
+    actual fun credentialWithEmail(
+        email: String,
+        password: String
+    ): AuthCredential = AuthCredential(firebase.auth.EmailAuthProvider.credential(email, password))
+}

firebase-auth/src/jsTest/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -9,4 +9,4 @@ import kotlinx.coroutines.promise
 
 actual val context: Any = Unit
 
-actual fun runTest(test: suspend () -> Unit) = GlobalScope.promise { test() }.unsafeCast<Unit>()
+actual fun runTest(test: suspend () -> Unit) = GlobalScope.promise { test() }.unsafeCast<Unit>()

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt

@@ -62,13 +62,23 @@ external object firebase {
             fun createUserWithEmailAndPassword(email: String, password: String): Promise<AuthResult>
             fun signInWithCustomToken(token: String): Promise<AuthResult>
             fun signInAnonymously(): Promise<AuthResult>
+            fun signInWithCredential(authCredential: AuthCredential): Promise<AuthResult>
             fun signOut(): Promise<Unit>
 
             fun onAuthStateChanged(nextOrObserver: (user.User?) -> Unit): () -> Unit
         }
         interface AuthResult {
             val user: user.User?
         }
+
+        interface AuthCredential
+
+        abstract class EmailAuthProvider {
+            companion object {
+                fun credential(email :  String, password : String) : AuthCredential
+            }
+        }
+
     }
 
     fun User(a: Any,b: Any,c: Any): user.User