square-administration 2.1.0__tar.gz → 2.2.1__tar.gz

{square_administration-2.1.0 → square_administration-2.2.1}/PKG-INFO

@@ -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
@@ -32,6 +32,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 → square_administration-2.2.1}/README.md

@@ -16,6 +16,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 → square_administration-2.2.1}/setup.py

@@ -4,7 +4,7 @@ package_name = "square_administration"
 
 setup(
     name=package_name,
-    version="2.1.0",
+    version="2.2.1",
     packages=find_packages(),
     package_data={
         package_name: ["data/*"],

{square_administration-2.1.0 → square_administration-2.2.1}/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-2.1.0 → square_administration-2.2.1}/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 → square_administration-2.2.1}/square_administration.egg-info/PKG-INFO

@@ -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
@@ -32,6 +32,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.