remove awaitExpectedResult

Author: nbransby

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

@@ -54,10 +54,10 @@ class FirebaseAuthTest {
     fun testFetchSignInMethods() = runTest {
         val email = "test+${Random.nextInt(100000)}@test.com"
         var signInMethodResult = Firebase.auth.fetchSignInMethodsForEmail(email)
-        assertEquals(emptyList(), signInMethodResult.signInMethods)
+        assertEquals(emptyList(), signInMethodResult)
         Firebase.auth.createUserWithEmailAndPassword(email, "test123")
         signInMethodResult = Firebase.auth.fetchSignInMethodsForEmail(email)
-        assertEquals(listOf("password"), signInMethodResult.signInMethods)
+        assertEquals(listOf("password"), signInMethodResult)
 
         Firebase.auth.signInWithEmailAndPassword(email, "test123").user!!.delete()
     }
@@ -85,7 +85,7 @@ class FirebaseAuthTest {
 
     @Test
     fun testSignInWithCredential() = runTest {
-        val credential = EmailAuthProvider.credentialWithEmail("[email protected]", "test123")
+        val credential = EmailAuthProvider.credential("[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

@@ -45,9 +45,9 @@ actual class FirebaseAuth internal constructor(val ios: FIRAuth) {
     actual suspend fun confirmPasswordReset(code: String, newPassword: String) = ios.await { confirmPasswordResetWithCode(code, newPassword, it) }.run { Unit }
 
     actual suspend fun createUserWithEmailAndPassword(email: String, password: String) =
-        AuthResult(ios.awaitExpectedResult { createUserWithEmail(email = email, password = password, completion = it) })
+        AuthResult(ios.awaitResult { createUserWithEmail(email = email, password = password, completion = it) })
 
-    actual suspend fun fetchSignInMethodsForEmail(email: String) = ios.awaitResult { fetchSignInMethodsForEmail(email, it) }.orEmpty()
+    actual suspend fun fetchSignInMethodsForEmail(email: String) = ios.awaitResult { fetchSignInMethodsForEmail(email, it) } as List<String>
 
     actual suspend fun sendPasswordResetEmail(email: String, actionCodeSettings: ActionCodeSettings?) {
         ios.await { actionCodeSettings?.let { actionSettings -> sendPasswordResetWithEmail(email, actionSettings.toIos(), it) } ?: sendPasswordResetWithEmail(email = email, completion = it) }
@@ -56,24 +56,24 @@ actual class FirebaseAuth internal constructor(val ios: FIRAuth) {
     actual suspend fun sendSignInLinkToEmail(email: String, actionCodeSettings: ActionCodeSettings) = ios.await { sendSignInLinkToEmail(email, actionCodeSettings.toIos(), it) }.run { Unit }
 
     actual suspend fun signInWithEmailAndPassword(email: String, password: String) =
-        AuthResult(ios.awaitExpectedResult { signInWithEmail(email = email, password = password, completion = it) })
+        AuthResult(ios.awaitResult { signInWithEmail(email = email, password = password, completion = it) })
 
     actual suspend fun signInWithCustomToken(token: String) =
-        AuthResult(ios.awaitExpectedResult { signInWithCustomToken(token, it) })
+        AuthResult(ios.awaitResult { signInWithCustomToken(token, it) })
 
     actual suspend fun signInAnonymously() =
-        AuthResult(ios.awaitExpectedResult { signInAnonymouslyWithCompletion(it) })
+        AuthResult(ios.awaitResult { signInAnonymouslyWithCompletion(it) })
 
     actual suspend fun signInWithCredential(authCredential: AuthCredential) =
-        AuthResult(ios.awaitExpectedResult { signInWithCredential(authCredential.ios, it) })
+        AuthResult(ios.awaitResult { signInWithCredential(authCredential.ios, it) })
 
     actual suspend fun signOut() = ios.throwError { signOut(it) }.run { Unit }
 
     actual suspend fun updateCurrentUser(user: FirebaseUser) = ios.await { updateCurrentUser(user.ios, it) }.run { Unit }
-    actual suspend fun verifyPasswordResetCode(code: String): String = ios.awaitExpectedResult { verifyPasswordResetCode(code, it) }
+    actual suspend fun verifyPasswordResetCode(code: String): String = ios.awaitResult { verifyPasswordResetCode(code, it) }
 
     actual suspend fun <T : ActionCodeResult> checkActionCode(code: String): T {
-        val result = ios.awaitExpectedResult { checkActionCode(code, it) }
+        val result = ios.awaitResult { checkActionCode(code, it) }
         @Suppress("UNCHECKED_CAST")
         return when(result.operation) {
             FIRActionCodeOperationUnknown -> Error
@@ -93,7 +93,7 @@ actual class AuthResult internal constructor(val ios: FIRAuthDataResult) {
         get() = FirebaseUser(ios.user)
 }
 
-internal fun ActionCodeSettings.toIos() = FIRActionCodeSettings().let {
+internal fun ActionCodeSettings.toIos() = FIRActionCodeSettings().also {
     it.URL =  NSURL.URLWithString(url)
     androidPackageName?.run { it.setAndroidPackageName(androidPackageName, installIfNotAvailable, minimumVersion) }
     it.dynamicLinkDomain = dynamicLinkDomain
@@ -127,41 +127,13 @@ internal fun <T, R> T.throwError(block: T.(errorPointer: CPointer<ObjCObjectVar<
     }
 }
 
-internal suspend fun <T, R> T.awaitResult(function: T.(callback: (R?, NSError?) -> Unit) -> Unit): R? {
-    val job = CompletableDeferred<R?>()
-    function { result, error ->
-        if(error != null) {
-            job.completeExceptionally(error.toException())
-        } else {
-            job.complete(result)
-        }
-    }
-    return job.await()
-}
-
-internal suspend fun <T, R> T.awaitResult(default: R, function: T.(callback: (R?, NSError?) -> Unit) -> Unit): R {
+internal suspend fun <T, R> T.awaitResult(function: T.(callback: (R, NSError?) -> Unit) -> Unit): R {
     val job = CompletableDeferred<R>()
     function { result, error ->
-        if(result != null) {
+        if(error == null) {
             job.complete(result)
-        } else if(error != null) {
-            job.completeExceptionally(error.toException())
         } else {
-            job.complete(default)
-        }
-    }
-    return job.await()
-}
-
-internal suspend fun <T, R> T.awaitExpectedResult(function: T.(callback: (R?, NSError?) -> Unit) -> Unit): R {
-    val job = CompletableDeferred<R>()
-    function { result, error ->
-        if(result != null) {
-            job.complete(result)
-        } else if(error != null) {
             job.completeExceptionally(error.toException())
-        } else {
-            job.completeExceptionally(UnexpectedNullResultException())
         }
     }
     return job.await()

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

@@ -69,7 +69,7 @@ actual class OAuthProvider(val ios: FIROAuthProvider, private val auth: Firebase
                 null}.toMap()
     }
 
-    actual suspend fun signIn(signInProvider: SignInProvider): AuthResult = AuthResult(ios.awaitExpectedResult { auth.ios.signInWithProvider(ios, signInProvider.delegate, it) })
+    actual suspend fun signIn(signInProvider: SignInProvider): AuthResult = AuthResult(ios.awaitResult { auth.ios.signInWithProvider(ios, signInProvider.delegate, it) })
 }
 
 actual class SignInProvider(val delegate: FIRAuthUIDelegateProtocol)
@@ -80,7 +80,7 @@ actual class PhoneAuthProvider(val ios: FIRPhoneAuthProvider) {
 
     actual fun credential(verificationId: String, smsCode: String): PhoneAuthCredential = PhoneAuthCredential(ios.credentialWithVerificationID(verificationId, smsCode))
     actual suspend fun verifyPhoneNumber(phoneNumber: String, verificationProvider: PhoneVerificationProvider): AuthCredential {
-        val verificationId: String = ios.awaitExpectedResult { ios.verifyPhoneNumber(phoneNumber, verificationProvider.delegate, it) }
+        val verificationId: String = ios.awaitResult { ios.verifyPhoneNumber(phoneNumber, verificationProvider.delegate, it) }
         val verificationCode = verificationProvider.getVerificationCode()
         return credential(verificationId, verificationCode)
     }

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

@@ -10,7 +10,7 @@ actual class MultiFactor(val ios: FIRMultiFactor) {
     actual val enrolledFactors: List<MultiFactorInfo>
         get() = ios.enrolledFactors.mapNotNull { info -> (info as? FIRMultiFactorInfo)?.let{  MultiFactorInfo(it) } }
     actual suspend fun enroll(multiFactorAssertion: MultiFactorAssertion, displayName: String?) = ios.await { enrollWithAssertion(multiFactorAssertion.ios, displayName, it) }.run { Unit }
-    actual suspend fun getSession(): MultiFactorSession = MultiFactorSession(ios.awaitExpectedResult { getSessionWithCompletion(completion = it) })
+    actual suspend fun getSession(): MultiFactorSession = MultiFactorSession(ios.awaitResult { getSessionWithCompletion(completion = it) })
     actual suspend fun unenroll(multiFactorInfo: MultiFactorInfo) = ios.await { unenrollWithInfo(multiFactorInfo.ios, it) }.run { Unit }
     actual suspend fun unenroll(factorUid: String) = ios.await { unenrollWithFactorUID(factorUid, it) }.run { Unit }
 }
@@ -38,5 +38,5 @@ actual class MultiFactorResolver(val ios: FIRMultiFactorResolver) {
     actual val hints: List<MultiFactorInfo> = ios.hints.mapNotNull { hint -> (hint as? FIRMultiFactorInfo)?.let { MultiFactorInfo(it) } }
     actual val session: MultiFactorSession = MultiFactorSession(ios.session)
 
-    actual suspend fun resolveSignIn(assertion: MultiFactorAssertion): AuthResult = AuthResult(ios.awaitExpectedResult { resolveSignInWithAssertion(assertion.ios, it) })
+    actual suspend fun resolveSignIn(assertion: MultiFactorAssertion): AuthResult = AuthResult(ios.awaitResult { resolveSignInWithAssertion(assertion.ios, it) })
 }

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

@@ -39,18 +39,18 @@ actual class FirebaseUser internal constructor(val ios: FIRUser) {
         ios.awaitResult { getIDTokenForcingRefresh(forceRefresh, it) }
 
     actual suspend fun linkWithCredential(credential: AuthCredential): AuthResult =
-        AuthResult(ios.awaitExpectedResult { linkWithCredential(credential.ios, it) })
+        AuthResult(ios.awaitResult { linkWithCredential(credential.ios, it) })
 
     actual suspend fun reauthenticate(credential: AuthCredential) =
-        ios.awaitExpectedResult { reauthenticateWithCredential(credential.ios, it) }.run { Unit }
+        ios.await { reauthenticateWithCredential(credential.ios, it) }
 
     actual suspend fun reauthenticateAndRetrieveData(credential: AuthCredential): AuthResult =
-        AuthResult(ios.awaitExpectedResult { reauthenticateAndRetrieveDataWithCredential(credential.ios, it) })
+        AuthResult(ios.awaitResult { reauthenticateAndRetrieveDataWithCredential(credential.ios, it) })
 
     actual suspend fun sendEmailVerification(actionCodeSettings: ActionCodeSettings?) = ios.await {
         actionCodeSettings?.let { settings -> sendEmailVerificationWithActionCodeSettings(settings.toIos(), it) }
             ?: sendEmailVerificationWithCompletion(it)
-    }.run { Unit }
+    }
 
     actual suspend fun unlink(provider: String): FirebaseUser? {
         val user: FIRUser? = ios.awaitResult { unlinkFromProvider(provider, it) }

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

@@ -175,9 +175,9 @@ actual class DatabaseException(message: String) : RuntimeException(message)
 private suspend fun <T, R> T.awaitResult(whileOnline: Boolean, function: T.(callback: (NSError?, R?) -> Unit) -> Unit): R {
     val job = CompletableDeferred<R>()
     function { error, result ->
-        if(result != null) {
+        if(error == null) {
             job.complete(result)
-        } else if(error != null) {
+        } else {
             job.completeExceptionally(DatabaseException(error.toString()))
         }
     }

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

@@ -70,9 +70,9 @@ private suspend fun <T> T.await(function: T.(callback: (NSError?) -> Unit) -> Un
 suspend fun <T, R> T.awaitResult(function: T.(callback: (R?, NSError?) -> Unit) -> Unit): R {
     val job = CompletableDeferred<R>()
     function { result, error ->
-        if(result != null) {
+        if(error == null) {
             job.complete(result)
-        } else if(error != null) {
+        } else {
             job.completeExceptionally(FirebaseFunctionsException(error.toString()))
         }
     }