diff --git a/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt index 85dc7ac50..ac8c42698 100644 --- a/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt +++ b/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt @@ -11,7 +11,7 @@ import kotlin.js.json import dev.gitlive.firebase.externals.app.FirebaseApp as JsFirebaseApp actual val Firebase.app: FirebaseApp -get() = FirebaseApp(getApp()) + get() = FirebaseApp(getApp()) actual fun Firebase.app(name: String): FirebaseApp = FirebaseApp(getApp(name)) diff --git a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/credentials.kt b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/credentials.kt index 9b719a716..9715b567b 100644 --- a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/credentials.kt +++ b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/credentials.kt @@ -62,14 +62,8 @@ actual class OAuthProvider(val js: JsOAuthProvider) { js.setCustomParameters(customParameters) } } - actual companion object { - actual fun credential( - providerId: String, - accessToken: String?, - idToken: String?, - rawNonce: String? - ): OAuthCredential = rethrow { + actual fun credential(providerId: String, accessToken: String?, idToken: String?, rawNonce: String?): OAuthCredential = rethrow { JsOAuthProvider(providerId) .credential( json( @@ -88,15 +82,9 @@ actual class PhoneAuthProvider(val js: PhoneAuthProvider) { actual constructor(auth: FirebaseAuth) : this(PhoneAuthProvider(auth.js)) - actual fun credential(verificationId: String, smsCode: String): PhoneAuthCredential = - PhoneAuthCredential(PhoneAuthProvider.credential(verificationId, smsCode)) - - actual suspend fun verifyPhoneNumber( - phoneNumber: String, - verificationProvider: PhoneVerificationProvider - ): AuthCredential = rethrow { - val verificationId = - js.verifyPhoneNumber(phoneNumber, verificationProvider.verifier).await() + actual fun credential(verificationId: String, smsCode: String): PhoneAuthCredential = PhoneAuthCredential(PhoneAuthProvider.credential(verificationId, smsCode)) + actual suspend fun verifyPhoneNumber(phoneNumber: String, verificationProvider: PhoneVerificationProvider): AuthCredential = rethrow { + val verificationId = js.verifyPhoneNumber(phoneNumber, verificationProvider.verifier).await() val verificationCode = verificationProvider.getVerificationCode(verificationId) credential(verificationId, verificationCode) } @@ -108,6 +96,5 @@ actual interface PhoneVerificationProvider { } actual object TwitterAuthProvider { - actual fun credential(token: String, secret: String): AuthCredential = - AuthCredential(TwitterAuthProvider.credential(token, secret)) + actual fun credential(token: String, secret: String): AuthCredential = AuthCredential(TwitterAuthProvider.credential(token, secret)) } diff --git a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/multifactor.kt b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/multifactor.kt index 45b1291d5..703ab09c0 100644 --- a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/multifactor.kt +++ b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/multifactor.kt @@ -11,16 +11,12 @@ import dev.gitlive.firebase.externals.auth.MultiFactorSession as JsMultiFactorSe actual class MultiFactor(val js: MultiFactorUser) { actual val enrolledFactors: List get() = rethrow { js.enrolledFactors.map { MultiFactorInfo(it) } } - actual suspend fun enroll(multiFactorAssertion: MultiFactorAssertion, displayName: String?) = rethrow { js.enroll(multiFactorAssertion.js, displayName).await() } - actual suspend fun getSession(): MultiFactorSession = rethrow { MultiFactorSession(js.getSession().await()) } - actual suspend fun unenroll(multiFactorInfo: MultiFactorInfo) = rethrow { js.unenroll(multiFactorInfo.js).await() } - actual suspend fun unenroll(factorUid: String) = rethrow { js.unenroll(factorUid).await() } } @@ -48,7 +44,5 @@ actual class MultiFactorResolver(val js: JsMultiFactorResolver) { actual val hints: List = rethrow { js.hints.map { MultiFactorInfo(it) } } actual val session: MultiFactorSession = rethrow { MultiFactorSession(js.session) } - actual suspend fun resolveSignIn(assertion: MultiFactorAssertion): AuthResult = rethrow { - AuthResult(js.resolveSignIn(assertion.js).await()) - } + actual suspend fun resolveSignIn(assertion: MultiFactorAssertion): AuthResult = rethrow { AuthResult(js.resolveSignIn(assertion.js).await()) } } diff --git a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/user.kt b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/user.kt index 38bf58322..9432ae9f5 100644 --- a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/user.kt +++ b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/user.kt @@ -30,35 +30,20 @@ actual class FirebaseUser internal constructor(val js: User) { get() = rethrow { js.providerId } actual suspend fun delete() = rethrow { js.delete().await() } actual suspend fun reload() = rethrow { js.reload().await() } - actual suspend fun getIdToken(forceRefresh: Boolean): String? = rethrow { - js.getIdToken(forceRefresh).await() - } - actual suspend fun getIdTokenResult(forceRefresh: Boolean): AuthTokenResult = rethrow { - AuthTokenResult(getIdTokenResult(js, forceRefresh).await()) - } - actual suspend fun linkWithCredential(credential: AuthCredential): AuthResult = rethrow { - AuthResult( linkWithCredential(js, credential.js).await()) - } + actual suspend fun getIdToken(forceRefresh: Boolean): String? = rethrow { js.getIdToken(forceRefresh).await() } + actual suspend fun getIdTokenResult(forceRefresh: Boolean): AuthTokenResult = rethrow { AuthTokenResult(getIdTokenResult(js, forceRefresh).await()) } + actual suspend fun linkWithCredential(credential: AuthCredential): AuthResult = rethrow { AuthResult( linkWithCredential(js, credential.js).await()) } actual suspend fun reauthenticate(credential: AuthCredential) = rethrow { reauthenticateWithCredential(js, credential.js).await() Unit } - actual suspend fun reauthenticateAndRetrieveData(credential: AuthCredential): AuthResult = - rethrow { AuthResult(reauthenticateWithCredential(js, credential.js).await()) } + actual suspend fun reauthenticateAndRetrieveData(credential: AuthCredential): AuthResult = rethrow { AuthResult(reauthenticateWithCredential(js, credential.js).await()) } - actual suspend fun sendEmailVerification(actionCodeSettings: ActionCodeSettings?) = rethrow { - sendEmailVerification(js, actionCodeSettings?.toJson()).await() - } - actual suspend fun unlink(provider: String): FirebaseUser? = rethrow { - FirebaseUser(unlink(js, provider).await()) - } + actual suspend fun sendEmailVerification(actionCodeSettings: ActionCodeSettings?) = rethrow { sendEmailVerification(js, actionCodeSettings?.toJson()).await() } + actual suspend fun unlink(provider: String): FirebaseUser? = rethrow { FirebaseUser(unlink(js, provider).await()) } actual suspend fun updateEmail(email: String) = rethrow { updateEmail(js, email).await() } - actual suspend fun updatePassword(password: String) = rethrow { - updatePassword(js, password).await() - } - actual suspend fun updatePhoneNumber(credential: PhoneAuthCredential) = rethrow { - updatePhoneNumber(js, credential.js).await() - } + actual suspend fun updatePassword(password: String) = rethrow { updatePassword(js, password).await() } + actual suspend fun updatePhoneNumber(credential: PhoneAuthCredential) = rethrow { updatePhoneNumber(js, credential.js).await() } actual suspend fun updateProfile(displayName: String?, photoUrl: String?) = rethrow { val request = object : ProfileUpdateRequest { override val displayName: String? = displayName @@ -66,10 +51,7 @@ actual class FirebaseUser internal constructor(val js: User) { } updateProfile(js, request).await() } - actual suspend fun verifyBeforeUpdateEmail( - newEmail: String, - actionCodeSettings: ActionCodeSettings? - ) = rethrow { verifyBeforeUpdateEmail(js, newEmail, actionCodeSettings?.toJson()).await() } + actual suspend fun verifyBeforeUpdateEmail(newEmail: String, actionCodeSettings: ActionCodeSettings?) = rethrow { verifyBeforeUpdateEmail(js, newEmail, actionCodeSettings?.toJson()).await() } } actual class UserInfo(val js: JsUserInfo) { diff --git a/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt index d86b9a2cd..56b481d57 100644 --- a/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt +++ b/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt @@ -99,7 +99,6 @@ actual open class Query internal constructor(open val js: JsQuery) { ChildEvent.Type.MOVED -> onChildMoved(js, callback, cancelCallback) ChildEvent.Type.REMOVED -> onChildRemoved(js, callback, cancelCallback) } - } } awaitClose { rethrow { unsubscribes.forEach { it.invoke() } } }