Merge branch 'master' into lintKotlin

nbransby · web-flow · commit 037a40388d53 · 2024-07-26T08:01:46.000+08:00
diff --git a/firebase-analytics/src/androidMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt b/firebase-analytics/src/androidMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt
@@ -23,7 +23,7 @@ public actual class FirebaseAnalytics(public val android: com.google.firebase.an
     public actual fun setUserProperty(name: String, value: String) {
         android.setUserProperty(name, value)
     }
-    public actual fun setUserId(id: String) {
+    public actual fun setUserId(id: String?) {
         android.setUserId(id)
     }
     public actual fun resetAnalyticsData() {
diff --git a/firebase-analytics/src/commonMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt b/firebase-analytics/src/commonMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt
@@ -13,7 +13,7 @@ public expect fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics
 public expect class FirebaseAnalytics {
     public fun logEvent(name: String, parameters: Map<String, Any>? = null)
     public fun setUserProperty(name: String, value: String)
-    public fun setUserId(id: String)
+    public fun setUserId(id: String?)
     public fun setAnalyticsCollectionEnabled(enabled: Boolean)
     public fun setSessionTimeoutInterval(sessionTimeoutInterval: Duration)
     public suspend fun getSessionId(): Long?
diff --git a/firebase-analytics/src/iosMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt b/firebase-analytics/src/iosMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt
@@ -23,7 +23,7 @@ public actual class FirebaseAnalytics(public val ios: FIRAnalytics.Companion) {
     public actual fun setUserProperty(name: String, value: String) {
         ios.setUserPropertyString(value, name)
     }
-    public actual fun setUserId(id: String) {
+    public actual fun setUserId(id: String?) {
         ios.setUserID(id)
     }
     public actual fun resetAnalyticsData() {
diff --git a/firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt b/firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt
@@ -25,7 +25,7 @@ public actual class FirebaseAnalytics(public val js: dev.gitlive.firebase.analyt
         dev.gitlive.firebase.analytics.externals.setUserProperty(js, name, value)
     }
 
-    public actual fun setUserId(id: String) {
+    public actual fun setUserId(id: String?) {
         dev.gitlive.firebase.analytics.externals.setUserId(js, id)
     }
 
diff --git a/firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/externals/analytics.kt b/firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/externals/analytics.kt
@@ -11,7 +11,7 @@ public external fun getAnalytics(app: FirebaseApp? = definedExternally): Firebas
 
 public external fun logEvent(app: FirebaseAnalytics, name: String, parameters: Map<String, Any>?)
 public external fun setUserProperty(app: FirebaseAnalytics, name: String, value: String)
-public external fun setUserId(app: FirebaseAnalytics, id: String)
+public external fun setUserId(app: FirebaseAnalytics, id: String?)
 public external fun resetAnalyticsData(app: FirebaseAnalytics)
 public external fun setDefaultEventParameters(app: FirebaseAnalytics, parameters: Map<String, String>)
 public external fun setAnalyticsCollectionEnabled(app: FirebaseAnalytics, enabled: Boolean)
diff --git a/firebase-analytics/src/jvmMain/kotlin/dev/gitlive/firebase/analytics/analytics.jvm.kt b/firebase-analytics/src/jvmMain/kotlin/dev/gitlive/firebase/analytics/analytics.jvm.kt
@@ -14,7 +14,7 @@ public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics {
 
 public actual class FirebaseAnalytics {
     public actual fun setUserProperty(name: String, value: String) {}
-    public actual fun setUserId(id: String) {}
+    public actual fun setUserId(id: String?) {}
     public actual fun resetAnalyticsData() {}
     public actual fun setAnalyticsCollectionEnabled(enabled: Boolean) {}
     public actual fun setSessionTimeoutInterval(sessionTimeoutInterval: Duration) {}
diff --git a/firebase-messaging/api/android/firebase-messaging.api b/firebase-messaging/api/android/firebase-messaging.api
@@ -1,5 +1,6 @@
 public final class dev/gitlive/firebase/messaging/FirebaseMessaging {
 	public fun <init> (Lcom/google/firebase/messaging/FirebaseMessaging;)V
+	public final fun deleteToken (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getAndroid ()Lcom/google/firebase/messaging/FirebaseMessaging;
 	public final fun getToken (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun subscribeToTopic (Ljava/lang/String;)V
diff --git a/firebase-messaging/api/jvm/firebase-messaging.api b/firebase-messaging/api/jvm/firebase-messaging.api
@@ -1,5 +1,6 @@
 public final class dev/gitlive/firebase/messaging/FirebaseMessaging {
 	public fun <init> ()V
+	public final fun deleteToken (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getToken (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun subscribeToTopic (Ljava/lang/String;)V
 	public final fun unsubscribeFromTopic (Ljava/lang/String;)V
diff --git a/firebase-messaging/src/androidMain/kotlin/dev/gitlive/firebase/messaging/messaging.kt b/firebase-messaging/src/androidMain/kotlin/dev/gitlive/firebase/messaging/messaging.kt
@@ -18,4 +18,8 @@ public actual class FirebaseMessaging(public val android: com.google.firebase.me
     }
 
     public actual suspend fun getToken(): String = android.token.await()
+
+    public actual suspend fun deleteToken() {
+        android.deleteToken().await()
+    }
 }
diff --git a/firebase-messaging/src/commonMain/kotlin/dev/gitlive/firebase/messaging/messaging.kt b/firebase-messaging/src/commonMain/kotlin/dev/gitlive/firebase/messaging/messaging.kt
@@ -28,4 +28,9 @@ public expect class FirebaseMessaging {
      * @return [String] FCM token
      */
     public suspend fun getToken(): String
+
+    /**
+     * Delete FCM token for client
+     */
+    public suspend fun deleteToken()
 }
diff --git a/firebase-messaging/src/iosMain/kotlin/dev/gitlive/firebase/messaging/messaging.kt b/firebase-messaging/src/iosMain/kotlin/dev/gitlive/firebase/messaging/messaging.kt
@@ -18,6 +18,10 @@ public actual class FirebaseMessaging(public val ios: FIRMessaging) {
     }
 
     public actual suspend fun getToken(): String = awaitResult { ios.tokenWithCompletion(it) }
+
+    public actual suspend fun deleteToken() {
+        await { ios.deleteTokenWithCompletion(it) }
+    }
 }
 
 public suspend inline fun <T> T.await(function: T.(callback: (NSError?) -> Unit) -> Unit) {
diff --git a/firebase-messaging/src/jsMain/kotlin/dev/gitlive/firebase/messaging/externals/messaging.kt b/firebase-messaging/src/jsMain/kotlin/dev/gitlive/firebase/messaging/externals/messaging.kt
@@ -9,4 +9,6 @@ public external fun getMessaging(
 
 public external fun getToken(messaging: Messaging = definedExternally, options: dynamic = definedExternally): Promise<String>
 
+public external fun deleteToken(messaging: Messaging = definedExternally): Promise<Boolean>
+
 public external interface Messaging
diff --git a/firebase-messaging/src/jsMain/kotlin/dev/gitlive/firebase/messaging/messaging.kt b/firebase-messaging/src/jsMain/kotlin/dev/gitlive/firebase/messaging/messaging.kt
@@ -22,4 +22,8 @@ public actual class FirebaseMessaging(public val js: Messaging) {
     }
 
     public actual suspend fun getToken(): String = dev.gitlive.firebase.messaging.externals.getToken(js).await()
+
+    public actual suspend fun deleteToken() {
+        dev.gitlive.firebase.messaging.externals.deleteToken(js).await()
+    }
 }
diff --git a/firebase-messaging/src/jvmMain/kotlin/dev/gitlive/firebase/messaging/messaging.kt b/firebase-messaging/src/jvmMain/kotlin/dev/gitlive/firebase/messaging/messaging.kt
@@ -19,4 +19,8 @@ public actual class FirebaseMessaging {
     public actual suspend fun getToken(): String {
         TODO("Not yet implemented")
     }
+
+    public actual suspend fun deleteToken() {
+        TODO("Not yet implemented")
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public actual class FirebaseAnalytics(public val android: com.google.firebase.an`
`23`	`23`	`public actual fun setUserProperty(name: String, value: String) {`
`24`	`24`	`android.setUserProperty(name, value)`
`25`	`25`	`}`
`26`		`- public actual fun setUserId(id: String) {`
	`26`	`+ public actual fun setUserId(id: String?) {`
`27`	`27`	`android.setUserId(id)`
`28`	`28`	`}`
`29`	`29`	`public actual fun resetAnalyticsData() {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public actual class FirebaseAnalytics(public val js: dev.gitlive.firebase.analyt`
`25`	`25`	`dev.gitlive.firebase.analytics.externals.setUserProperty(js, name, value)`
`26`	`26`	`}`
`27`	`27`
`28`		`- public actual fun setUserId(id: String) {`
	`28`	`+ public actual fun setUserId(id: String?) {`
`29`	`29`	`dev.gitlive.firebase.analytics.externals.setUserId(js, id)`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,8 @@ public actual class FirebaseMessaging(public val android: com.google.firebase.me`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public actual suspend fun getToken(): String = android.token.await()`
	`21`	`+`
	`22`	`+ public actual suspend fun deleteToken() {`
	`23`	`+ android.deleteToken().await()`
	`24`	`+ }`
`21`	`25`	`}`