FireStore: clearPersistence(). (#32)

* FireStore: clearPersistence().

* add tests for clearPersistence

* add gmcSenderId

* fix gmcSenderId usage in ios

* fix gmcSenderId usage in js

Co-authored-by: Nicholas Bransby-Williams <[email protected]>

Author: vanniktech

firebase-app/src/androidMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -46,4 +46,5 @@ private fun FirebaseOptions.toAndroid() = com.google.firebase.FirebaseOptions.Bu
     .setGaTrackingId(gaTrackingId)
     .setStorageBucket(storageBucket)
     .setProjectId(projectId)
+    .setGcmSenderId(gcmSenderId)
     .build()

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

@@ -49,7 +49,8 @@ data class FirebaseOptions(
     val databaseUrl: String? = null,
     val gaTrackingId: String? = null,
     val storageBucket: String? = null,
-    val projectId: String? = null
+    val projectId: String? = null,
+    val gcmSenderId: String? = null
 )
 
 expect open class FirebaseException : Exception

firebase-app/src/iosMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -38,7 +38,7 @@ actual fun Firebase.apps(context: Any?) = FIRApp.allApps()
     .values
     .map { FirebaseApp(it as FIRApp) }
 
-private fun FirebaseOptions.toIos() = FIROptions(this@toIos.applicationId, "846484016111").apply {
+private fun FirebaseOptions.toIos() = FIROptions(this@toIos.applicationId, this@toIos.gcmSenderId ?: "").apply {
         APIKey = this@toIos.apiKey
         databaseURL = this@toIos.databaseUrl
         trackingID = this@toIos.gaTrackingId

firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -38,7 +38,8 @@ private fun FirebaseOptions.toJson() = json(
     "databaseURL" to (databaseUrl ?: undefined),
     "storageBucket" to (storageBucket ?: undefined),
     "projectId" to (projectId ?: undefined),
-    "gaTrackingId" to (gaTrackingId ?: undefined)
+    "gaTrackingId" to (gaTrackingId ?: undefined),
+    "messagingSenderId" to (gcmSenderId ?: undefined)
 )
 
 actual open class FirebaseException(code: String?, cause: Throwable) : Exception("$code: ${cause.message}", cause)

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

@@ -169,6 +169,7 @@ external object firebase {
             fun doc(documentPath: String): DocumentReference
             fun settings(settings: Json)
             fun enablePersistence(): Promise<Unit>
+            fun clearPersistence(): Promise<Unit>
         }
 
         open class FieldPath constructor(fieldNames: Array<out String>)

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

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:JvmName("tests")
+package dev.gitlive.firebase.firestore
+
+import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.runBlocking
+
+actual val context: Any = InstrumentationRegistry.getInstrumentation().targetContext
+
+actual fun runTest(test: suspend () -> Unit) = runBlocking { test() }

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

@@ -42,6 +42,10 @@ actual class FirebaseFirestore(val android: com.google.firebase.firestore.Fireba
 
     actual suspend fun <T> runTransaction(func: suspend Transaction.() -> T) =
         android.runTransaction { runBlocking { Transaction(it).func() } }.await()
+
+    actual suspend fun clearPersistence() =
+        android.clearPersistence().await()
+            .run { Unit }
 }
 
 actual class WriteBatch(val android: com.google.firebase.firestore.WriteBatch) {

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

@@ -24,6 +24,7 @@ expect class FirebaseFirestore {
     fun document(documentPath: String): DocumentReference
     fun batch(): WriteBatch
     fun setLoggingEnabled(loggingEnabled: Boolean)
+    suspend fun clearPersistence()
     suspend fun <T> runTransaction(func: suspend Transaction.() -> T): T
 }
 

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

@@ -3,3 +3,33 @@
  */
 
 package dev.gitlive.firebase.firestore
+
+import dev.gitlive.firebase.*
+import kotlin.test.*
+
+expect val context: Any
+expect fun runTest(test: suspend () -> Unit)
+
+class FirebaseFirestoreTest {
+
+    @BeforeTest
+    fun initializeFirebase() {
+        Firebase
+            .takeIf { Firebase.apps(context).isEmpty() }
+            ?.initialize(
+                context,
+                FirebaseOptions(
+                    applicationId = "1:846484016111:ios:dd1f6688bad7af768c841a",
+                    apiKey = "AIzaSyCK87dcMFhzCz_kJVs2cT2AVlqOTLuyWV0",
+                    databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
+                    storageBucket = "fir-kotlin-sdk.appspot.com",
+                    projectId = "fir-kotlin-sdk"
+                )
+            )
+    }
+
+    @Test
+    fun testClearPersistence() = runTest {
+        Firebase.firestore.clearPersistence()
+    }
+}

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

@@ -38,6 +38,9 @@ actual class FirebaseFirestore(val ios: FIRFirestore) {
 
     actual suspend fun <T> runTransaction(func: suspend Transaction.() -> T) =
         awaitResult<Any?> { ios.runTransactionWithBlock({ transaction, error -> runBlocking { Transaction(transaction!!).func() } }, it) } as T
+
+    actual suspend fun clearPersistence() =
+        await { ios.clearPersistenceWithCompletion(it) }
 }
 
 actual class WriteBatch(val ios: FIRWriteBatch) {