square-authentication 5.1.1__py3-none-any.whl → 5.1.3__py3-none-any.whl

square_authentication/routes/core.py

@@ -17,6 +17,7 @@ from square_database_structure.square.authentication.tables import (
     UserApp,
     UserCredential,
     UserSession,
+    UserProfile,
 )
 from square_database_structure.square.public import (
     global_string_schema_name as global_string_public_schema_name,
@@ -73,24 +74,35 @@ async def register_username_v0(
         """
         validation
         """
-
         # validation for username
-        local_list_response_user_creds = global_object_square_database_helper.get_rows_v0(
-            database_name=global_string_database_name,
-            schema_name=global_string_schema_name,
-            table_name=UserCredential.__tablename__,
-            filters=FiltersV0(
-                root={
-                    UserCredential.user_credential_username.name: FilterConditionsV0(
-                        eq=username
-                    )
-                }
-            ),
-        )[
-            "data"
-        ][
-            "main"
-        ]
+        local_list_response_user_profile = (
+            global_object_square_database_helper.get_rows_v0(
+                database_name=global_string_database_name,
+                schema_name=global_string_schema_name,
+                table_name=UserProfile.__tablename__,
+                filters=FiltersV0(
+                    root={
+                        UserProfile.user_profile_username.name: FilterConditionsV0(
+                            eq=username
+                        )
+                    }
+                ),
+            )["data"]["main"]
+        )
+        local_list_response_user_creds = (
+            global_object_square_database_helper.get_rows_v0(
+                database_name=global_string_database_name,
+                schema_name=global_string_schema_name,
+                table_name=UserCredential.__tablename__,
+                filters=FiltersV0(
+                    root={
+                        UserCredential.user_id.name: FilterConditionsV0(
+                            eq=local_list_response_user_profile[0][UserProfile.user_id.name]
+                        )
+                    }
+                ),
+            )["data"]["main"]
+        )
         if len(local_list_response_user_creds) > 0:
             output_content = get_api_output_in_standard_format(
                 message=messages["USERNAME_ALREADY_EXISTS"],
@@ -124,7 +136,6 @@ async def register_username_v0(
             data=[
                 {
                     UserCredential.user_id.name: local_str_user_id,
-                    UserCredential.user_credential_username.name: username,
                     UserCredential.user_credential_hashed_password.name: local_str_hashed_password,
                 }
             ],
@@ -132,6 +143,17 @@ async def register_username_v0(
             schema_name=global_string_schema_name,
             table_name=UserCredential.__tablename__,
         )
+        global_object_square_database_helper.insert_rows_v0(
+            data=[
+                {
+                    UserProfile.user_id.name: local_str_user_id,
+                    UserProfile.user_profile_username.name: username,
+                }
+            ],
+            database_name=global_string_database_name,
+            schema_name=global_string_schema_name,
+            table_name=UserProfile.__tablename__,
+        )
         if app_id is not None:
             # assign app to user
             global_object_square_database_helper.insert_rows_v0(
@@ -278,13 +300,13 @@ async def get_user_details_v0(
                 root={UserApp.user_id.name: FilterConditionsV0(eq=user_id)}
             ),
         )["data"]["main"]
-        local_list_response_user_credentials = (
+        local_list_response_user_profile = (
             global_object_square_database_helper.get_rows_v0(
                 database_name=global_string_database_name,
                 schema_name=global_string_schema_name,
-                table_name=UserCredential.__tablename__,
+                table_name=UserProfile.__tablename__,
                 filters=FiltersV0(
-                    root={UserCredential.user_id.name: FilterConditionsV0(eq=user_id)}
+                    root={UserProfile.user_id.name: FilterConditionsV0(eq=user_id)}
                 ),
             )["data"]["main"]
         )
@@ -309,8 +331,8 @@ async def get_user_details_v0(
         return_this = {
             "user_id": user_id,
             "credentials": {
-                "username": local_list_response_user_credentials[0][
-                    UserCredential.user_credential_username.name
+                "username": local_list_response_user_profile[0][
+                    UserProfile.user_profile_username.name
                 ],
             },
             "apps": [
@@ -539,22 +561,20 @@ async def login_username_v0(body: LoginUsernameV0):
         validation
         """
         # validation for username
-        local_list_authentication_user_response = global_object_square_database_helper.get_rows_v0(
-            database_name=global_string_database_name,
-            schema_name=global_string_schema_name,
-            table_name=UserCredential.__tablename__,
-            filters=FiltersV0(
-                root={
-                    UserCredential.user_credential_username.name: FilterConditionsV0(
-                        eq=username
-                    )
-                }
-            ),
-        )[
-            "data"
-        ][
-            "main"
-        ]
+        local_list_authentication_user_response = (
+            global_object_square_database_helper.get_rows_v0(
+                database_name=global_string_database_name,
+                schema_name=global_string_schema_name,
+                table_name=UserProfile.__tablename__,
+                filters=FiltersV0(
+                    root={
+                        UserProfile.user_profile_username.name: FilterConditionsV0(
+                            eq=username
+                        )
+                    }
+                ),
+            )["data"]["main"]
+        )
         if len(local_list_authentication_user_response) != 1:
             output_content = get_api_output_in_standard_format(
                 message=messages["INCORRECT_USERNAME"],
@@ -840,9 +860,7 @@ async def logout_v0(
             )
         # validating if the refresh token is valid, active and of the same user.
         try:
-            local_dict_refresh_token_payload = get_jwt_payload(
-                refresh_token, config_str_secret_key_for_refresh_token
-            )
+            _ = get_jwt_payload(refresh_token, config_str_secret_key_for_refresh_token)
         except Exception as error:
             output_content = get_api_output_in_standard_format(
                 message=messages["INCORRECT_REFRESH_TOKEN"],
@@ -1102,22 +1120,20 @@ async def update_username_v0(
             )
 
         # validate new username
-        local_list_user_credentials_response = global_object_square_database_helper.get_rows_v0(
-            database_name=global_string_database_name,
-            schema_name=global_string_schema_name,
-            table_name=UserCredential.__tablename__,
-            filters=FiltersV0(
-                root={
-                    UserCredential.user_credential_username.name: FilterConditionsV0(
-                        eq=new_username
-                    ),
-                }
-            ),
-        )[
-            "data"
-        ][
-            "main"
-        ]
+        local_list_user_credentials_response = (
+            global_object_square_database_helper.get_rows_v0(
+                database_name=global_string_database_name,
+                schema_name=global_string_schema_name,
+                table_name=UserProfile.__tablename__,
+                filters=FiltersV0(
+                    root={
+                        UserProfile.user_profile_username.name: FilterConditionsV0(
+                            eq=new_username
+                        ),
+                    }
+                ),
+            )["data"]["main"]
+        )
         if len(local_list_user_credentials_response) != 0:
             output_content = get_api_output_in_standard_format(
                 message=messages["USERNAME_ALREADY_EXISTS"],
@@ -1134,14 +1150,14 @@ async def update_username_v0(
         global_object_square_database_helper.edit_rows_v0(
             database_name=global_string_database_name,
             schema_name=global_string_schema_name,
-            table_name=UserCredential.__tablename__,
+            table_name=UserProfile.__tablename__,
             filters=FiltersV0(
                 root={
-                    UserCredential.user_id.name: FilterConditionsV0(eq=user_id),
+                    UserProfile.user_id.name: FilterConditionsV0(eq=user_id),
                 }
             ),
             data={
-                UserCredential.user_credential_username.name: new_username,
+                UserProfile.user_profile_username.name: new_username,
             },
         )
         """

{square_authentication-5.1.1.dist-info → square_authentication-5.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: square-authentication
-Version: 5.1.1
+Version: 5.1.3
 Summary: authentication layer for my personal server.
 Home-page: https://github.com/thepmsquare/square_authentication
 Author: thePmSquare
@@ -23,7 +23,7 @@ Requires-Dist: cryptography>=42.0.7
 Requires-Dist: square-commons>=1.0.0
 Requires-Dist: square-logger>=1.0.0
 Requires-Dist: square-database-helper>=2.0.0
-Requires-Dist: square-database-structure>=1.0.0
+Requires-Dist: square-database-structure>=2.3.1
 Requires-Dist: pytest>=8.0.0
 Requires-Dist: httpx>=0.27.2
 
@@ -45,6 +45,15 @@ pip install square_authentication
 
 ## changelog
 
+### v5.1.3
+
+- bugfix in login_username/v0 (getting creds from correct table).
+
+### v5.1.2
+
+- bump square_database_structure>=2.3.1.
+- change logic to read username from profile instead of credentials table.
+
 ### v5.1.1
 
 - add logger decorator in all functions.

{square_authentication-5.1.1.dist-info → square_authentication-5.1.3.dist-info}/RECORD

@@ -6,12 +6,12 @@ square_authentication/data/config.ini,sha256=_740RvKpL5W2bUDGwZ7ePwuP-mAasr5cXXB
 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=CFjlsTF8XXcsImJG_3LVBfncG9RiENYnAQ4Msve-CM4,55858
+square_authentication/routes/core.py,sha256=AM_OiqSndZ6-4c28QnEICXx6WZOms9UzHUYk3wBv5ZA,56795
 square_authentication/routes/utility.py,sha256=ocLWj39JbKVOxgyTsM0xBUgTpHFmKIvvaT3UnjFvuOY,1783
 square_authentication/utils/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 square_authentication/utils/encryption.py,sha256=amlTNbGvq59eFLX6pq084UDLI3deM-urLjb4fOYIeNw,2023
 square_authentication/utils/token.py,sha256=2psHT6CGqQLmkhsPHVYS8_2jEjN96J9gLAM4lB_fa88,678
-square_authentication-5.1.1.dist-info/METADATA,sha256=9mvUZaxzbuRB-tnyeUTyzTQ4vFrXIejx2ybKTuP57tQ,3836
-square_authentication-5.1.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-square_authentication-5.1.1.dist-info/top_level.txt,sha256=wDssVJIl9KIEJPj5rR3rv4uRI7yCndMBrvHd_6BGXQA,22
-square_authentication-5.1.1.dist-info/RECORD,,
+square_authentication-5.1.3.dist-info/METADATA,sha256=9W4cTp_4-DIGzWMg4j0601MaeYHCw97gsURKgHG5U0I,4044
+square_authentication-5.1.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+square_authentication-5.1.3.dist-info/top_level.txt,sha256=wDssVJIl9KIEJPj5rR3rv4uRI7yCndMBrvHd_6BGXQA,22
+square_authentication-5.1.3.dist-info/RECORD,,