Merge branch 'develop' into 'main'

chore: Update user register

See merge request locker/api-core!618

Author: khaitranquang

locker_server/api/v1_0/users/serializers.py

@@ -92,7 +92,7 @@ class UserRegisterSerializer(serializers.Serializer):
     enterprise_name = serializers.CharField(required=False, allow_null=True)
 
     def validate(self, data):
-        kdf_type = data.get("kdf_type", KDF_TYPE_PBKDF2_SHA256)
+        kdf_type = data.get("kdf", KDF_TYPE_PBKDF2_SHA256)
         if not KDF_TYPE.get(kdf_type):
             raise serializers.ValidationError(detail={"kdf": ["This KDF Type is not valid"]})
         kdf_iterations = data.get("kdf_iterations", DEFAULT_KDF_ITERATIONS)
@@ -267,7 +267,7 @@ class UserResetPasswordSerializer(serializers.Serializer):
     login_method = serializers.ChoiceField(choices=[LOGIN_METHOD_PASSWORD, LOGIN_METHOD_PASSWORDLESS])
 
     def validate(self, data):
-        kdf_type = data.get("kdf_type", KDF_TYPE_PBKDF2_SHA256)
+        kdf_type = data.get("kdf", KDF_TYPE_PBKDF2_SHA256)
         if not KDF_TYPE.get(kdf_type):
             raise serializers.ValidationError(detail={"kdf": ["This KDF Type is not valid"]})
         kdf_iterations = data.get("kdf_iterations")

locker_server/core/services/user_service.py

@@ -28,7 +28,8 @@
 from locker_server.core.repositories.user_plan_repository import UserPlanRepository
 from locker_server.core.repositories.user_repository import UserRepository
 from locker_server.shared.caching.sync_cache import get_sync_cache_key
-from locker_server.shared.constants.account import LOGIN_METHOD_PASSWORD
+from locker_server.shared.constants.account import LOGIN_METHOD_PASSWORD, DEFAULT_KDF_ITERATIONS
+from locker_server.shared.constants.ciphers import KDF_TYPE_PBKDF2_SHA256
 from locker_server.shared.constants.enterprise_members import *
 from locker_server.shared.constants.event import EVENT_USER_LOGIN_FAILED, EVENT_USER_LOGIN, EVENT_USER_BLOCK_LOGIN
 from locker_server.shared.constants.factor2 import FA2_METHOD_MAIL_OTP
@@ -174,8 +175,8 @@ def register_user(self, user_id: Union[str, int], master_password_hash: str, key
         is_password_changed = True if default_plan == PLAN_TYPE_PM_ENTERPRISE else False
         master_password_score = kwargs.get("score") or kwargs.get("master_password_score") or user.master_password_score
         user_new_creation_data = {
-            "kdf": kwargs.get("kdf", 0),
-            "kdf_iterations": kwargs.get("kdf_iterations", 100000),
+            "kdf": kwargs.get("kdf", KDF_TYPE_PBKDF2_SHA256),
+            "kdf_iterations": kwargs.get("kdf_iterations", DEFAULT_KDF_ITERATIONS),
             "kdf_memory": kwargs.get("kdf_memory"),
             "kdf_parallelism": kwargs.get("kdf_parallelism"),
             "key": key,