Username field swapped with Login for auth-ing, 1st/last names removed from registration.

Author: Kulv3r

genesis_core/tests/functional/restapi/iam/test_users.py

@@ -48,6 +48,55 @@ def test_create_user_space_login_400_error(self, user_api_noauth_client):
         with pytest.raises(bazooka_exc.BadRequestError):
             client.create_user(username=" ", password="test")
 
+    def test_create_user_without_first_last_name_success(
+        self, user_api_noauth_client
+    ):
+        client = user_api_noauth_client()
+        for empty_name in ["", None]:
+            name = f"test_no_names_{empty_name}".lower()
+            user = client.create_user(
+                username=name,
+                password="password",
+                first_name=empty_name,
+                last_name=empty_name,
+            )
+            assert user["username"] == name
+            assert user["first_name"] == ""
+            assert user["last_name"] == ""
+
+    def test_update_user_clear_first_last_name_success(
+        self, user_api_client, auth_test1_user
+    ):
+        client = user_api_client(auth_test1_user)
+        for empty_name in ["", None]:
+            result = client.update_user(
+                auth_test1_user.uuid,
+                first_name=empty_name,
+                last_name=empty_name,
+            )
+            assert result.get("first_name", None) == empty_name
+            assert result.get("last_name", None) == empty_name
+
+    def test_me_endpoint_with_empty_names_success(
+        self, user_api_client, auth_test1_user
+    ):
+        client = user_api_client(auth_test1_user)
+
+        # First clear the names
+        client.update_user(
+            auth_test1_user.uuid,
+            first_name="",
+            last_name="",
+        )
+
+        # Verify in /me endpoint
+        result = client.get(
+            auth_test1_user.get_me_url(client.endpoint),
+        ).json()
+
+        assert result["user"]["first_name"] == ""
+        assert result["user"]["last_name"] == ""
+
     def test_create_user_and_check_roles(
         self, user_api_client, auth_test1_user
     ):
