Skip to content

Commit

Permalink
Revert formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
shepeliev committed Jun 12, 2022
1 parent 9e4422e commit bd371ed
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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)
}
Expand All @@ -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))
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,12 @@ import dev.gitlive.firebase.externals.auth.MultiFactorSession as JsMultiFactorSe
actual class MultiFactor(val js: MultiFactorUser) {
actual val enrolledFactors: List<MultiFactorInfo>
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() }
}
Expand Down Expand Up @@ -48,7 +44,5 @@ actual class MultiFactorResolver(val js: JsMultiFactorResolver) {
actual val hints: List<MultiFactorInfo> = 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()) }
}
36 changes: 9 additions & 27 deletions firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/user.kt
Original file line number Diff line number Diff line change
Expand Up @@ -30,46 +30,28 @@ 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
override val photoURL: String? = photoUrl
}
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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() } } }
Expand Down

0 comments on commit bd371ed

Please sign in to comment.