fixed tests

Author: mdipierro

py4web/utils/auth.py

@@ -569,12 +569,9 @@ def login(self, email, password):
         # first check if we have a plugin that can check credentials
 
         for plugin in self.plugins.values():
-            print(plugin)
             if not hasattr(plugin, "get_login_url"):
                 prevent_db_lookup = True
-                print("OK")
                 if plugin.check_credentials(email, password):
-                    print("plugin accepted")
                     # if the creadentials are independently validated
                     # get of create the user (if does not exist)
                     user_info = {}
@@ -586,25 +583,28 @@ def login(self, email, password):
                     else:
                         user_info["email"] = email + "@example.com"
                     user = self.get_or_register_user(user_info)
-                    print(user)
                     break
 
         # else check against database
         if not prevent_db_lookup:
             value = email.lower()
-            field = db.auth_user.email if "@" in value else db.auth_user.username
+            field = (
+                db.auth_user.email
+                if "@" in value or not self.use_username
+                else db.auth_user.username
+            )
             user = db(field == value).select().first()
             if user and not (CRYPT()(password)[0] == user.password):
                 user = None
 
         # then check for possible login blockers
         if not user:
             error = "invalid_credentials"
-        elif (user.get("action_token") or "").startswith("pending-registration:"):
+        elif (user["action_token"] or "").startswith("pending-registration:"):
             error = "registration_is_pending"
-        elif user.get("action_token") == "account-blocked":
+        elif user["action_token"] == "account-blocked":
             error = "account_is_blocked"
-        elif user.get("action_token") == "pending-approval":
+        elif user["action_token"] == "pending-approval":
             error = "account_needs_to_be_approved"
 
         # return the error or the user
@@ -619,15 +619,12 @@ def request_reset_password(self, email, send=True, next="", route=None):
 
         db = self.db
         value = email.lower()
-        if self.use_username:
-            query = (
-                (db.auth_user.email == value)
-                if "@" in value
-                else (db.auth_user.username == value)
-            )
-        else:
-            query = db.auth_user.email == value
-        user = db(query).select().first()
+        field = (
+            db.auth_user.email
+            if "@" in value or not self.use_username
+            else self.auth_user.username
+        )
+        user = db(field == value).select().first()
         if user and user.action_token != "account-blocked":
             token = str(uuid.uuid4())
             if next:

tests/test_auth.py

@@ -90,6 +90,14 @@ def test_register(self):
 
         self.on_request()
         body = {"email": "[email protected]", "password": "1234567"}
+        self.assertEqual(
+            self.auth.action("api/login", "POST", {}, body),
+            {"status": "error", "message": "Invalid Credentials", "code": 400},
+        )
+
+        self.on_request()
+        self.on_request()
+        body = {"email": "[email protected]", "password": "123456789"}
         self.assertEqual(
             self.auth.action("api/login", "POST", {}, body),
             {"status": "error", "message": "Registration is pending", "code": 400},
@@ -106,6 +114,7 @@ def test_register(self):
         self.assertTrue(user.action_token is None)
 
         self.on_request()
+        body = {"email": "[email protected]", "password": "1234567"}
         self.assertEqual(
             self.auth.action("api/login", "POST", {}, body),
             {"status": "error", "message": "Invalid Credentials", "code": 400},