square-administration 2.1.0__py3-none-any.whl → 2.2.1__py3-none-any.whl

square_administration/messages.py

@@ -12,4 +12,5 @@ messages = {
     "GENERIC_500": "an internal server error occurred. please try again later.",
     "INCORRECT_ACCESS_TOKEN": "the access token provided is invalid or expired.",
     "INCORRECT_REFRESH_TOKEN": "the refresh token provided is invalid or expired.",
+    "REFRESH_TOKEN_NOT_FOUND": "refresh token not found. please login again.",
 }

square_administration/routes/authentication.py

@@ -2,9 +2,10 @@ import json
 from typing import Annotated
 
 import bcrypt
-from fastapi import APIRouter, status, HTTPException, Header
+from fastapi import APIRouter, status, HTTPException, Header, Request
 from fastapi.responses import JSONResponse
 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
 
@@ -260,15 +261,39 @@ async def remove_app_for_self_v0(
 
 @router.delete("/logout/v0")
 @global_object_square_logger.async_auto_logger
-async def logout_v0(
-    refresh_token: Annotated[str, Header()],
-):
+async def logout_v0(request: Request):
 
     try:
         """
         validation
         """
-        # pass
+
+        refresh_token = request.cookies.get("refresh_token|" + str(global_int_app_id))
+        if refresh_token is None:
+            output_content = get_api_output_in_standard_format(
+                message=messages["REFRESH_TOKEN_NOT_FOUND"],
+                log=f"refresh token not found.",
+            )
+            return JSONResponse(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                content=output_content,
+            )
+        refresh_token_payload = global_object_square_authentication_helper.validate_and_get_payload_from_token_v0(
+            refresh_token, TokenType.refresh_token
+        )[
+            "data"
+        ][
+            "main"
+        ]
+        if refresh_token_payload["app_id"] != global_int_app_id:
+            output_content = get_api_output_in_standard_format(
+                message=messages["INCORRECT_REFRESH_TOKEN"],
+                log=f"refresh token is for different app id. intended app id: {global_int_app_id}, actual app id: {refresh_token_payload['app_id']}.",
+            )
+            return JSONResponse(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                content=output_content,
+            )
         """
         main process
         """
@@ -320,14 +345,39 @@ async def logout_v0(
 @router.get("/generate_access_token/v0")
 @global_object_square_logger.async_auto_logger
 async def generate_access_token_v0(
-    refresh_token: Annotated[str, Header()],
+    request: Request,
 ):
 
     try:
         """
         validation
         """
-        # pass
+        refresh_token = request.cookies.get("refresh_token|" + str(global_int_app_id))
+        if refresh_token is None:
+            output_content = get_api_output_in_standard_format(
+                message=messages["REFRESH_TOKEN_NOT_FOUND"],
+                log=f"refresh token not found.",
+            )
+            return JSONResponse(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                content=output_content,
+            )
+        refresh_token_payload = global_object_square_authentication_helper.validate_and_get_payload_from_token_v0(
+            refresh_token, TokenType.refresh_token
+        )[
+            "data"
+        ][
+            "main"
+        ]
+        if refresh_token_payload["app_id"] != global_int_app_id:
+            output_content = get_api_output_in_standard_format(
+                message=messages["INCORRECT_REFRESH_TOKEN"],
+                log=f"refresh token is for different app id. intended app id: {global_int_app_id}, actual app id: {refresh_token_payload['app_id']}.",
+            )
+            return JSONResponse(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                content=output_content,
+            )
         """
         main process
         """

{square_administration-2.1.0.dist-info → square_administration-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: square-administration
-Version: 2.1.0
+Version: 2.2.1
 Summary: common business layer for my personal server.
 Home-page: https://github.com/thepmsquare/square_administration
 Author: thePmSquare
@@ -42,6 +42,16 @@ pip install square_administration
 
 ## changelog
 
+### v2.2.1
+
+- authentication
+    - add validation for refresh token app id in logout_v0, generate_access_token_v0.
+
+### v2.2.0
+
+- authentication
+    - logout_v0, generate_access_token_v0 remove refresh token from request header and accept in cookie.
+
 ### v2.1.0
 
 - add authentication -> logout_v0, generate_access_token_v0.

{square_administration-2.1.0.dist-info → square_administration-2.2.1.dist-info}/RECORD

@@ -1,16 +1,16 @@
 square_administration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 square_administration/configuration.py,sha256=ldSmVp3FWOndN4u-dH-pf4i0olRZx1-uORJAj1qW-g8,4733
 square_administration/main.py,sha256=L4MM_7yimRLB8J1ltgXPnrN3j_UXKVtp8o8S46MSqrY,1678
-square_administration/messages.py,sha256=93dzwW2J3romvGl66OGBt3z2ueGnInMz28pem9egnaw,984
+square_administration/messages.py,sha256=VYjJGW0Kvtjrx1Mw7ekksLVMoxcexLol2OckvqhZ3n0,1063
 square_administration/data/config.ini,sha256=NMpUnBSPEdwCW1Y-z5DOjpTQgXGjt4ZcqP4QQiAXr_U,997
 square_administration/pydantic_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 square_administration/pydantic_models/authentication.py,sha256=DWXctw5UWzkSVY7nMIQZsRhmgW3OK455OVcoUpJrPY0,202
 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=KSj8oWB3Jw7caVP1z1OoWbQAdawvS04P-4xT2OmzPyo,11029
+square_administration/routes/authentication.py,sha256=V1NZgee3IvQNzCjP4TdVDc-7sWNd2m7EjG1d3m-C7Yw,13383
 square_administration/routes/core.py,sha256=65_FIZilintZvbHx7r25UQbgN-oKdQ92-Nv3kpwKX6s,5374
 square_administration/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_administration-2.1.0.dist-info/METADATA,sha256=HAb400ntVv1QSFh6au4oi08tklXJkAUq0FYJvef0Lls,1551
-square_administration-2.1.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-square_administration-2.1.0.dist-info/top_level.txt,sha256=8WFipDrMQUPRDo5AvipxU1YK3wZtWZyCUMWaR416zAw,22
-square_administration-2.1.0.dist-info/RECORD,,
+square_administration-2.2.1.dist-info/METADATA,sha256=ygKKKDOhbGQUhkk2Caj2RfxtHB559qM43Q7VQoubMzk,1802
+square_administration-2.2.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+square_administration-2.2.1.dist-info/top_level.txt,sha256=8WFipDrMQUPRDo5AvipxU1YK3wZtWZyCUMWaR416zAw,22
+square_administration-2.2.1.dist-info/RECORD,,