diff --git a/lib/pages/preferences_settings_page/preferences_settings_model.dart b/lib/pages/preferences_settings_page/preferences_settings_model.dart index 49ea5212..b04f9635 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_model.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_model.dart @@ -168,48 +168,7 @@ class PreferencesPageModel with ChangeNotifier { enText: 'Are you sure you want to delete your account?', ptText: 'Tem certeza que deseja deletar sua conta?', ); - onConfirm() async { - String content; - try { - await PhpGroup.deleteAccount.call().then((value) { - if (value.jsonBody['error'] == false) { - content = FFLocalizations.of(context).getVariableText( - enText: 'Account deleted successfully', - ptText: 'Conta deletada com sucesso', - ); - - StorageUtil.purge(); - - context.pop(); - context.go( - '/welcomePage', - extra: { - kTransitionInfoKey: const TransitionInfo( - hasTransition: true, - transitionType: PageTransitionType.scale, - alignment: Alignment.bottomCenter, - ), - }, - ); - } - }).catchError((err) { - context.pop(); - content = FFLocalizations.of(context).getVariableText( - enText: 'Error deleting account', - ptText: 'Erro ao deletar conta', - ); - SnackBarUtil.showSnackBar(context, content); - }); - notifyListeners(); - } catch (err) { - context.pop(); - content = FFLocalizations.of(context).getVariableText( - enText: 'Error deleting account', - ptText: 'Erro ao deletar conta', - ); - SnackBarUtil.showSnackBar(context, content, isError: true); - } - } + onConfirm() async => AuthenticationService.deleteAccount(context); showAlertDialog(context, title, content, onConfirm); } @@ -223,7 +182,7 @@ class PreferencesPageModel with ChangeNotifier { enText: 'Are you sure you want to logout?', ptText: 'Tem certeza que deseja sair?', ); - onConfirm() async => AuthenticationService.deleteAccount(context); + onConfirm() async => AuthenticationService.signOut(context); showAlertDialog(context, title, content, onConfirm); } diff --git a/lib/shared/services/authentication/authentication_service.dart b/lib/shared/services/authentication/authentication_service.dart index 565d2bbd..ceb8ab31 100644 --- a/lib/shared/services/authentication/authentication_service.dart +++ b/lib/shared/services/authentication/authentication_service.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; +import 'package:hub/shared/utils/snackbar_util.dart'; import '../../../backend/api_requests/api_calls.dart'; import '../../../flutter_flow/flutter_flow_util.dart'; @@ -181,17 +182,43 @@ class AuthenticationService { } static Future deleteAccount(BuildContext context) async { - StorageUtil.purge(); - context.go( - '/welcomePage', - extra: { - kTransitionInfoKey: const TransitionInfo( - hasTransition: true, - transitionType: PageTransitionType.scale, - alignment: Alignment.bottomCenter, - ), - }, - ); + String content; + try { + await PhpGroup.deleteAccount.call().then((value) { + if (value.jsonBody['error'] == false) { + content = FFLocalizations.of(context).getVariableText( + enText: 'Account deleted successfully', + ptText: 'Conta deletada com sucesso', + ); + StorageUtil.purge(); + context.pop(); + context.go( + '/welcomePage', + extra: { + kTransitionInfoKey: const TransitionInfo( + hasTransition: true, + transitionType: PageTransitionType.scale, + alignment: Alignment.bottomCenter, + ), + }, + ); + } + }).catchError((err) { + context.pop(); + content = FFLocalizations.of(context).getVariableText( + enText: 'Error deleting account', + ptText: 'Erro ao deletar conta', + ); + SnackBarUtil.showSnackBar(context, content); + }); + } catch (err) { + context.pop(); + content = FFLocalizations.of(context).getVariableText( + enText: 'Error deleting account', + ptText: 'Erro ao deletar conta', + ); + SnackBarUtil.showSnackBar(context, content, isError: true); + } } } \ No newline at end of file