chore(fc): delete push token's on logout

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

flipchatApp/src/main/kotlin/xyz/flipchat/app/auth/AuthManager.kt

@@ -24,6 +24,7 @@ import com.ionspin.kotlin.crypto.LibsodiumInitializer
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import xyz.flipchat.FlipchatServices
@@ -178,28 +179,32 @@ class AuthManager @Inject constructor(
             }
     }
 
-    fun deleteAndLogout(context: Context, onComplete: () -> Unit = {}) {
+    suspend fun deleteAndLogout(context: Context, onComplete: () -> Unit = {}) {
         //todo: add account deletion
         logout(context, onComplete)
     }
 
-    fun logout(context: Context, onComplete: () -> Unit = {}) {
-        launch {
+    suspend fun logout(context: Context, onComplete: () -> Unit = {}) {
+        coroutineScope {
             val token = AccountUtils.getToken(context)
             when (token) {
                 is TokenResult.Account -> {
                     AccountUtils.removeAccounts(context)
                         .doOnSuccess { res: Boolean ->
                             if (res) {
-                                clearToken()
-                                onComplete()
+                                launch {
+                                    clearToken()
+                                    onComplete()
+                                }
                             }
                         }
                         .subscribe()
                 }
+
                 is TokenResult.Code -> {
                     onComplete()
                 }
+
                 null -> Unit
             }
         }
@@ -221,8 +226,12 @@ class AuthManager @Inject constructor(
 //        )
     }
 
-    private fun clearToken() {
+    private suspend fun clearToken() {
+        val token = FirebaseMessaging.getInstance().token()
         FirebaseMessaging.getInstance().deleteToken()
+        if (token != null) {
+            pushController.deleteToken(token)
+        }
         Database.close()
         userManager.clear()
         Database.delete(context)

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/home/tabs/ChatTab.kt

@@ -19,6 +19,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -50,6 +51,7 @@ import com.getcode.ui.utils.unboundedClickable
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import xyz.flipchat.app.R
 import xyz.flipchat.app.features.chat.list.ChatListViewModel
 import xyz.flipchat.app.features.chat.openChatDirectiveBottomModal
@@ -82,15 +84,18 @@ internal object ChatTab : ChildNavTab {
                 }.launchIn(this)
         }
 
+        val composeScope = rememberCoroutineScope()
         Box {
             Column {
                 AppBarWithTitle(
                     title = options.title,
                     startContent = {
                         HiddenLogoutButton(modifier = Modifier.padding(CodeTheme.dimens.grid.x1)) {
                             context.getActivity()?.let {
-                                settingsVm.logout(it) {
-                                    navigator.replaceAll(ScreenRegistry.get(NavScreenProvider.Login.Home()))
+                                composeScope.launch {
+                                    settingsVm.logout(it) {
+                                        navigator.replaceAll(ScreenRegistry.get(NavScreenProvider.Login.Home()))
+                                    }
                                 }
                             }
                         }

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/login/accesskey/SeedInputViewModel.kt

@@ -96,7 +96,7 @@ class SeedInputViewModel @Inject constructor(
         }
     }
 
-    fun logout(activity: Activity, onComplete: () -> Unit = {}) =
+    suspend fun logout(activity: Activity, onComplete: () -> Unit = {}) =
         authManager.logout(activity, onComplete)
 
     @SuppressLint("CheckResult")

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/settings/SettingsViewModel.kt

@@ -11,7 +11,7 @@ class SettingsViewModel @Inject constructor(
     private val authManager: AuthManager,
 ) : ViewModel() {
 
-    fun logout(activity: Activity, onComplete: () -> Unit) {
+    suspend fun logout(activity: Activity, onComplete: () -> Unit) {
         authManager.logout(activity, onComplete = onComplete)
     }
 }

flipchatApp/src/main/kotlin/xyz/flipchat/app/ui/navigation/MainRoot.kt

@@ -113,7 +113,7 @@ internal object MainRoot : Screen {
                     if (entropy == null && userId == null) {
                         delay(500)
                         showLoading = true
-                        delay(1500)
+                        delay(5_000)
                         navigator.replace(ScreenRegistry.get(NavScreenProvider.Login.Home()))
                         return@onEach
                     }

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/network/service/PushService.kt

@@ -51,7 +51,27 @@ internal class PushService @Inject constructor(
         owner: KeyPair,
         token: String,
     ): Result<Unit> {
-        return Result.failure(NotImplementedError())
+        return try {
+            networkOracle.managedRequest(api.deleteToken(owner, token))
+                .map {
+                    when (it.result) {
+                        PushService.DeleteTokenResponse.Result.OK -> Result.success(Unit)
+                        PushService.DeleteTokenResponse.Result.UNRECOGNIZED -> {
+                            val error = DeleteTokenError.Unrecognized()
+                            Timber.e(t = error)
+                            Result.failure(error)
+                        }
+                        else -> {
+                            val error = DeleteTokenError.Other()
+                            Timber.e(t = error)
+                            Result.failure(error)
+                        }
+                    }
+                }.first()
+        } catch (e: Exception) {
+            val error = DeleteTokenError.Other(cause = e)
+            Result.failure(error)
+        }
     }
 
     internal sealed class AddTokenError : Throwable() {