Skip to content

Commit 10502b8

Browse files
committed
Merge remote-tracking branch 'origin/tvos' into tvos
2 parents 239632e + 1207287 commit 10502b8

File tree

3 files changed

+34
-41
lines changed
  • firebase-auth/src
  • firebase-functions/src/jsMain/kotlin/dev/gitlive/firebase/functions

3 files changed

+34
-41
lines changed

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,13 @@ public actual class MultiFactor(internal val js: MultiFactorUser) {
1414
public actual val enrolledFactors: List<MultiFactorInfo>
1515
get() = rethrow { js.enrolledFactors.map { MultiFactorInfo(it) } }
1616

17-
public actual suspend fun enroll(multiFactorAssertion: MultiFactorAssertion, displayName: String?): Unit =
18-
rethrow { js.enroll(multiFactorAssertion.js, displayName).await() }
17+
public actual suspend fun enroll(multiFactorAssertion: MultiFactorAssertion, displayName: String?): Unit = rethrow { js.enroll(multiFactorAssertion.js, displayName).await() }
1918

20-
public actual suspend fun getSession(): MultiFactorSession =
21-
rethrow { MultiFactorSession(js.getSession().await()) }
19+
public actual suspend fun getSession(): MultiFactorSession = rethrow { MultiFactorSession(js.getSession().await()) }
2220

23-
public actual suspend fun unenroll(multiFactorInfo: MultiFactorInfo): Unit =
24-
rethrow { js.unenroll(multiFactorInfo.js).await() }
21+
public actual suspend fun unenroll(multiFactorInfo: MultiFactorInfo): Unit = rethrow { js.unenroll(multiFactorInfo.js).await() }
2522

26-
public actual suspend fun unenroll(factorUid: String): Unit =
27-
rethrow { js.unenroll(factorUid).await() }
23+
public actual suspend fun unenroll(factorUid: String): Unit = rethrow { js.unenroll(factorUid).await() }
2824
}
2925

3026
public val MultiFactorInfo.js: JsMultiFactorInfo get() = js
@@ -58,6 +54,5 @@ public actual class MultiFactorResolver(internal val js: JsMultiFactorResolver)
5854
public actual val hints: List<MultiFactorInfo> = rethrow { js.hints.map { MultiFactorInfo(it) } }
5955
public actual val session: MultiFactorSession = rethrow { MultiFactorSession(js.session) }
6056

61-
public actual suspend fun resolveSignIn(assertion: MultiFactorAssertion): AuthResult =
62-
rethrow { AuthResult(js.resolveSignIn(assertion.js).await()) }
57+
public actual suspend fun resolveSignIn(assertion: MultiFactorAssertion): AuthResult = rethrow { AuthResult(js.resolveSignIn(assertion.js).await()) }
6358
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ import kotlinx.coroutines.tasks.await
2121
public actual val Firebase.auth: FirebaseAuth
2222
get() = FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance())
2323

24-
public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth =
25-
FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance(app.publicAndroid))
24+
public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance(app.publicAndroid))
2625

