square-authentication 6.1.0__py3-none-any.whl → 6.2.1__py3-none-any.whl

square_authentication/routes/core.py

@@ -13,12 +13,14 @@ from square_commons import get_api_output_in_standard_format
 from square_database_helper.pydantic_models import FilterConditionsV0, FiltersV0
 from square_database_structure.square import global_string_database_name
 from square_database_structure.square.authentication import global_string_schema_name
+from square_database_structure.square.authentication.enums import RecoveryMethodEnum
 from square_database_structure.square.authentication.tables import (
     User,
     UserApp,
     UserCredential,
     UserSession,
     UserProfile,
+    UserRecoveryMethod,
 )
 from square_database_structure.square.public import (
     global_string_schema_name as global_string_public_schema_name,
@@ -68,11 +70,7 @@ async def register_username_v0(
         validation
         """
         # validation for username
-        # ^(?!.*[_-]{2})           # no consecutive _ or -
-        # [a-z]                    # must start with a lowercase letter
-        # (?:[a-z0-9_-]{1,18})     # 1–18 of lowercase, digits, _ or -
-        # [a-z]$                   # must end with a lowercase letter
-        username_pattern = re.compile(r"^(?!.*[._-]{2})[a-z][a-z0-9_-]{1,18}[a-z]$")
+        username_pattern = re.compile(r"^[a-z0-9._-]{2,20}$")
         if not username_pattern.match(username):
             output_content = get_api_output_in_standard_format(
                 message=messages["USERNAME_INVALID"],
@@ -1116,12 +1114,8 @@ async def update_username_v0(
         user_id = local_dict_access_token_payload["user_id"]
 
         # validation for username
-        # ^(?!.*[_-]{2})           # no consecutive _ or -
-        # [a-z]                    # must start with a lowercase letter
-        # (?:[a-z0-9_-]{1,18})     # 1–18 of lowercase, digits, _ or -
-        # [a-z]$                   # must end with a lowercase letter
         new_username = new_username.lower()
-        username_pattern = re.compile(r"^(?!.*[._-]{2})[a-z][a-z0-9_-]{1,18}[a-z]$")
+        username_pattern = re.compile(r"^[a-z0-9._-]{2,20}$")
         if not username_pattern.match(new_username):
             output_content = get_api_output_in_standard_format(
                 message=messages["USERNAME_INVALID"],
@@ -1540,3 +1534,149 @@ async def validate_and_get_payload_from_token_v0(
         return JSONResponse(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, content=output_content
         )
+
+
+@router.patch("/update_user_recovery_methods/v0")
+@global_object_square_logger.auto_logger()
+async def update_user_recovery_methods_v0(
+    access_token: Annotated[str, Header()],
+    recovery_methods_to_add: List[RecoveryMethodEnum],
+    recovery_methods_to_remove: List[RecoveryMethodEnum],
+):
+    try:
+
+        """
+        validation
+        """
+        # validate access token
+        try:
+            local_dict_access_token_payload = get_jwt_payload(
+                access_token, config_str_secret_key_for_access_token
+            )
+        except Exception as error:
+            output_content = get_api_output_in_standard_format(
+                message=messages["INCORRECT_ACCESS_TOKEN"], log=str(error)
+            )
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=output_content,
+            )
+        user_id = local_dict_access_token_payload["user_id"]
+
+        recovery_methods_to_add = list(set(x.value for x in recovery_methods_to_add))
+        recovery_methods_to_remove = list(
+            set(x.value for x in recovery_methods_to_remove)
+        )
+
+        # check if recovery_methods_to_add and recovery_methods_to_remove don't have common ids.
+        local_list_common_recovery_methods = set(recovery_methods_to_add) & set(
+            recovery_methods_to_remove
+        )
+        if len(local_list_common_recovery_methods) > 0:
+            output_content = get_api_output_in_standard_format(
+                message=messages["GENERIC_400"],
+                log=f"invalid recovery_methods: {list(local_list_common_recovery_methods)}, present in both add list and remove list.",
+            )
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=output_content,
+            )
+
+        """
+        main process
+        """
+        # logic for adding new recovery_methods
+        local_list_response_user_recovery_methods = (
+            global_object_square_database_helper.get_rows_v0(
+                database_name=global_string_database_name,
+                schema_name=global_string_schema_name,
+                table_name=UserRecoveryMethod.__tablename__,
+                filters=FiltersV0(
+                    root={
+                        UserRecoveryMethod.user_id.name: FilterConditionsV0(eq=user_id)
+                    }
+                ),
+            )["data"]["main"]
+        )
+        local_list_new_recovery_methods = [
+            {
+                UserRecoveryMethod.user_id.name: user_id,
+                UserRecoveryMethod.user_recovery_method_name.name: x,
+            }
+            for x in recovery_methods_to_add
+            if x
+            not in [
+                y[UserRecoveryMethod.user_recovery_method_name.name]
+                for y in local_list_response_user_recovery_methods
+            ]
+        ]
+        if len(local_list_new_recovery_methods) > 0:
+            global_object_square_database_helper.insert_rows_v0(
+                database_name=global_string_database_name,
+                schema_name=global_string_schema_name,
+                table_name=UserRecoveryMethod.__tablename__,
+                data=local_list_new_recovery_methods,
+            )
+
+        # logic for removing recovery_methods
+        global_object_square_database_helper.delete_rows_v0(
+            database_name=global_string_database_name,
+            schema_name=global_string_schema_name,
+            table_name=UserRecoveryMethod.__tablename__,
+            filters=FiltersV0(
+                root={
+                    UserRecoveryMethod.user_id.name: FilterConditionsV0(eq=user_id),
+                    UserRecoveryMethod.user_recovery_method_name.name: FilterConditionsV0(
+                        in_=recovery_methods_to_remove
+                    ),
+                }
+            ),
+        )
+
+        """
+        return value
+        """
+        # get latest recovery_methods
+        local_list_response_user_recovery_methods = (
+            global_object_square_database_helper.get_rows_v0(
+                database_name=global_string_database_name,
+                schema_name=global_string_schema_name,
+                table_name=UserRecoveryMethod.__tablename__,
+                filters=FiltersV0(
+                    root={
+                        UserRecoveryMethod.user_id.name: FilterConditionsV0(eq=user_id)
+                    }
+                ),
+            )["data"]["main"]
+        )
+        output_content = get_api_output_in_standard_format(
+            message=messages["GENERIC_UPDATE_SUCCESSFUL"],
+            data={
+                "main": [
+                    x[UserRecoveryMethod.user_recovery_method_name.name]
+                    for x in local_list_response_user_recovery_methods
+                ]
+            },
+        )
+        return JSONResponse(
+            status_code=status.HTTP_200_OK,
+            content=output_content,
+        )
+    except HTTPException as http_exception:
+        global_object_square_logger.logger.error(http_exception, exc_info=True)
+        return JSONResponse(
+            status_code=http_exception.status_code, content=http_exception.detail
+        )
+    except Exception as e:
+        """
+        rollback logic
+        """
+        global_object_square_logger.logger.error(e, exc_info=True)
+        output_content = get_api_output_in_standard_format(
+            message=messages["GENERIC_500"],
+            log=str(e),
+        )
+        return JSONResponse(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            content=output_content,
+        )

{square_authentication-6.1.0.dist-info → square_authentication-6.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: square_authentication
-Version: 6.1.0
+Version: 6.2.1
 Summary: authentication layer for my personal server.
 Home-page: https://github.com/thepmsquare/square_authentication
 Author: thePmSquare
@@ -53,6 +53,16 @@ pip install square_authentication
 
 ## changelog
 
+### v6.2.1
+
+- core
+  - tweak validation for username in register_username_v0 and update_username_v0.
+
+### v6.2.0
+
+- core
+    - add update_user_recovery_methods_v0.
+
 ### v6.1.0
 
 - add validation to username in register_username_v0 and update_username_v0.

{square_authentication-6.1.0.dist-info → square_authentication-6.2.1.dist-info}/RECORD

@@ -7,13 +7,13 @@ square_authentication/data/config.testing.ini,sha256=KB4PMPZ6a9yJGPXYJWwKlYcNET1
 square_authentication/pydantic_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 square_authentication/pydantic_models/core.py,sha256=qeNETcJv7mnRKGhATOW2bg0NlHuyzvot1dZ1b1qqhwU,610
 square_authentication/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_authentication/routes/core.py,sha256=Gu7Z6gcQqKqXOwT-uHYWBJHWvJ_CVVT7BQC-afhwGyU,58717
+square_authentication/routes/core.py,sha256=7KqTA3y6CedH7XelV2HBCkne4Bql9p31OzSeioguhE0,63838
 square_authentication/routes/profile.py,sha256=3b-PtMaD9cxvf112MOn9rPu5F2KG4sRxAbuPvll8dUU,6216
 square_authentication/routes/utility.py,sha256=KDr8KdkT0jAGPjfP-b5XXYG7p49WU7J1FiK6oSIckQI,1779
 square_authentication/utils/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 square_authentication/utils/encryption.py,sha256=WakaiEAgWpTJltxBzqOtv81_DCDKfzJqt60fWSPoNvo,2027
 square_authentication/utils/token.py,sha256=t-RPBY4cYyT1ro3lkLBTOy2BeRGBfluBVBivL5DLmDg,680
-square_authentication-6.1.0.dist-info/METADATA,sha256=Q6YHK0bIbx0Zs1AkqRjwJZG3aXNBMQdsBdtp7n-GfhE,5334
-square_authentication-6.1.0.dist-info/WHEEL,sha256=QZxptf4Y1BKFRCEDxD4h2V0mBFQOVFLFEpvxHmIs52A,91
-square_authentication-6.1.0.dist-info/top_level.txt,sha256=wDssVJIl9KIEJPj5rR3rv4uRI7yCndMBrvHd_6BGXQA,22
-square_authentication-6.1.0.dist-info/RECORD,,
+square_authentication-6.2.1.dist-info/METADATA,sha256=Fm26I8AcPJiMOGrzo-P3vwIbuw3W7rEsXwtqEpub5FY,5499
+square_authentication-6.2.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+square_authentication-6.2.1.dist-info/top_level.txt,sha256=wDssVJIl9KIEJPj5rR3rv4uRI7yCndMBrvHd_6BGXQA,22
+square_authentication-6.2.1.dist-info/RECORD,,

{square_authentication-6.1.0.dist-info → square_authentication-6.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.6.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any