Merge branch 'master' into kotlin-1-5

nbransby · web-flow · commit ed32136f5bb1 · 2021-05-15T21:45:55.000+01:00
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -30,6 +30,12 @@ jobs:
       run: ./gradlew assemble
     - name: Run JS Tests
       run: ./gradlew cleanTest jsTest
+    - name: Upload test artifact
+      uses: actions/upload-artifact@v2
+      if: failure()
+      with:
+        name: "JSTest Report HTML"
+        path: "firebase-firestore/build/reports/tests/jsTest/"
     - name: Run Android Instrumented Tests
       uses: reactivecircus/android-emulator-runner@v2
       with:
diff --git a/README.md b/README.md
@@ -4,20 +4,20 @@
   <i>Real-time code collaboration inside any IDE</i><br/>
 <br/>
 <br/>
-The Firebase Kotlin SDK is a Kotlin-first SDK for Firebase. It's API is similar to the [Firebase Android SDK Kotlin Extensions](https://firebase.github.io/firebase-android-sdk/reference/kotlin/firebase-ktx/) but also supports multiplatform projects, enabling you to use Firebase directly from your common source targeting *iOS*, *Android* or *JS*.
+The Firebase Kotlin SDK is a Kotlin-first SDK for Firebase. It's API is similar to the <a href="https://firebase.github.io/firebase-android-sdk/reference/kotlin/firebase-ktx/">Firebase Android SDK Kotlin Extensions</a> but also supports multiplatform projects, enabling you to use Firebase directly from your common source targeting <strong>iOS</strong>, <strong>Android</strong> or <strong>JS</strong>.
 
 ## Available libraries
 
 The following libraries are available for the various Firebase products.
 
 | Service or Product	                                                                 | Gradle Dependency                                                                                                                   | API Coverage                                                                                                                                                                                                               |
 | ------------------------------------------------------------------------------------ | :-----------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [Authentication](https://firebase.google.com/docs/auth#kotlin-android)               | [`dev.gitlive:firebase-auth:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-auth/1.2.0/pom)           | [![80%](https://img.shields.io/badge/-80%25-green?style=flat-square)](/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt) |
-| [Realtime Database](https://firebase.google.com/docs/database#kotlin-android)        | [`dev.gitlive:firebase-database:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-database/1.2.0/pom)   | [![70%](https://img.shields.io/badge/-70%25-orange?style=flat-square)](/firebase-database/src/commonMain/kotlin/dev/gitlive/firebase/database/database.kt) |
-| [Cloud Firestore](https://firebase.google.com/docs/firestore#kotlin-android)         | [`dev.gitlive:firebase-firestore:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-firestore/1.2.0/pom) | [![60%](https://img.shields.io/badge/-60%25-orange?style=flat-square)](/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt) |
-| [Cloud Functions](https://firebase.google.com/docs/functions/callable#kotlin-android)| [`dev.gitlive:firebase-functions:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-functions/1.2.0/pom) | [![80%](https://img.shields.io/badge/-80%25-green?style=flat-square)](/firebase-functions/src/commonMain/kotlin/dev/gitlive/firebase/functions/functions.kt) |
-| [Cloud Messaging](https://firebase.google.com/docs/messaging#kotlin-android)         | [`dev.gitlive:firebase-messaging:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-messaging/1.2.0/pom) | ![0%](https://img.shields.io/badge/-0%25-lightgrey?style=flat-square) |
-| [Cloud Storage](https://firebase.google.com/docs/storage#kotlin-android)             | [`dev.gitlive:firebase-storage:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-storage/1.2.0/pom)     | ![0%](https://img.shields.io/badge/-0%25-lightgrey?style=flat-square) |
+| [Authentication](https://firebase.google.com/docs/auth#kotlin-android)               | [`dev.gitlive:firebase-auth:1.3.0`](https://search.maven.org/artifact/dev.gitlive/firebase-auth/1.3.0/pom)           | [![80%](https://img.shields.io/badge/-80%25-green?style=flat-square)](/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt) |
+| [Realtime Database](https://firebase.google.com/docs/database#kotlin-android)        | [`dev.gitlive:firebase-database:1.3.0`](https://search.maven.org/artifact/dev.gitlive/firebase-database/1.3.0/pom)   | [![70%](https://img.shields.io/badge/-70%25-orange?style=flat-square)](/firebase-database/src/commonMain/kotlin/dev/gitlive/firebase/database/database.kt) |
+| [Cloud Firestore](https://firebase.google.com/docs/firestore#kotlin-android)         | [`dev.gitlive:firebase-firestore:1.3.0`](https://search.maven.org/artifact/dev.gitlive/firebase-firestore/1.3.0/pom) | [![60%](https://img.shields.io/badge/-60%25-orange?style=flat-square)](/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt) |
+| [Cloud Functions](https://firebase.google.com/docs/functions/callable#kotlin-android)| [`dev.gitlive:firebase-functions:1.3.0`](https://search.maven.org/artifact/dev.gitlive/firebase-functions/1.3.0/pom) | [![80%](https://img.shields.io/badge/-80%25-green?style=flat-square)](/firebase-functions/src/commonMain/kotlin/dev/gitlive/firebase/functions/functions.kt) |
+| [Cloud Messaging](https://firebase.google.com/docs/messaging#kotlin-android)         | [`dev.gitlive:firebase-messaging:1.3.0`](https://search.maven.org/artifact/dev.gitlive/firebase-messaging/1.3.0/pom) | ![0%](https://img.shields.io/badge/-0%25-lightgrey?style=flat-square) |
+| [Cloud Storage](https://firebase.google.com/docs/storage#kotlin-android)             | [`dev.gitlive:firebase-storage:1.3.0`](https://search.maven.org/artifact/dev.gitlive/firebase-storage/1.3.0/pom)     | ![0%](https://img.shields.io/badge/-0%25-lightgrey?style=flat-square) |
 
 Is the Firebase library or API you need missing? [Create an issue](https://github.com/GitLiveApp/firebase-kotlin-sdk/issues/new?labels=API+coverage&template=increase-api-coverage.md&title=Add+%5Bclass+name%5D.%5Bfunction+name%5D+to+%5Blibrary+name%5D+for+%5Bplatform+names%5D) to request additional API coverage or be awesome and [submit a PR](https://github.com/GitLiveApp/firebase-kotlin-sdk/fork)
 
@@ -163,12 +163,12 @@ If you are building a Kotlin multiplatform library which will be consumed from J
 
 ```json
 "dependencies": {
-  "@gitlive/firebase-auth": "1.2.0",
-  "@gitlive/firebase-database": "1.2.0",
-  "@gitlive/firebase-firestore": "1.2.0",
-  "@gitlive/firebase-functions": "1.2.0",
-  "@gitlive/firebase-storage": "1.2.0",
-  "@gitlive/firebase-messaging": "1.2.0"
+  "@gitlive/firebase-auth": "1.3.0",
+  "@gitlive/firebase-database": "1.3.0",
+  "@gitlive/firebase-firestore": "1.3.0",
+  "@gitlive/firebase-functions": "1.3.0",
+  "@gitlive/firebase-storage": "1.3.0",
+  "@gitlive/firebase-messaging": "1.3.0"
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -67,6 +67,16 @@ subprojects {
         onlyIf { !project.gradle.startParameter.taskNames.contains("publishToMavenLocal") }
     }
 
+    tasks.whenTaskAdded {
+        enabled = when(name) {
+            "compileDebugUnitTestKotlinAndroid" -> false
+            "compileReleaseUnitTestKotlinAndroid" -> false
+            "testDebugUnitTest" -> false
+            "testReleaseUnitTest" -> false
+            else -> enabled
+        }
+    }
+
     tasks {
 
         val updateVersion by registering(Exec::class) {
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -77,8 +77,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {
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.2.0",
-    "firebase": "8.4.3",
+    "@gitlive/firebase-common": "1.3.0",
+    "firebase": "8.5.0",
     "kotlin": "1.5.0",
     "kotlinx-coroutines-core": "1.5.0-RC"
   }
diff --git a/firebase-app/src/commonMain/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/commonMain/kotlin/dev/gitlive/firebase/firebase.kt
@@ -50,7 +50,8 @@ data class FirebaseOptions(
     val gaTrackingId: String? = null,
     val storageBucket: String? = null,
     val projectId: String? = null,
-    val gcmSenderId: String? = null
+    val gcmSenderId: String? = null,
+    val authDomain: String? = null
 )
 
 expect open class FirebaseException : Exception
diff --git a/firebase-app/src/commonTest/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/commonTest/kotlin/dev/gitlive/firebase/firebase.kt
@@ -17,7 +17,8 @@ class FirebaseAppTest {
                 apiKey = "AIzaSyCK87dcMFhzCz_kJVs2cT2AVlqOTLuyWV0",
                 databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
                 storageBucket = "fir-kotlin-sdk.appspot.com",
-                projectId = "fir-kotlin-sdk"
+                projectId = "fir-kotlin-sdk",
+                gcmSenderId = "846484016111"
             )
         )
     }
diff --git a/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt
@@ -26,7 +26,7 @@ actual class FirebaseApp internal constructor(val js: firebase.App) {
         get() = js.name
     actual val options: FirebaseOptions
         get() = js.options.run {
-            FirebaseOptions(applicationId, apiKey, databaseUrl, gaTrackingId, storageBucket, projectId)
+            FirebaseOptions(applicationId, apiKey, databaseUrl, gaTrackingId, storageBucket, projectId, messagingSenderId, authDomain)
         }
 }
 
@@ -39,7 +39,8 @@ private fun FirebaseOptions.toJson() = json(
     "storageBucket" to (storageBucket ?: undefined),
     "projectId" to (projectId ?: undefined),
     "gaTrackingId" to (gaTrackingId ?: undefined),
-    "messagingSenderId" to (gcmSenderId ?: undefined)
+    "messagingSenderId" to (gcmSenderId ?: undefined),
+    "authDomain" to (authDomain ?: undefined)
 )
 
 actual open class FirebaseException(code: String?, cause: Throwable) : Exception("$code: ${cause.message}", cause)
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -102,8 +102,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {
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.2.0",
-    "firebase": "8.4.3",
+    "@gitlive/firebase-app": "1.3.0",
+    "firebase": "8.5.0",
     "kotlin": "1.5.0",
     "kotlinx-coroutines-core": "1.5.0-RC"
   }
diff --git a/firebase-auth/src/commonTest/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/commonTest/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -26,7 +26,8 @@ class FirebaseAuthTest {
                         apiKey = "AIzaSyCK87dcMFhzCz_kJVs2cT2AVlqOTLuyWV0",
                         databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
                         storageBucket = "fir-kotlin-sdk.appspot.com",
-                        projectId = "fir-kotlin-sdk"
+                        projectId = "fir-kotlin-sdk",
+                        gcmSenderId = "846484016111"
                     )
                 )
                 Firebase.auth.useEmulator(emulatorHost, 9099)
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -58,8 +58,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {
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.4.3",
+    "firebase": "8.5.0",
     "kotlin": "1.5.0",
     "kotlinx-coroutines-core": "1.5.0-RC",
     "kotlinx-serialization-kotlinx-serialization-runtime": "1.1.0"
diff --git a/firebase-common/src/commonTest/kotlin/dev/gitlive/firebase/EncodersTest.kt b/firebase-common/src/commonTest/kotlin/dev/gitlive/firebase/EncodersTest.kt
@@ -51,7 +51,7 @@ class EncodersTest {
 
     @Test
     fun decodeObjectNullableValue() {
-        val decoded = decode(TestData.serializer(), mapOf("map" to mapOf("key" to "value"), "nullableBool" to null))
+        val decoded = decode(TestData.serializer(), nativeMapOf("map" to mapOf("key" to "value"), "nullableBool" to null))
         assertNull(decoded.nullableBool)
     }
 }
diff --git a/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt b/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt
@@ -27,6 +27,8 @@ external object firebase {
         val gaTrackingId: String?
         val storageBucket: String?
         val projectId: String?
+        val messagingSenderId: String?
+        val authDomain: String?
     }
 
     val apps : Array<App>
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -78,8 +78,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {
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.2.0",
-    "firebase": "8.4.3",
+    "@gitlive/firebase-app": "1.3.0",
+    "firebase": "8.5.0",
     "kotlin": "1.5.0",
     "kotlinx-coroutines-core": "1.5.0-RC"
   }
diff --git a/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt
@@ -5,11 +5,15 @@
 package dev.gitlive.firebase.database
 
 import dev.gitlive.firebase.*
-import kotlinx.coroutines.await
+import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.produceIn
+import kotlinx.coroutines.selects.select
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerializationStrategy
+import kotlin.js.Promise
 
 @PublishedApi
 internal inline fun <reified T> encode(value: T, shouldEncodeElementDefault: Boolean) =
@@ -113,16 +117,16 @@ actual class DatabaseReference internal constructor(override val js: firebase.da
     actual fun onDisconnect() = rethrow { OnDisconnect(js.onDisconnect()) }
 
     actual suspend fun updateChildren(update: Map<String, Any?>, encodeDefaults: Boolean) =
-        rethrow { js.update(encode(update, encodeDefaults)).await() }
+        rethrow { js.update(encode(update, encodeDefaults)).awaitWhileOnline() }
 
-    actual suspend fun removeValue() = rethrow { js.remove().await() }
+    actual suspend fun removeValue() = rethrow { js.remove().awaitWhileOnline() }
 
     actual suspend inline fun <reified T> setValue(value: T?, encodeDefaults: Boolean) = rethrow {
-        js.set(encode(value, encodeDefaults)).await()
+        js.set(encode(value, encodeDefaults)).awaitWhileOnline()
     }
 
     actual suspend fun <T> setValue(strategy: SerializationStrategy<T>, value: T, encodeDefaults: Boolean) =
-        rethrow { js.set(encode(strategy, value, encodeDefaults)).await() }
+        rethrow { js.set(encode(strategy, value, encodeDefaults)).awaitWhileOnline() }
 }
 
 actual class DataSnapshot internal constructor(val js: firebase.database.DataSnapshot) {
@@ -147,17 +151,17 @@ actual class DataSnapshot internal constructor(val js: firebase.database.DataSna
 
 actual class OnDisconnect internal constructor(val js: firebase.database.OnDisconnect) {
 
-    actual suspend fun removeValue() = rethrow { js.remove().await() }
-    actual suspend fun cancel() =  rethrow { js.cancel().await() }
+    actual suspend fun removeValue() = rethrow { js.remove().awaitWhileOnline() }
+    actual suspend fun cancel() =  rethrow { js.cancel().awaitWhileOnline() }
 
     actual suspend fun updateChildren(update: Map<String, Any?>, encodeDefaults: Boolean) =
-        rethrow { js.update(encode(update, encodeDefaults)).await() }
+        rethrow { js.update(encode(update, encodeDefaults)).awaitWhileOnline() }
 
     actual suspend inline fun <reified T> setValue(value: T, encodeDefaults: Boolean) =
-        rethrow { js.set(encode(value, encodeDefaults)).await() }
+        rethrow { js.set(encode(value, encodeDefaults)).awaitWhileOnline() }
 
     actual suspend fun <T> setValue(strategy: SerializationStrategy<T>, value: T, encodeDefaults: Boolean) =
-        rethrow { js.set(encode(strategy, value, encodeDefaults)).await() }
+        rethrow { js.set(encode(strategy, value, encodeDefaults)).awaitWhileOnline() }
 }
 
 actual class DatabaseException(error: dynamic) :
@@ -174,3 +178,18 @@ inline fun <R> rethrow(function: () -> R): R {
         throw DatabaseException(e)
     }
 }
+
+suspend fun <T> Promise<T>.awaitWhileOnline(): T = coroutineScope {
+
+    val notConnected = Firebase.database
+        .reference(".info/connected")
+        .valueEvents
+        .filter { !it.value<Boolean>() }
+        .produceIn(this)
+
+    select<T> {
+        this@awaitWhileOnline.asDeferred().onAwait { it.also { notConnected.cancel() } }
+        notConnected.onReceive { throw DatabaseException("Database not connected") }
+    }
+
+}
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -80,8 +80,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {
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.2.0",
-    "firebase": "8.4.3",
+    "@gitlive/firebase-app": "1.3.0",
+    "firebase": "8.5.0",
     "kotlin": "1.5.0",
     "kotlinx-coroutines-core": "1.5.0-RC"
   }
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
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
diff --git a/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
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/gradle.properties b/gradle.properties

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ data class FirebaseOptions(`
`50`	`50`	`val gaTrackingId: String? = null,`
`51`	`51`	`val storageBucket: String? = null,`
`52`	`52`	`val projectId: String? = null,`
`53`		`- val gcmSenderId: String? = null`
	`53`	`+ val gcmSenderId: String? = null,`
	`54`	`+ val authDomain: String? = null`
`54`	`55`	`)`
`55`	`56`
`56`	`57`	`expect open class FirebaseException : Exception`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ class FirebaseAppTest {`
`17`	`17`	`apiKey = "AIzaSyCK87dcMFhzCz_kJVs2cT2AVlqOTLuyWV0",`
`18`	`18`	`databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",`
`19`	`19`	`storageBucket = "fir-kotlin-sdk.appspot.com",`
`20`		`- projectId = "fir-kotlin-sdk"`
	`20`	`+ projectId = "fir-kotlin-sdk",`
	`21`	`+ gcmSenderId = "846484016111"`
`21`	`22`	`)`
`22`	`23`	`)`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ actual class FirebaseApp internal constructor(val js: firebase.App) {`
`26`	`26`	`get() = js.name`
`27`	`27`	`actual val options: FirebaseOptions`
`28`	`28`	`get() = js.options.run {`
`29`		`- FirebaseOptions(applicationId, apiKey, databaseUrl, gaTrackingId, storageBucket, projectId)`
	`29`	`+ FirebaseOptions(applicationId, apiKey, databaseUrl, gaTrackingId, storageBucket, projectId, messagingSenderId, authDomain)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -39,7 +39,8 @@ private fun FirebaseOptions.toJson() = json(`
`39`	`39`	`"storageBucket" to (storageBucket ?: undefined),`
`40`	`40`	`"projectId" to (projectId ?: undefined),`
`41`	`41`	`"gaTrackingId" to (gaTrackingId ?: undefined),`
`42`		`- "messagingSenderId" to (gcmSenderId ?: undefined)`
	`42`	`+ "messagingSenderId" to (gcmSenderId ?: undefined),`
	`43`	`+ "authDomain" to (authDomain ?: undefined)`
`43`	`44`	`)`
`44`	`45`
`45`	`46`	`actual open class FirebaseException(code: String?, cause: Throwable) : Exception("$code: ${cause.message}", cause)`