Fix switching environment issue (#45)

banghuazhao · Nov 16, 2024 · 56d9bbb · 56d9bbb
1 parent db86b18
commit 56d9bbb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/data/lib/repositories/api_env_repository_impl.dart b/data/lib/repositories/api_env_repository_impl.dart
@@ -24,9 +24,9 @@ class APIEnvironmentRepositoryImpl implements APIEnvironmentRepository {
     final prefs = await SharedPreferences.getInstance();
     final String currentEnvironment = prefs.getString(_environmentKey) ?? "production";
     if (currentEnvironment == "production") {
-       return "http://localhost:8080/api";
-    } else {
       return "http://compositesai.eba-dxj2wppi.us-west-2.elasticbeanstalk.com/api";
+    } else {
+      return "http://localhost:8080/api";
     }
   }
 }
diff --git a/domain/lib/usecases/auth_usecase.dart b/domain/lib/usecases/auth_usecase.dart
@@ -22,12 +22,16 @@ class AuthUseCase {
   }
 
   Future<void> logout() async {
+    final accessToken = await tokenProvider.getToken();
+    if (accessToken == null || accessToken == "") {
+      return;
+    }
     try {
       await repository.logout();
     } catch (e) {
       rethrow;
     } finally {
-      tokenProvider.deleteToken();
+      await tokenProvider.deleteToken();
     }
   }
 

diff --git a/lib/presentation/settings/viewModels/qa_settings_view_model.dart b/lib/presentation/settings/viewModels/qa_settings_view_model.dart
@@ -43,10 +43,11 @@ class QASettingsViewModel extends ChangeNotifier {
       await authUseCase.logout();
     } catch (e) {
       print('Error during logout: $e');
+    } finally {
+      await apiEnvironmentUseCase.changeAPIEnvironment(environment);
+      currentEnvironment = environment;
+      isLoading = false;
+      notifyListeners();
     }
-    await apiEnvironmentUseCase.changeAPIEnvironment(environment);
-    currentEnvironment = environment;
-    isLoading = false;
-    notifyListeners();
   }
 }