TF-2387 Navigate to TwakeWelcome page when perform logout action

2024-01-03 11:42:32 +07:00
parent 6d643881dd
commit 0b777ab951
1 changed files with 20 additions and 6 deletions
@@ -409,11 +409,16 @@ abstract class BaseController extends GetxController
  void goToLogin() {
    if (PlatformInfo.isMobile) {
      navigateToTwakeWelcomePage();
-    } else if (Get.currentRoute != AppRoutes.login) {
-      pushAndPopAll(
-        AppRoutes.login,
-        arguments: LoginArguments(LoginFormType.none)
-      );
+    } else {
+      navigateToLoginPage();
+    }
+  }
+
+  void removeAllPageAndGoToLogin() {
+    if (PlatformInfo.isMobile) {
+      pushAndPopAll(AppRoutes.twakeWelcome);
+    } else {
+      navigateToLoginPage();
    }
  }

@@ -421,6 +426,15 @@ abstract class BaseController extends GetxController
    popAndPush(AppRoutes.twakeWelcome);
  }

+  void navigateToLoginPage() {
+    if (Get.currentRoute == AppRoutes.login) {
+      return;
+    }
+    pushAndPopAll(
+      AppRoutes.login,
+      arguments: LoginArguments(LoginFormType.none));
+  }
+
  void logout(Session? session, AccountId? accountId) async {
    if (session == null || accountId == null) {
      await clearDataAndGoToLoginPage();
@@ -464,7 +478,7 @@ abstract class BaseController extends GetxController
  Future<void> clearDataAndGoToLoginPage() async {
    log('$runtimeType::clearDataAndGoToLoginPage:');
    await clearAllData();
-    goToLogin();
+    removeAllPageAndGoToLogin();
  }

  Future<void> clearAllData() async {