raise validation errors

ocadotechnology · Sep 18, 2023 · fe4edb2 · fe4edb2
1 parent 78f5ef0
commit fe4edb2
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/backend/api/forms.py b/backend/api/forms.py
@@ -14,6 +14,12 @@ def __init__(self, request: WSGIRequest, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def clean(self):
+        if self.errors:
+            raise ValidationError(
+                "Found form errors. Skipping authentication.",
+                code="form_errors",
+            )
+
         self.user = authenticate(
             self.request,
             **{key: self.cleaned_data[key] for key in self.fields.keys()}
@@ -23,7 +29,11 @@ def clean(self):
                 self.get_invalid_login_error_message(),
                 code="invalid_login",
             )
-        # TODO: confirm if we should return error message if is_active=False
+        elif not self.user.is_active:
+            raise ValidationError(
+                "User is not active",
+                code="user_not_active",
+            )
 
         return self.cleaned_data