Merge branch 'master' into avdyushin/feature/where-for-document-reference

avdyushin · web-flow · commit 40f0a647bc10 · 2021-02-17T08:15:22.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.0.2")
+        classpath("com.android.tools.build:gradle:4.1.1")
         classpath("de.undercouch:gradle-download-task:4.1.1")
         classpath("com.adarshr:gradle-test-logger-plugin:2.0.0")
     }
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -68,7 +68,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-common:19.4.0")
+                api("com.google.firebase:firebase-common:19.5.0")
             }
         }
 
diff --git a/firebase-app/package.json b/firebase-app/package.json
@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-common": "1.1.0",
-    "firebase": "8.2.0",
+    "@gitlive/firebase-common": "1.2.0",
+    "firebase": "8.2.3",
     "kotlin": "1.4.21",
     "kotlinx-coroutines-core": "1.4.2"
   }
diff --git a/firebase-app/src/iosMain/c_interop/Cartfile b/firebase-app/src/iosMain/c_interop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 7.3.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 7.4.0
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -102,7 +102,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-auth:20.0.1")
+                api("com.google.firebase:firebase-auth:20.0.2")
             }
         }
 
diff --git a/firebase-auth/package.json b/firebase-auth/package.json
@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.1.0",
-    "firebase": "8.2.0",
+    "@gitlive/firebase-app": "1.2.0",
+    "firebase": "8.2.3",
     "kotlin": "1.4.21",
     "kotlinx-coroutines-core": "1.4.2"
   }
diff --git a/firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -111,6 +111,21 @@ actual class AuthResult internal constructor(val android: com.google.firebase.au
         get() = android.user?.let { FirebaseUser(it) }
 }
 
+actual class AuthTokenResult(val android: com.google.firebase.auth.GetTokenResult) {
+//    actual val authTimestamp: Long
+//        get() = android.authTimestamp
+    actual val claims: Map<String, Any>
+        get() = android.claims
+//    actual val expirationTimestamp: Long
+//        get() = android.expirationTimestamp
+//    actual val issuedAtTimestamp: Long
+//        get() = android.issuedAtTimestamp
+    actual val signInProvider: String?
+        get() = android.signInProvider
+    actual val token: String?
+        get() = android.token
+}
+
 internal fun ActionCodeSettings.toAndroid() = com.google.firebase.auth.ActionCodeSettings.newBuilder()
     .setUrl(url)
     .also { androidPackageName?.run { it.setAndroidPackageName(packageName, installIfNotAvailable, minimumVersion) } }
