refactor(code_verification): abort_if_invalid

allauth/account/internal/flows/code_verification.py

@@ -53,6 +53,12 @@ def record_invalid_attempt(self) -> bool:
         self.persist()
         return True
 
+    def abort_if_invalid(self):
+        if not self.is_valid():
+            self.abort()
+            return None
+        return self
+
     def is_valid(self) -> bool:
         return time.time() - self.state["at"] <= self.timeout
 

allauth/account/internal/flows/email_verification_by_code.py

@@ -90,6 +90,4 @@ def resume(cls, request):
         if not state:
             return None
         process = EmailVerificationProcess(request=request, state=state)
-        if not process.is_valid():
-            return None
-        return process
+        return process.abort_if_invalid()

allauth/account/internal/flows/login_by_code.py

@@ -97,6 +97,4 @@ def initiate(cls, *, request, user, email: str, stage=None):
     @classmethod
     def resume(cls, stage):
         process = LoginCodeVerificationProcess(stage=stage)
-        if not process.is_valid():
-            return None
-        return process
+        return process.abort_if_invalid()

allauth/account/internal/flows/password_reset_by_code.py

@@ -76,6 +76,4 @@ def resume(
         if not state:
             return None
         process = PasswordResetVerificationProcess(request, state=state)
-        if not process.is_valid():
-            return None
-        return process
+        return process.abort_if_invalid()