Skip to content

Commit bffad78

Browse files
committed
Merge branch 'signup_new_user' of https://github.com/JacobCube/firebase-java-sdk into signup_new_user
2 parents d496798 + ab943b6 commit bffad78

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ class FirebaseUserImpl private constructor(
6060
app: FirebaseApp,
6161
data: JsonObject,
6262
isAnonymous: Boolean = data["isAnonymous"]?.jsonPrimitive?.booleanOrNull ?: false,
63-
email: String = data.getOrElse("email"){ null }?.jsonPrimitive?.contentOrNull ?: ""
64-
): this(
63+
email: String = data.getOrElse("email") { null }?.jsonPrimitive?.contentOrNull ?: ""
64+
) : this(
6565
app = app,
6666
isAnonymous = isAnonymous,
6767
uid = data["uid"]?.jsonPrimitive?.contentOrNull ?: data["user_id"]?.jsonPrimitive?.contentOrNull ?: data["localId"]?.jsonPrimitive?.contentOrNull ?: "",

src/test/kotlin/FirebaseAuthTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import org.junit.Test
1313
import java.io.File
1414
import kotlin.random.Random
1515

16-
internal class FirebaseAuthTest: FirebaseTest() {
16+
internal class FirebaseAuthTest : FirebaseTest() {
1717

18-
private lateinit var auth : FirebaseAuth
18+
private lateinit var auth: FirebaseAuth
1919

2020
@Before
2121
fun initialize() {
@@ -48,8 +48,8 @@ internal class FirebaseAuthTest: FirebaseTest() {
4848
"test123"
4949
).await()
5050
assertNotEquals(null, createResult.user?.uid)
51-
//assertEquals(null, createResult.user?.displayName)
52-
//assertEquals(null, createResult.user?.phoneNumber)
51+
// assertEquals(null, createResult.user?.displayName)
52+
// assertEquals(null, createResult.user?.phoneNumber)
5353
assertEquals(false, createResult.user?.isAnonymous)
5454
assertEquals(email, createResult.user?.email)
5555

0 commit comments

Comments
 (0)