diff --git a/firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/user.kt b/firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/user.kt
@@ -33,7 +33,8 @@ actual class FirebaseUser internal constructor(val android: com.google.firebase.
         get() = android.providerId
     actual suspend fun delete() = android.delete().await().run { Unit }
     actual suspend fun reload() = android.reload().await().run { Unit }
-    actual suspend fun getIdToken(forceRefresh: Boolean) = android.getIdToken(forceRefresh).await().token
+    actual suspend fun getIdToken(forceRefresh: Boolean): String? = android.getIdToken(forceRefresh).await().token
+    actual suspend fun getIdTokenResult(forceRefresh: Boolean): AuthTokenResult = android.getIdToken(forceRefresh).await().run { AuthTokenResult(this) }
     actual suspend fun linkWithCredential(credential: AuthCredential): AuthResult = AuthResult(android.linkWithCredential(credential.android).await())
     actual suspend fun reauthenticate(credential: AuthCredential) = android.reauthenticate(credential.android).await().run { Unit }
     actual suspend fun reauthenticateAndRetrieveData(credential: AuthCredential): AuthResult = AuthResult(android.reauthenticateAndRetrieveData(credential.android).await())
diff --git a/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -41,6 +41,15 @@ expect class AuthResult {
     val user: FirebaseUser?
 }
 
+expect class AuthTokenResult {
+//    val authTimestamp: Long
+    val claims: Map<String, Any>
+//    val expirationTimestamp: Long
+//    val issuedAtTimestamp: Long
+    val signInProvider: String?
+    val token: String?
+}
+
 sealed class ActionCodeResult {
     object SignInWithEmailLink : ActionCodeResult()
     class PasswordReset internal constructor(val email: String) : ActionCodeResult()
diff --git a/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/user.kt b/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/user.kt
@@ -19,6 +19,7 @@ expect class FirebaseUser {
     suspend fun delete()
     suspend fun reload()
     suspend fun getIdToken(forceRefresh: Boolean): String?
+    suspend fun getIdTokenResult(forceRefresh: Boolean): AuthTokenResult
     suspend fun linkWithCredential(credential: AuthCredential): AuthResult
     suspend fun reauthenticate(credential: AuthCredential)
     suspend fun reauthenticateAndRetrieveData(credential: AuthCredential): AuthResult
diff --git a/firebase-auth/src/iosMain/c_interop/Cartfile b/firebase-auth/src/iosMain/c_interop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 7.3.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 7.4.0
diff --git a/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -98,6 +98,21 @@ actual class AuthResult internal constructor(val ios: FIRAuthDataResult) {
         get() = FirebaseUser(ios.user)
 }
 
+actual class AuthTokenResult(val ios: FIRAuthTokenResult) {
+//    actual val authTimestamp: Long
+//        get() = ios.authDate
+    actual val claims: Map<String, Any>
+        get() = ios.claims.map { it.key.toString() to it.value as Any }.toMap()
+//    actual val expirationTimestamp: Long
+//        get() = ios.expirationDate
+//    actual val issuedAtTimestamp: Long
+//        get() = ios.issuedAtDate
+    actual val signInProvider: String?
+        get() = ios.signInProvider
+    actual val token: String?
+        get() = ios.token
+}
+
 internal fun ActionCodeSettings.toIos() = FIRActionCodeSettings().also {
     it.URL =  NSURL.URLWithString(url)
     androidPackageName?.run { it.setAndroidPackageName(packageName, installIfNotAvailable, minimumVersion) }
diff --git a/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/user.kt b/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/user.kt
@@ -38,6 +38,9 @@ actual class FirebaseUser internal constructor(val ios: FIRUser) {
     actual suspend fun getIdToken(forceRefresh: Boolean): String? =
         ios.awaitResult { getIDTokenForcingRefresh(forceRefresh, it) }
 
+    actual suspend fun getIdTokenResult(forceRefresh: Boolean): AuthTokenResult =
+        AuthTokenResult(ios.awaitResult { getIDTokenResultForcingRefresh(forceRefresh, it) })
+
     actual suspend fun linkWithCredential(credential: AuthCredential): AuthResult =
         AuthResult(ios.awaitResult { linkWithCredential(credential.ios, it) })
 
diff --git a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -101,6 +101,23 @@ actual class AuthResult internal constructor(val js: firebase.auth.AuthResult) {
         get() = rethrow { js.user?.let { FirebaseUser(it) } }
 }
 
+actual class AuthTokenResult(val js: firebase.auth.IdTokenResult) {
+//    actual val authTimestamp: Long
+//        get() = js.authTime
+    actual val claims: Map<String, Any>
+        get() = (js("Object").keys(js.claims) as Array<String>).mapNotNull {
+                key -> js.claims[key]?.let { key to it }
+        }.toMap()
+//    actual val expirationTimestamp: Long
+//        get() = android.expirationTime
+//    actual val issuedAtTimestamp: Long
+//        get() = js.issuedAtTime
+    actual val signInProvider: String?
+        get() = js.signInProvider
+    actual val token: String?
+        get() = js.token
+}
+
 internal fun ActionCodeSettings.toJson() = json(
     "android" to (androidPackageName?.run { json("installApp" to installIfNotAvailable, "minimumVersion" to minimumVersion, "packageName" to packageName) } ?: undefined),
     "dynamicLinkDomain" to (dynamicLinkDomain ?: undefined),
diff --git a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/user.kt b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/user.kt
@@ -30,6 +30,7 @@ actual class FirebaseUser internal constructor(val js: firebase.user.User) {
     actual suspend fun delete() = rethrow { js.delete().await() }
     actual suspend fun reload() = rethrow { js.reload().await() }
     actual suspend fun getIdToken(forceRefresh: Boolean): String? = rethrow { js.getIdToken(forceRefresh).await() }
+    actual suspend fun getIdTokenResult(forceRefresh: Boolean): AuthTokenResult = rethrow { AuthTokenResult(js.getIdTokenResult(forceRefresh).await()) }
     actual suspend fun linkWithCredential(credential: AuthCredential): AuthResult = rethrow { AuthResult(js.linkWithCredential(credential.js).await()) }
     actual suspend fun reauthenticate(credential: AuthCredential) = rethrow {
         js.reauthenticateWithCredential(credential.js).await()
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -68,7 +68,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-common:19.4.0")
+                api("com.google.firebase:firebase-common:19.5.0")
             }
         }
         val jsMain by getting {
diff --git a/firebase-common/package.json b/firebase-common/package.json
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "firebase": "8.2.0",
+    "firebase": "8.2.3",
     "kotlin": "1.4.21",
     "kotlinx-coroutines-core": "1.4.2",
     "kotlinx-serialization-kotlinx-serialization-runtime": "1.0.1"
diff --git a/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt b/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt
@@ -68,6 +68,17 @@ external object firebase {
             fun onAuthStateChanged(nextOrObserver: (user.User?) -> Unit): () -> Unit
             fun onIdTokenChanged(nextOrObserver: (user.User?) -> Unit): () -> Unit
         }
+
+        abstract class IdTokenResult {
+            val authTime: String
+            val claims: Json
+            val expirationTime: String
+            val issuedAtTime: String
+            val signInProvider: String?
+            val signInSecondFactor: String?
+            val token: String
+        }
+
         abstract class AuthResult {
             val credential: AuthCredential?
             val operationType: String?
@@ -187,6 +198,7 @@ external object firebase {
 
             fun delete(): Promise<Unit>
             fun getIdToken(forceRefresh: Boolean?): Promise<String>
+            fun getIdTokenResult(forceRefresh: Boolean?): Promise<auth.IdTokenResult>
             fun linkWithCredential(credential: auth.AuthCredential): Promise<auth.AuthResult>
             fun reauthenticateWithCredential(credential: auth.AuthCredential): Promise<auth.AuthResult>
             fun reload(): Promise<Unit>
@@ -339,11 +351,14 @@ external object firebase {
             fun <T> runTransaction(func: (transaction: Transaction) -> Promise<T>): Promise<T>
             fun batch(): WriteBatch
             fun collection(collectionPath: String): CollectionReference
+            fun collectionGroup(collectionId: String): Query
             fun doc(documentPath: String): DocumentReference
             fun settings(settings: Json)
             fun enablePersistence(): Promise<Unit>
             fun clearPersistence(): Promise<Unit>
             fun useEmulator(host: String, port: Int)
+            fun disableNetwork(): Promise<Unit>
+            fun enableNetwork(): Promise<Unit>
         }
 
         open class Timestamp {
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -76,7 +76,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-database:19.5.1")
+                api("com.google.firebase:firebase-database:19.6.0")
             }
         }
         val jsMain by getting {}
diff --git a/firebase-database/package.json b/firebase-database/package.json
@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.1.0",
-    "firebase": "8.2.0",
+    "@gitlive/firebase-app": "1.2.0",
+    "firebase": "8.2.3",
     "kotlin": "1.4.21",
     "kotlinx-coroutines-core": "1.4.2"
   }
diff --git a/firebase-database/src/iosMain/c_interop/Cartfile b/firebase-database/src/iosMain/c_interop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 7.3.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 7.4.0
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -78,7 +78,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-firestore:22.0.0")
+                api("com.google.firebase:firebase-firestore:22.0.1")
                 implementation("com.android.support:multidex:1.0.3")
             }
         }
diff --git a/firebase-firestore/package.json b/firebase-firestore/package.json
@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.1.0",
-    "firebase": "8.2.0",
+    "@gitlive/firebase-app": "1.2.0",
+    "firebase": "8.2.3",
     "kotlin": "1.4.21",
     "kotlinx-coroutines-core": "1.4.2"
   }
diff --git a/firebase-firestore/src/androidMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/androidMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -7,17 +7,14 @@ package dev.gitlive.firebase.firestore
 
 import com.google.firebase.Timestamp
 import com.google.firebase.firestore.FieldValue
-import com.google.firebase.firestore.FirebaseFirestoreSettings
 import com.google.firebase.firestore.SetOptions
 import dev.gitlive.firebase.*
-import dev.gitlive.firebase.firestore.encode
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.tasks.await
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerializationStrategy
-import kotlinx.serialization.serializer
 
 @PublishedApi
 internal inline fun <reified T> decode(value: Any?): T =
@@ -41,14 +38,10 @@ actual fun Firebase.firestore(app: FirebaseApp) =
 
 actual class FirebaseFirestore(val android: com.google.firebase.firestore.FirebaseFirestore) {
 
-//    actual var settings: FirebaseFirestoreSettings
-//        get() = android.firestoreSettings.run { FirebaseFirestoreSettings(isPersistenceEnabled) }
-//        set(value) {
-//            android.firestoreSettings = value.run { Builder().setPersistenceEnabled(persistenceEnabled).build() }
-//        }
-
     actual fun collection(collectionPath: String) = CollectionReference(android.collection(collectionPath))
 
+    actual fun collectionGroup(collectionId: String) = Query(android.collectionGroup(collectionId))
+
     actual fun document(documentPath: String) = DocumentReference(android.document(documentPath))
 
     actual fun batch() = WriteBatch(android.batch())
@@ -60,15 +53,30 @@ actual class FirebaseFirestore(val android: com.google.firebase.firestore.Fireba
         android.runTransaction { runBlocking { Transaction(it).func() } }.await()
 
     actual suspend fun clearPersistence() =
-        android.clearPersistence().await()
-            .run { Unit }
+        android.clearPersistence().await().run { }
 
     actual fun useEmulator(host: String, port: Int) {
         android.useEmulator(host, port)
-        android.firestoreSettings = FirebaseFirestoreSettings.Builder()
+        android.firestoreSettings = com.google.firebase.firestore.FirebaseFirestoreSettings.Builder()
             .setPersistenceEnabled(false)
             .build()
     }
+
+    actual fun setSettings(persistenceEnabled: Boolean?, sslEnabled: Boolean?, host: String?, cacheSizeBytes: Long?) {
+        android.firestoreSettings = com.google.firebase.firestore.FirebaseFirestoreSettings.Builder().also { builder ->
+                persistenceEnabled?.let { builder.setPersistenceEnabled(it) }
+                sslEnabled?.let { builder.isSslEnabled = it }
+                host?.let { builder.host = it }
+                cacheSizeBytes?.let { builder.cacheSizeBytes = it }
+            }.build()
+        }
+
+    actual suspend fun disableNetwork() =
+        android.disableNetwork().await().run { }
+
+    actual suspend fun enableNetwork() =
+        android.enableNetwork().await().run { }
+
 }
 
 actual class WriteBatch(val android: com.google.firebase.firestore.WriteBatch) {
diff --git a/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -19,14 +19,17 @@ expect val Firebase.firestore: FirebaseFirestore
 expect fun Firebase.firestore(app: FirebaseApp): FirebaseFirestore
 
 expect class FirebaseFirestore {
-//    var settings: FirebaseFirestoreSettings
     fun collection(collectionPath: String): CollectionReference
+    fun collectionGroup(collectionId: String): Query
     fun document(documentPath: String): DocumentReference
     fun batch(): WriteBatch
     fun setLoggingEnabled(loggingEnabled: Boolean)
     suspend fun clearPersistence()
     suspend fun <T> runTransaction(func: suspend Transaction.() -> T): T
     fun useEmulator(host: String, port: Int)
+    fun setSettings(persistenceEnabled: Boolean? = null, sslEnabled: Boolean? = null, host: String? = null, cacheSizeBytes: Long? = null)
+    suspend fun disableNetwork()
+    suspend fun enableNetwork()
 }
 
 expect class Transaction {
@@ -49,10 +52,6 @@ expect class Transaction {
     suspend fun get(documentRef: DocumentReference): DocumentSnapshot
 }
 
-//data class FirebaseFirestoreSettings(
-//    val persistenceEnabled: Boolean = true
-//)
-
 expect open class Query {
     fun limit(limit: Number): Query
     val snapshots: Flow<QuerySnapshot>
diff --git a/firebase-firestore/src/iosMain/c_interop/Cartfile b/firebase-firestore/src/iosMain/c_interop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 7.3.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 7.4.0
diff --git a/firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
diff --git a/firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
diff --git a/firebase-functions/package.json b/firebase-functions/package.json
diff --git a/firebase-functions/src/iosMain/c_interop/Cartfile b/firebase-functions/src/iosMain/c_interop/Cartfile

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ buildscript {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`dependencies {`
`22`		`- classpath("com.android.tools.build:gradle:4.0.2")`
	`22`	`+ classpath("com.android.tools.build:gradle:4.1.1")`
`23`	`23`	`classpath("de.undercouch:gradle-download-task:4.1.1")`
`24`	`24`	`classpath("com.adarshr:gradle-test-logger-plugin:2.0.0")`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ kotlin {`
`68`	`68`	`}`
`69`	`69`	`val androidMain by getting {`
`70`	`70`	`dependencies {`
`71`		`- api("com.google.firebase:firebase-common:19.4.0")`
	`71`	`+ api("com.google.firebase:firebase-common:19.5.0")`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 7.3.0`
	`1`	`+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 7.4.0`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ kotlin {`
`102`	`102`
`103`	`103`	`val androidMain by getting {`
`104`	`104`	`dependencies {`
`105`		`- api("com.google.firebase:firebase-auth:20.0.1")`
	`105`	`+ api("com.google.firebase:firebase-auth:20.0.2")`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`