@@ -139,15 +188,6 @@ def test_update_my_user_test1_auth_success(
 
         assert result["username"] == "testxxx"
 
-    def test_update_my_user_400_error(self, user_api_client, auth_test1_user):
-        client = user_api_client(auth_test1_user)
-
-        with pytest.raises(bazooka_exc.BadRequestError):
-            client.update_user(
-                auth_test1_user.uuid,
-                first_name="",
-            )
-
     def test_update_other_user_test1_auth_forbidden(
         self, user_api_client, auth_test1_user, auth_test2_user
     ):
@@ -354,3 +394,36 @@ def test_fields_in_me_info_success(
         for field in user_has_only_fields:
             result["user"].pop(field)
         assert result["user"] == {}
+
+    def test_login_success(self, user_api_noauth_client, auth_test1_user):
+        client = user_api_noauth_client()
+        for login in [auth_test1_user.username, auth_test1_user.email]:
+            response = client.login(
+                login=login,
+                password="test1",
+            )
+            assert "access_token" in response
+
+    def test_login_with_invalid_login_404_error(self, user_api_noauth_client):
+        client = user_api_noauth_client()
+        for login in ["nonexistent_user", "nonexistent@mail.com", "", " " * 8]:
+            with pytest.raises(bazooka_exc.NotFoundError):
+                client.login(login=login, password="password")
+
+    def test_login_with_wrong_password_400_error(
+        self, user_api_noauth_client, auth_test1_user
+    ):
+        client = user_api_noauth_client()
+        for password in ["wrong_password", "", " " * 8]:
+            with pytest.raises(bazooka_exc.BadRequestError):
+                client.login(login=auth_test1_user.email, password=password)
+
+    def test_login_case_insensitive_username(
+        self, user_api_noauth_client, auth_test1_user
+    ):
+        client = user_api_noauth_client()
+        response = client.login(
+            login=auth_test1_user.username.upper(),
+            password="test1",
+        )
+        assert "access_token" in response

genesis_core/tests/unit/user_api/iam/dm/test_types.py

@@ -30,7 +30,7 @@ def test_instance(self):
         params=[
             ("u", True),
             ("用户123!", True),
-            ("test+user@domain.com", True),
+            ("test+user@domain.com", False),
             ("a#b$c%&'*", True),
             ("~underscore_", True),
             ("john.doe{2023}", True),
@@ -42,7 +42,7 @@ def test_instance(self):
             ("pipe|symbol", True),
             ("tilde~wave", True),
             ("dash-test", True),
-            ("123.45@domain", True),
+            ("123.45@domain", False),
             ("أحمد_2023", True),
             ("", False),
             (" space ", False),
@@ -56,8 +56,6 @@ def test_instance(self):
             ("angle<tag", False),
             ("comma,separated", False),
             ("dash-", True),  # Дефис в конце разрешен
-            ("@start-with", True),  # @ в начале разрешен
-            ("user@", True),  # @ в конце разрешен
             ("a\nb", False),
         ],
     )

genesis_core/user_api/iam/api/controllers.py

@@ -546,7 +546,7 @@ def get_token(self, resource, grant_type, **kwargs):
                 client_secret=client_secret,
             )
             token = resource.get_token_by_password(
-                username=kwargs.get(c.PARAM_USERNAME),
+                login=kwargs.get(c.PARAM_LOGIN),
                 password=kwargs.get(c.PARAM_PASSWORD),
                 scope=kwargs.get(c.PARAM_SCOPE, ""),
                 ttl=kwargs.get(c.PARAM_TTL, None),

genesis_core/user_api/iam/constants.py

@@ -35,7 +35,7 @@
 
 
 # user creds in request
-PARAM_USERNAME = "username"
+PARAM_LOGIN = "login"
 PARAM_PASSWORD = "password"
 PARAM_SCOPE = "scope"
 PARAM_TTL = "ttl"

genesis_core/user_api/iam/dm/models.py

@@ -169,13 +169,13 @@ class User(
     )
 
     first_name = properties.property(
-        types.Name(min_length=1, max_length=128),
-        required=True,
+        types.Name(min_length=0, max_length=128),
+        default="",
     )
 
     last_name = properties.property(
-        types.Name(min_length=1, max_length=128),
-        required=True,
+        types.Name(min_length=0, max_length=128),
+        default="",
     )
     surname = properties.property(
         types.Name(min_length=0, max_length=128),
@@ -990,7 +990,7 @@ def validate_client_creds(self, client_id, client_secret):
 
     def get_token_by_password(
         self,
-        username,
+        login,
         password,
         scope=iam_c.PARAM_SCOPE_DEFAULT,
         ttl=None,
@@ -1011,9 +1011,9 @@ def get_token_by_password(
             if refresh_ttl is not None
             else Token.get_default_refresh_expiration_delta()
         )
-        for user in User.objects.get_all(
-            filters={"name": ra_filters.EQ(username)}
-        ):
+        lookup_field = "email" if "@" in login else "name"
+        filters = {lookup_field: ra_filters.EQ(login)}
+        for user in User.objects.get_all(filters=filters):
             user.validate_secret(secret=password)
             if user.otp_enabled and not user.validate_otp(otp_code):
                 raise iam_e.OTPInvalidCodeError()
@@ -1029,8 +1029,8 @@ def get_token_by_password(
             )
             token.insert()
             return token
-        else:
-            raise iam_exceptions.UserNotFound(username=username)
+
+        raise iam_exceptions.UserNotFound(login=login)
 
     def get_token_by_refresh_token(self, refresh_token, scope=None):
         context = contexts.get_context()

genesis_core/user_api/iam/dm/types.py

@@ -23,7 +23,7 @@ class Username(types.BaseCompiledRegExpType):
 
     def __init__(self, min_length=1, max_length=128):
         pattern = re.compile(
-            r"^[\w!#$%&\'*+/=?^_`{|}~.@-]+$",
+            r"^[\w!#$%&\'*+/=?^_`{|}~.-]+$",
             flags=re.UNICODE,
         )
         super().__init__(pattern=pattern)

genesis_core/user_api/iam/exceptions.py

@@ -20,7 +20,7 @@
 
 
 class UserNotFound(exceptions.CommonNotFoundException):
-    __template__ = "User with login {username} not found"
+    __template__ = "User with login {login} not found"
 
 
 class CanNotSetOwner(exceptions.CommonForbiddenException, iam_exc.Forbidden):

migrations/0022-nullable-user-fio-fcf9b5.py

@@ -0,0 +1,64 @@
+# Copyright 2016 Eugene Frolov <eugene@frolov.net.ru>
+#
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from restalchemy.storage.sql import migrations
+
+
+class MigrationStep(migrations.AbstarctMigrationStep):
+
+    def __init__(self):
+        self._depends = ["0021-dns-permissions-7adac7.py"]
+
+    @property
+    def migration_id(self):
+        return "fcf9b5f7-c351-43e4-af94-f73cef52472d"
+
+    @property
+    def is_manual(self):
+        return False
+
+    def upgrade(self, session):
+        # Migration to make first_name and last_name nullable in iam_users table
+        session.execute(
+            """
+            ALTER TABLE "iam_users"
+            ALTER COLUMN "first_name" DROP NOT NULL,
+            ALTER COLUMN "last_name" DROP NOT NULL;
+            """
+        )
+
+    def downgrade(self, session):
+        # Reverse migration to make first_name and last_name NOT NULL with empty string default
+        session.execute(
+            """
+            -- First update any existing NULL values to empty string
+            UPDATE "iam_users" 
+            SET "first_name" = '' 
+            WHERE "first_name" IS NULL;
+            
+            UPDATE "iam_users" 
+            SET "last_name" = '' 
+            WHERE "last_name" IS NULL;
+            
+            -- Then alter the columns to be NOT NULL
+            ALTER TABLE "iam_users" 
+            ALTER COLUMN "first_name" SET NOT NULL,
+            ALTER COLUMN "last_name" SET NOT NULL;
+            """
+        )
+
+
+migration_step = MigrationStep()