Skip to content

Commit 9f3a1b8

Browse files
committed
fix DuplicateTaskCompletionException
1 parent 993fc3a commit 9f3a1b8

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

gradle.properties

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

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

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class UrlFactory(
5353
}
5454

5555
@Serializable
56-
class FirebaseUserImpl internal constructor(
56+
data class FirebaseUserImpl internal constructor(
5757
@Transient
5858
private val app: FirebaseApp = FirebaseApp.getInstance(),
5959
override val isAnonymous: Boolean,
@@ -414,23 +414,13 @@ class FirebaseAuth constructor(
414414
response.body()?.use { it.string() } ?: ""
415415
).jsonObject
416416

417-
user?.let { prev ->
418-
user =
419-
FirebaseUserImpl(
420-
app = app,
421-
isAnonymous = prev.isAnonymous,
422-
uid = prev.uid,
423-
idToken = prev.idToken,
424-
refreshToken = prev.refreshToken,
425-
expiresIn = prev.expiresIn,
426-
createdAt = newBody["createdAt"]?.jsonPrimitive?.longOrNull ?: prev.createdAt,
427-
email = newBody["email"]?.jsonPrimitive?.contentOrNull ?: prev.email,
428-
photoUrl = newBody["photoUrl"]?.jsonPrimitive?.contentOrNull ?: prev.photoUrl,
429-
displayName = newBody["displayName"]?.jsonPrimitive?.contentOrNull ?: prev.displayName
430-
)
431-
source.setResult(AuthResult { user })
432-
}
433-
source.setResult(null)
417+
user = user?.copy(
418+
createdAt = newBody["createdAt"]?.jsonPrimitive?.longOrNull ?: user!!.createdAt,
419+
email = newBody["email"]?.jsonPrimitive?.contentOrNull ?: user!!.email,
420+
photoUrl = newBody["photoUrl"]?.jsonPrimitive?.contentOrNull ?: user!!.photoUrl,
421+
displayName = newBody["displayName"]?.jsonPrimitive?.contentOrNull ?: user!!.displayName
422+
)
423+
source.setResult(AuthResult { user })
434424
}
435425
}
436426
}

0 commit comments

Comments
 (0)