Skip to content

Commit b5e3d0d

Browse files
authored
Merge branch 'master' into signup_new_user
2 parents 9984757 + 7fa762b commit b5e3d0d

File tree

3 files changed

+23
-29
lines changed

3 files changed

+23
-29
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ You can add the library via Gradle:
2525

2626
```kotlin
2727
dependencies {
28-
implementation("dev.gitlive:firebase-java-sdk:0.4.7")
28+
implementation("dev.gitlive:firebase-java-sdk:0.4.8")
2929
}
3030
```
3131

@@ -35,7 +35,7 @@ Or Maven:
3535
<dependency>
3636
<groupId>dev.gitlive</groupId>
3737
<artifactId>firebase-java-sdk</artifactId>
38-
<version>0.4.7</version>
38+
<version>0.4.8</version>
3939
</dependency>
4040
```
4141

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=0.4.7
1+
version=0.4.8

src/main/java/com/google/firebase/auth/FirebaseAuth.kt

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -550,38 +550,32 @@ class FirebaseAuth constructor(
550550
.takeUnless { it.task.isComplete }
551551
?: enqueueRefreshTokenCall(user)
552552
refreshSource.task.addOnSuccessListener { source.setResult(map(it)) }
553-
refreshSource.task.addOnFailureListener { source.setException(FirebaseException(it.toString(), it)) }
553+
refreshSource.task.addOnFailureListener { source.setException(it) }
554554
}
555555

556556
private fun enqueueRefreshTokenCall(user: FirebaseUserImpl): TaskCompletionSource<FirebaseUserImpl> {
557557
val source = TaskCompletionSource<FirebaseUserImpl>()
558-
val body =
559-
RequestBody.create(
560-
json,
561-
JsonObject(
562-
mapOf(
563-
"refresh_token" to JsonPrimitive(user.refreshToken),
564-
"grant_type" to JsonPrimitive("refresh_token"),
565-
),
566-
).toString(),
567-
)
568-
val request =
569-
Request
570-
.Builder()
571-
.url(urlFactory.buildUrl("securetoken.googleapis.com/v1/token"))
572-
.post(body)
573-
.tag(REFRESH_TOKEN_TAG)
574-
.build()
558+
val body = RequestBody.create(
559+
json,
560+
JsonObject(
561+
mapOf(
562+
"refresh_token" to JsonPrimitive(user.refreshToken),
563+
"grant_type" to JsonPrimitive("refresh_token")
564+
)
565+
).toString()
566+
)
567+
val request = Request
568+
.Builder()
569+
.url(urlFactory.buildUrl("securetoken.googleapis.com/v1/token"))
570+
.post(body)
571+
.tag(REFRESH_TOKEN_TAG)
572+
.build()
575573

576-
client.newCall(request).enqueue(
577-
object : Callback {
578-
override fun onFailure(
579-
call: Call,
580-
e: IOException,
581-
) {
582-
source.setException(e)
583-
}
574+
client.newCall(request).enqueue(object : Callback {
584575

576+
override fun onFailure(call: Call, e: IOException) {
577+
source.setException(FirebaseException(e.toString(), e))
578+
}
585579
@Throws(IOException::class)
586580
override fun onResponse(
587581
call: Call,

0 commit comments

Comments
 (0)