square-administration 2.4.0__py3-none-any.whl → 3.0.1__py3-none-any.whl

square_administration/pydantic_models/authentication.py

@@ -10,3 +10,7 @@ class RegisterUsernameV0(BaseModel):
 class LoginUsernameV0(BaseModel):
     username: str
     password: str
+
+
+class RemoveAppForSelfV0(BaseModel):
+    password: str

square_administration/routes/authentication.py

@@ -9,6 +9,10 @@ from requests import HTTPError
 from square_authentication_helper import TokenType
 from square_commons import get_api_output_in_standard_format
 from square_commons.api_utils import create_cookie
+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.tables import User, UserCredential
 
 from square_administration.configuration import (
     global_object_square_logger,
@@ -16,11 +20,13 @@ from square_administration.configuration import (
     global_object_square_authentication_helper,
     global_int_app_id,
     config_str_cookie_domain,
+    global_object_square_database_helper,
 )
 from square_administration.messages import messages
 from square_administration.pydantic_models.authentication import (
     RegisterUsernameV0,
     LoginUsernameV0,
+    RemoveAppForSelfV0,
 )
 from square_administration.utils.common import is_https
 
@@ -218,13 +224,46 @@ async def login_username_v0(
 @global_object_square_logger.async_auto_logger
 async def remove_app_for_self_v0(
     access_token: Annotated[str, Header()],
+    body: RemoveAppForSelfV0,
 ):
-
+    password = body.password
     try:
         """
         validation
         """
-        # pass
+        access_token_payload = global_object_square_authentication_helper.validate_and_get_payload_from_token_v0(
+            access_token, TokenType.access_token
+        )
+        user_id = access_token_payload["data"]["main"]["user_id"]
+        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={
+                    User.user_id.name: FilterConditionsV0(eq=user_id),
+                }
+            ),
+            columns=[UserCredential.user_credential_hashed_password.name],
+        )
+        hashed_password = user_credentials_response["data"]["main"][0][
+            UserCredential.user_credential_hashed_password.name
+        ]
+
+        if not (
+            bcrypt.checkpw(
+                password.encode("utf-8"),
+                hashed_password.encode("utf-8"),
+            )
+        ):
+            output_content = get_api_output_in_standard_format(
+                message=messages["INCORRECT_PASSWORD"],
+                log=f"incorrect password for user_id {user_id}.",
+            )
+            return JSONResponse(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                content=output_content,
+            )
         """
         main process
         """

square_administration/utils/common.py

@@ -3,9 +3,11 @@ import os
 from square_administration.configuration import (
     config_str_ssl_key_file_path,
     config_str_ssl_crt_file_path,
+    global_object_square_logger,
 )
 
 
+@global_object_square_logger.auto_logger
 def is_https() -> bool:
     return os.path.exists(config_str_ssl_key_file_path) and os.path.exists(
         config_str_ssl_crt_file_path

{square_administration-2.4.0.dist-info → square_administration-3.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: square-administration
-Version: 2.4.0
+Version: 3.0.1
 Summary: common business layer for my personal server.
 Home-page: https://github.com/thepmsquare/square_administration
 Author: thePmSquare
@@ -42,6 +42,14 @@ pip install square_administration
 
 ## changelog
 
+### v3.0.1
+
+- add logging decorator to all functions.
+
+### v3.0.0
+
+- add new parameter -> password in authentication -> remove_app_for_self_v0.
+
 ### v2.4.0
 
 - auto docker image build github action.

{square_administration-2.4.0.dist-info → square_administration-3.0.1.dist-info}/RECORD

@@ -4,14 +4,14 @@ square_administration/main.py,sha256=YHala3fQjbj4wQuIzCWEZ3xeeVsidPLHabCUsADr4tE
 square_administration/messages.py,sha256=VYjJGW0Kvtjrx1Mw7ekksLVMoxcexLol2OckvqhZ3n0,1063
 square_administration/data/config.ini,sha256=sTWBnaNGXqLi0Ckk2cNzBC7pqrlboyU_ClLl04luOZY,1024
 square_administration/pydantic_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_administration/pydantic_models/authentication.py,sha256=DWXctw5UWzkSVY7nMIQZsRhmgW3OK455OVcoUpJrPY0,202
+square_administration/pydantic_models/authentication.py,sha256=QEfM5ezG45hc_qATXpFIPNPl4bjf8ICW_bY5tY4cqO4,259
 square_administration/pydantic_models/core.py,sha256=HUMrBmfKrXeL-126gE5j2povdVmktn8XLg2tHEdeXTk,344
 square_administration/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_administration/routes/authentication.py,sha256=wq1JFXVfbVEy3_HGdFVk2823YgMs8qhWl_gR6Cqv_ik,14237
+square_administration/routes/authentication.py,sha256=vOkuAmnPkTl-PSDmSkyui2tvhFxvo0WzMAAuz3st-QY,16053
 square_administration/routes/core.py,sha256=65_FIZilintZvbHx7r25UQbgN-oKdQ92-Nv3kpwKX6s,5374
 square_administration/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_administration/utils/common.py,sha256=amCGhwizka1MgM-Xlw_8f07V54Br7pOvCDtevJfz98M,276
-square_administration-2.4.0.dist-info/METADATA,sha256=0OVqlu4REaqVXof-Qqzkx82xrjFrI-mRW9H9QKgmbok,2078
-square_administration-2.4.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-square_administration-2.4.0.dist-info/top_level.txt,sha256=8WFipDrMQUPRDo5AvipxU1YK3wZtWZyCUMWaR416zAw,22
-square_administration-2.4.0.dist-info/RECORD,,
+square_administration/utils/common.py,sha256=Uk2clDugVI8U6-bgjs77fxC4DuqmJEJ_IznBs1jAtWc,350
+square_administration-3.0.1.dist-info/METADATA,sha256=aviG8xNbrRwAs9SfhngddFLisn1_7RY3jsFgmYH2dec,2223
+square_administration-3.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+square_administration-3.0.1.dist-info/top_level.txt,sha256=8WFipDrMQUPRDo5AvipxU1YK3wZtWZyCUMWaR416zAw,22
+square_administration-3.0.1.dist-info/RECORD,,