fix(#58): atualização do usuario e logout

fga-eps-mds · Jan 26, 2025 · 8ed93bb · 8ed93bb
1 parent 1f10097
commit 8ed93bb
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/lib/core/network/token_manager/repository/auth_repository.dart b/lib/core/network/token_manager/repository/auth_repository.dart
@@ -15,14 +15,13 @@ class AuthRepository {
         _userCache = user;
         return user;
       } catch (e) {
-        throw Exception('Erro ao obter o usuário');
+        throw Exception(e);
       }
     }
   }
 
   Future<void> clearUser() async {
     _userCache = null;
     StorageValue.getInstance().setJsonUser(null);
-    await GetIt.instance<AuthService>().refreshToken();
   }
 }
diff --git a/lib/core/network/token_manager/service/auth_service.dart b/lib/core/network/token_manager/service/auth_service.dart
@@ -34,7 +34,6 @@ class AuthService {
   }
 
   Future<UserModel> getUser() async {
-    Log.d("get user");
     String? json = await StorageValue.getInstance().getJsonUser();
 
     if (json != null) {
@@ -46,6 +45,8 @@ class AuthService {
 
       Map<String, dynamic> json = jsonDecode(response.toString());
 
+      if (json['userPayload'] == null) Log.e('user payload is null');
+
       UserModel user = UserModel.fromMap(json['userPayload']!);
 
       await StorageValue.getInstance().setJsonUser(user.toJson());

diff --git a/lib/ui/edit_delete_user/view/edit_delete_user_view.dart b/lib/ui/edit_delete_user/view/edit_delete_user_view.dart
@@ -1,3 +1,4 @@
+import 'package:aranduapp/core/log/log.dart';
 import 'package:aranduapp/ui/edit_delete_user/viewmode/edit_delte_user_viewmodel.dart';
 import 'package:aranduapp/ui/login/view/login_view.dart';
 import 'package:aranduapp/ui/shared/command_button.dart';
@@ -51,6 +52,7 @@ class EditDeleteUserScreen extends StatelessWidget {
                 );
               },
               onErrorCallback: (e) {
+                Log.e(e);
                 ScaffoldMessenger.of(context).showSnackBar(
                   const SnackBar(
                       content: Text('Não foi possível apagar a conta')),

diff --git a/lib/ui/edit_profile/viewmodel/edit_profile_viewmodel.dart b/lib/ui/edit_profile/viewmodel/edit_profile_viewmodel.dart
@@ -1,5 +1,6 @@
 import 'package:aranduapp/core/network/token_manager/model/user_model.dart';
 import 'package:aranduapp/core/network/token_manager/repository/auth_repository.dart';
+import 'package:aranduapp/core/network/token_manager/service/auth_service.dart';
 import 'package:aranduapp/core/state/command.dart';
 import 'package:aranduapp/ui/edit_profile/model/edit_profile_request.dart';
 import 'package:aranduapp/ui/edit_profile/service/edit_profile_service.dart';
@@ -22,6 +23,7 @@ class EditProfileViewModel extends ChangeNotifier {
     await GetIt.instance<EditProfileService>().edit(request);
 
     await GetIt.instance<AuthRepository>().clearUser();
+    await GetIt.instance<AuthService>().refreshToken();
     return Result.value(null);
   }
 

diff --git a/lib/ui/profile/view/profile_view.dart b/lib/ui/profile/view/profile_view.dart
@@ -94,7 +94,9 @@ class Profile extends StatelessWidget {
               Navigator.push(
                 context,
                 MaterialPageRoute(builder: (context) => const EditProfile()),
-              );
+              ).then((result) {
+                viewModel.getUserCommand.execute();
+              });
             },
             style: ElevatedButton.styleFrom(
               backgroundColor: Theme.of(context).colorScheme.primary,

diff --git a/lib/ui/profile/viewmodel/profile_viewmodel.dart b/lib/ui/profile/viewmodel/profile_viewmodel.dart
@@ -18,7 +18,6 @@ class ProfileViewModel extends ChangeNotifier {
 
   Future<Result<void>> logout() async {
     await StorageValue.getInstance().clear();
-    await GetIt.instance<AuthRepository>().clearUser();
 
     Log.d("Usuário deslogado com sucesso.");
     return Result.value(null);