dispose security features added

NearHuscarl · Oct 11, 2023 · 2183317 · 2183317
1 parent 76ad458
commit 2183317
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 63 deletions.
diff --git a/lib/src/widgets/cards/login_card.dart b/lib/src/widgets/cards/login_card.dart
@@ -212,6 +212,58 @@ class _LoginCardState extends State<_LoginCard> with TickerProviderStateMixin {
     setState(() => _isSubmitting = false);
   }
 
+  Future<bool> _submit() async {
+    FocusScope.of(context).unfocus();
+
+    final messages = Provider.of<LoginMessages>(context, listen: false);
+
+    if (!_formKey.currentState!.validate()) {
+      return false;
+    }
+    _formKey.currentState!.save();
+    setState(() => _isSubmitting = true);
+    await _submitController.forward();
+    final auth = Provider.of<Auth>(context, listen: false);
+    String? error;
+
+    auth.authType = AuthType.userPassword;
+
+    if (auth.isLogin) {
+      error = await auth.onLogin?.call(
+        LoginData(
+          name: auth.email,
+          password: auth.password,
+        ),
+      );
+    } else {
+      if (!widget.requireAdditionalSignUpFields) {
+        error = await auth.onSignup!(
+          SignupData.fromSignupForm(
+            name: auth.email,
+            password: auth.password,
+            termsOfService: auth.getTermsOfServiceResults(),
+          ),
+        );
+      } else {
+        if (auth.beforeAdditionalFieldsCallback != null) {
+          error = await auth.beforeAdditionalFieldsCallback!(
+            SignupData.fromSignupForm(
+              name: auth.email,
+              password: auth.password,
+              termsOfService: auth.getTermsOfServiceResults(),
+            ),
+          );
+        }
+      }
+    }
+
+    if (widget.isBlocPattern == true) {
+      return true;
+    } else {
+      return _continueSubmit(auth, messages, error);
+    }
+  }
+
   Future<bool> _continueSubmit(
       Auth auth, LoginMessages messages, String? error) async {
     // workaround to run after _cardSizeAnimation in parent finished
@@ -278,59 +330,6 @@ class _LoginCardState extends State<_LoginCard> with TickerProviderStateMixin {
     return true;
   }
 
-  Future<bool> _submit() async {
-    FocusScope.of(context).unfocus();
-
-    final messages = Provider.of<LoginMessages>(context, listen: false);
-
-    if (!_formKey.currentState!.validate()) {
-      return false;
-    }
-
-    _formKey.currentState!.save();
-    await _submitController.forward();
-    setState(() => _isSubmitting = true);
-    final auth = Provider.of<Auth>(context, listen: false);
-    String? error;
-
-    auth.authType = AuthType.userPassword;
-
-    if (auth.isLogin) {
-      error = await auth.onLogin?.call(
-        LoginData(
-          name: auth.email,
-          password: auth.password,
-        ),
-      );
-    } else {
-      if (!widget.requireAdditionalSignUpFields) {
-        error = await auth.onSignup!(
-          SignupData.fromSignupForm(
-            name: auth.email,
-            password: auth.password,
-            termsOfService: auth.getTermsOfServiceResults(),
-          ),
-        );
-      } else {
-        if (auth.beforeAdditionalFieldsCallback != null) {
-          error = await auth.beforeAdditionalFieldsCallback!(
-            SignupData.fromSignupForm(
-              name: auth.email,
-              password: auth.password,
-              termsOfService: auth.getTermsOfServiceResults(),
-            ),
-          );
-        }
-      }
-    }
-
-    if (widget.isBlocPattern == true) {
-      return true;
-    } else {
-      return _continueSubmit(auth, messages, error);
-    }
-  }
-
   Future<bool> _loginProviderSubmit({
     required LoginProvider loginProvider,
     AnimationController? control,

diff --git a/lib/src/widgets/cards/recover_card.dart b/lib/src/widgets/cards/recover_card.dart
@@ -60,31 +60,27 @@ class _RecoverCardState extends State<_RecoverCard>
       duration: const Duration(milliseconds: 1000),
     );
     if (widget.isBlocPattern!) {
-      widget.stateController!.addListener(() => handleRecoverCard());
+      widget.stateController!.addListener(_endSubmit);
     }
   }
 
   @override
   void dispose() {
     _submitController.dispose();
     if (widget.isBlocPattern!) {
-      widget.stateController!.removeListener(() => handleRecoverCard());
+      widget.stateController!.removeListener(_endSubmit);
     }
     super.dispose();
   }
 
-  void handleRecoverCard() {
+  Future<void> _endSubmit() async {
     if (widget.stateController!.state == failureState ||
         widget.stateController!.state == successfulState && _isSubmitting) {
-      _endSubmit();
+      await _submitController.reverse();
+      setState(() => _isSubmitting = false);
     }
   }
 
-  Future<void> _endSubmit() async {
-    await _submitController.reverse();
-    setState(() => _isSubmitting = false);
-  }
-
   Future<bool> _submit() async {
     if (!_formRecoverKey.currentState!.validate()) {
       return false;
@@ -93,8 +89,8 @@ class _RecoverCardState extends State<_RecoverCard>
     final messages = Provider.of<LoginMessages>(context, listen: false);
 
     _formRecoverKey.currentState!.save();
-    await _submitController.forward();
     setState(() => _isSubmitting = true);
+    await _submitController.forward();
     if (widget.isBlocPattern!) {
       await auth.onRecoverPassword!(auth.email);
       return true;