2726
public actual class FirebaseAuth internal constructor(internal val android: com.google.firebase.auth.FirebaseAuth) {
2827
public actual val currentUser: FirebaseUser?

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

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ public actual fun Firebase.functions(app: FirebaseApp, region: String): Firebase
2929
public val FirebaseFunctions.js: Functions get() = js
3030

3131
public actual class FirebaseFunctions internal constructor(internal val js: Functions) {
32-
public actual fun httpsCallable(name: String, timeout: Duration?): HttpsCallableReference =
33-
rethrow {
34-
HttpsCallableReference(
35-
httpsCallable(
36-
js,
37-
name,
38-
timeout?.let { json("timeout" to timeout.toDouble(DurationUnit.MILLISECONDS)) }).native
39-
)
40-
}
32+
public actual fun httpsCallable(name: String, timeout: Duration?): HttpsCallableReference = rethrow {
33+
HttpsCallableReference(
34+
httpsCallable(
35+
js,
36+
name,
37+
timeout?.let { json("timeout" to timeout.toDouble(DurationUnit.MILLISECONDS)) },
38+
).native,
39+
)
40+
}
4141

4242
public actual fun useEmulator(host: String, port: Int) {
4343
connectFunctionsEmulator(js, host, port)
@@ -66,15 +66,14 @@ public actual class HttpsCallableResult(internal val js: JsHttpsCallableResult)
6666

6767
public actual inline fun <T> data(
6868
strategy: DeserializationStrategy<T>,
69-
buildSettings: DecodeSettings.Builder.() -> Unit
70-
): T =
71-
rethrow { decode(strategy, publicJs.data, buildSettings) }
69+
buildSettings: DecodeSettings.Builder.() -> Unit,
70+
): T = rethrow { decode(strategy, publicJs.data, buildSettings) }
7271
}
7372

7473
public actual class FirebaseFunctionsException(
7574
cause: Throwable,
7675
public val code: FunctionsExceptionCode,
77-
public val details: Any?
76+
public val details: Any?,
7877
) : FirebaseException(cause.message, cause)
7978

8079
public actual val FirebaseFunctionsException.code: FunctionsExceptionCode get() = code
@@ -124,97 +123,97 @@ internal fun errorToException(e: dynamic): FirebaseFunctionsException = (e?.code
124123
"cancelled" in it -> FirebaseFunctionsException(
125124
e.unsafeCast<Throwable>(),
126125
FunctionsExceptionCode.CANCELLED,
127-
e.details
126+
e.details,
128127
)
129128

130129
"invalid-argument" in it -> FirebaseFunctionsException(
131130
e.unsafeCast<Throwable>(),
132131
FunctionsExceptionCode.INVALID_ARGUMENT,
133-
e.details
132+
e.details,
134133
)
135134

136135
"deadline-exceeded" in it -> FirebaseFunctionsException(
137136
e.unsafeCast<Throwable>(),
138137
FunctionsExceptionCode.DEADLINE_EXCEEDED,
139-
e.details
138+
e.details,
140139
)
141140

142141
"not-found" in it -> FirebaseFunctionsException(
143142
e.unsafeCast<Throwable>(),
144143
FunctionsExceptionCode.NOT_FOUND,
145-
e.details
144+
e.details,
146145
)
147146

148147
"already-exists" in it -> FirebaseFunctionsException(
149148
e.unsafeCast<Throwable>(),
150149
FunctionsExceptionCode.ALREADY_EXISTS,
151-
e.details
150+
e.details,
152151
)
153152

154153
"permission-denied" in it -> FirebaseFunctionsException(
155154
e.unsafeCast<Throwable>(),
156155
FunctionsExceptionCode.PERMISSION_DENIED,
157-
e.details
156+
e.details,
158157
)
159158

160159
"resource-exhausted" in it -> FirebaseFunctionsException(
161160
e.unsafeCast<Throwable>(),
162161
FunctionsExceptionCode.RESOURCE_EXHAUSTED,
163-
e.details
162+
e.details,
164163
)
165164

166165
"failed-precondition" in it -> FirebaseFunctionsException(
167166
e.unsafeCast<Throwable>(),
168167
FunctionsExceptionCode.FAILED_PRECONDITION,
169-
e.details
168+
e.details,
170169
)
171170

172171
"aborted" in it -> FirebaseFunctionsException(
173172
e.unsafeCast<Throwable>(),
174173
FunctionsExceptionCode.ABORTED,
175-
e.details
174+
e.details,
176175
)
177176

178177
"out-of-range" in it -> FirebaseFunctionsException(
179178
e.unsafeCast<Throwable>(),
180179
FunctionsExceptionCode.OUT_OF_RANGE,
181-
e.details
180+
e.details,
182181
)
183182

184183
"unimplemented" in it -> FirebaseFunctionsException(
185184
e.unsafeCast<Throwable>(),
186185
FunctionsExceptionCode.UNIMPLEMENTED,
187-
e.details
186+
e.details,
188187
)
189188

190189
"internal" in it -> FirebaseFunctionsException(
191190
e.unsafeCast<Throwable>(),
192191
FunctionsExceptionCode.INTERNAL,
193-
e.details
192+
e.details,
194193
)
195194

196195
"unavailable" in it -> FirebaseFunctionsException(
197196
e.unsafeCast<Throwable>(),
198197
FunctionsExceptionCode.UNAVAILABLE,
199-
e.details
198+
e.details,
200199
)
201200

202201
"data-loss" in it -> FirebaseFunctionsException(
203202
e.unsafeCast<Throwable>(),
204203
FunctionsExceptionCode.DATA_LOSS,
205-
e.details
204+
e.details,
206205
)
207206

208207
"unauthenticated" in it -> FirebaseFunctionsException(
209208
e.unsafeCast<Throwable>(),
210209
FunctionsExceptionCode.UNAUTHENTICATED,
211-
e.details
210+
e.details,
212211
)
213212

214213
"unknown" in it -> FirebaseFunctionsException(
215214
e.unsafeCast<Throwable>(),
216215
FunctionsExceptionCode.UNKNOWN,
217-
e.details
216+
e.details,
218217
)
219218

220219
else -> {

0 commit comments

Comments
 (0)