Merge remote-tracking branch 'GitLiveApp/master' into gitlive/kotlin-1.8.21-gradle-8

Author: Daeda88

firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/user.kt

@@ -8,16 +8,16 @@ import android.net.Uri
 import com.google.firebase.auth.UserProfileChangeRequest
 import kotlinx.coroutines.tasks.await
 
-actual class FirebaseUser internal constructor(val android: com.google.firebase.auth.FirebaseUser) : FirebaseUserProfile {
+actual class FirebaseUser internal constructor(val android: com.google.firebase.auth.FirebaseUser) {
     actual val uid: String
         get() = android.uid
-    override val displayName: String?
+    actual val displayName: String?
         get() = android.displayName
     actual val email: String?
         get() = android.email
     actual val phoneNumber: String?
         get() = android.phoneNumber
-    override val photoURL: String?
+    actual val photoURL: String?
         get() = android.photoUrl?.toString()
     actual val isAnonymous: Boolean
         get() = android.isAnonymous
@@ -46,10 +46,10 @@ actual class FirebaseUser internal constructor(val android: com.google.firebase.
     actual suspend fun updateEmail(email: String) = android.updateEmail(email).await().run { Unit }
     actual suspend fun updatePassword(password: String) = android.updatePassword(password).await().run { Unit }
     actual suspend fun updatePhoneNumber(credential: PhoneAuthCredential) = android.updatePhoneNumber(credential.android).await().run { Unit }
-    override suspend fun updateProfile(displayName: String?, photoUrl: String?) {
+    actual suspend fun updateProfile(displayName: String?, photoUrl: String?) {
         val request = UserProfileChangeRequest.Builder()
-            .setDisplayName(displayName)
-            .setPhotoUri(photoUrl?.let { Uri.parse(it) })
+            .apply { if(displayName !== UNCHANGED) setDisplayName(displayName) }
+            .apply { if(photoUrl !== UNCHANGED) setPhotoUri(photoUrl?.let { Uri.parse(it) }) }
             .build()
         android.updateProfile(request).await()
     }

firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/user.kt

@@ -4,17 +4,15 @@
 
 package dev.gitlive.firebase.auth
 
-// Javascript IR compilation has issues with referencing to actual values as default parameters, so we should use an interface instead
-interface FirebaseUserProfile {
-    val displayName: String?
-    val photoURL: String?
-    suspend fun updateProfile(displayName: String? = this.displayName, photoUrl: String? = this.photoURL)
-}
+//workaround for https://youtrack.jetbrains.com/issue/KT-48836
+internal val UNCHANGED = ""
 
-expect class FirebaseUser : FirebaseUserProfile {
+expect class FirebaseUser {
     val uid: String
+    val displayName: String?
     val email: String?
     val phoneNumber: String?
+    val photoURL: String?
     val isAnonymous: Boolean
     val isEmailVerified: Boolean
     val metaData: UserMetaData?
@@ -33,6 +31,7 @@ expect class FirebaseUser : FirebaseUserProfile {
     suspend fun updateEmail(email: String)
     suspend fun updatePassword(password: String)
     suspend fun updatePhoneNumber(credential: PhoneAuthCredential)
+    suspend fun updateProfile(displayName: String? = UNCHANGED, photoUrl: String? = UNCHANGED)
     suspend fun verifyBeforeUpdateEmail(newEmail: String, actionCodeSettings: ActionCodeSettings? = null)
 }
 

firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/user.kt

@@ -4,19 +4,22 @@
 
 package dev.gitlive.firebase.auth
 
-import cocoapods.FirebaseAuth.*
+import cocoapods.FirebaseAuth.FIRAuthDataResult
+import cocoapods.FirebaseAuth.FIRUser
+import cocoapods.FirebaseAuth.FIRUserInfoProtocol
+import cocoapods.FirebaseAuth.FIRUserMetadata
 import platform.Foundation.NSURL
 
-actual class FirebaseUser internal constructor(val ios: FIRUser) : FirebaseUserProfile {
+actual class FirebaseUser internal constructor(val ios: FIRUser) {
     actual val uid: String
         get() = ios.uid
-    override val displayName: String?
+    actual val displayName: String?
         get() = ios.displayName
     actual val email: String?
         get() = ios.email
     actual val phoneNumber: String?
         get() = ios.phoneNumber
-    override val photoURL: String?
+    actual val photoURL: String?
         get() = ios.photoURL?.absoluteString
     actual val isAnonymous: Boolean
         get() = ios.anonymous
@@ -64,11 +67,10 @@ actual class FirebaseUser internal constructor(val ios: FIRUser) : FirebaseUserP
     actual suspend fun updateEmail(email: String) = ios.await { updateEmail(email, it) }.run { Unit }
     actual suspend fun updatePassword(password: String) = ios.await { updatePassword(password, it) }.run { Unit }
     actual suspend fun updatePhoneNumber(credential: PhoneAuthCredential) = ios.await { updatePhoneNumberCredential(credential.ios, it) }.run { Unit }
-    override suspend fun updateProfile(displayName: String?, photoUrl: String?) {
-        val request = ios.profileChangeRequest().apply {
-            this.displayName = displayName
-            this.photoURL = photoUrl?.let { NSURL.URLWithString(it) }
-        }
+    actual suspend fun updateProfile(displayName: String?, photoUrl: String?) {
+        val request = ios.profileChangeRequest()
+            .apply { if(displayName !== UNCHANGED) setDisplayName(displayName) }
+            .apply { if(photoUrl !== UNCHANGED) setPhotoURL(photoUrl?.let { NSURL.URLWithString(it) }) }
         ios.await { request.commitChangesWithCompletion(it) }
     }
     actual suspend fun verifyBeforeUpdateEmail(newEmail: String, actionCodeSettings: ActionCodeSettings?) = ios.await {

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

@@ -3,17 +3,18 @@ package dev.gitlive.firebase.auth
 import dev.gitlive.firebase.firebase
 import kotlinx.coroutines.await
 import kotlin.js.Date
+import kotlin.js.json
 
-actual class FirebaseUser internal constructor(val js: firebase.user.User) : FirebaseUserProfile {
+actual class FirebaseUser internal constructor(val js: firebase.user.User) {
     actual val uid: String
         get() = rethrow { js.uid }
-    override val displayName: String?
+    actual val displayName: String?
         get() = rethrow { js.displayName }
     actual val email: String?
         get() = rethrow { js.email }
     actual val phoneNumber: String?
         get() = rethrow { js.phoneNumber }
-    override val photoURL: String?
+    actual val photoURL: String?
         get() = rethrow { js.photoURL }
     actual val isAnonymous: Boolean
         get() = rethrow { js.isAnonymous }
@@ -43,12 +44,12 @@ actual class FirebaseUser internal constructor(val js: firebase.user.User) : Fir
     actual suspend fun updateEmail(email: String) = rethrow { js.updateEmail(email).await() }
     actual suspend fun updatePassword(password: String) = rethrow { js.updatePassword(password).await() }
     actual suspend fun updatePhoneNumber(credential: PhoneAuthCredential) = rethrow { js.updatePhoneNumber(credential.js).await() }
-    override suspend fun updateProfile(displayName: String?, photoUrl: String?) = rethrow {
-        val request = object : firebase.user.ProfileUpdateRequest {
-            override val displayName: String? = displayName
-            override val photoURL: String? = photoUrl
-        }
-        js.updateProfile(request).await()
+    actual suspend fun updateProfile(displayName: String?, photoUrl: String?) = rethrow {
+        val request = listOfNotNull(
+            displayName.takeUnless { it === UNCHANGED }?.let { "displayName" to it },
+            photoUrl.takeUnless { it === UNCHANGED }?.let { "photoURL" to it }
+        )
+        js.updateProfile(json(*request.toTypedArray())).await()
     }
     actual suspend fun verifyBeforeUpdateEmail(newEmail: String, actionCodeSettings: ActionCodeSettings?) = rethrow { js.verifyBeforeUpdateEmail(newEmail, actionCodeSettings?.toJson()).await() }
 }

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt

@@ -213,7 +213,7 @@ external object firebase {
             fun updateEmail(newEmail: String): Promise<Unit>
             fun updatePassword(newPassword: String): Promise<Unit>
             fun updatePhoneNumber(phoneCredential: auth.AuthCredential): Promise<Unit>
-            fun updateProfile(profile: ProfileUpdateRequest): Promise<Unit>
+            fun updateProfile(profile: Json): Promise<Unit>
             fun verifyBeforeUpdateEmail(newEmail: String, actionCodeSettings: Any?): Promise<Unit>
         }
 

firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

@@ -88,7 +88,7 @@ private val Any.value get() = when (this) {
     else -> this
 }
 
-fun Query.where(field: String, equalTo: Any?) = _where(field, equalTo,value)
+fun Query.where(field: String, equalTo: Any?) = _where(field, equalTo?.value)
 fun Query.where(path: FieldPath, equalTo: Any?) = _where(path, equalTo?.value)
 fun Query.where(field: String, equalTo: DocumentReference) = _where(field, equalTo.value)
 fun Query.where(path: FieldPath, equalTo: DocumentReference) = _where(path, equalTo.value)