square_administration 4.2.0__tar.gz → 4.2.2__tar.gz

{square_administration-4.2.0 → square_administration-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: square_administration
-Version: 4.2.0
+Version: 4.2.2
 Summary: common business layer for my personal server.
 Keywords: administration,fastapi,backend
 Author: Parth Mukesh Mangtani

{square_administration-4.2.0 → square_administration-4.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "square_administration"
-version = "4.2.0"
+version = "4.2.2"
 description = "common business layer for my personal server."
 readme = "README.md"
 readme-content-type = "text/markdown"

{square_administration-4.2.0 → square_administration-4.2.2}/square_administration/main.py

@@ -1,3 +1,5 @@
+from importlib.metadata import version
+
 from fastapi import FastAPI, status
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
@@ -16,7 +18,7 @@ from square_administration.configuration import (
 from square_administration.routes import core, authentication
 from square_administration.utils.common import is_https
 
-app = FastAPI()
+app = FastAPI(title=config_str_module_name, version=version(config_str_module_name))
 
 app.add_middleware(
     CORSMiddleware,

{square_administration-4.2.0 → square_administration-4.2.2}/square_administration/pydantic_models/authentication.py

@@ -97,3 +97,15 @@ UpdatePasswordV0Response: TypeAlias = StandardResponse[None]
 
 class RegisterLoginGoogleV0(BaseModel):
     google_id: str
+
+
+class RegisterLoginGoogleV0ResponseMain(BaseModel):
+    user_id: str
+    username: str
+    app_id: int | None
+    access_token: str | None
+    was_new_user: bool
+
+
+class RegisterLoginGoogleV0Response(BaseModel):
+    main: RegisterLoginGoogleV0ResponseMain

{square_administration-4.2.0 → square_administration-4.2.2}/square_administration/routes/authentication.py

@@ -23,6 +23,7 @@ from square_administration.pydantic_models.authentication import (
     ResetPasswordAndLoginUsingResetEmailCodeV0Response,
     UpdatePasswordV0Response,
     RegisterLoginGoogleV0,
+    RegisterLoginGoogleV0Response,
 )
 from square_administration.utils.routes.authentication import (
     util_generate_access_token_v0,
@@ -253,7 +254,11 @@ async def update_password_v0(
         )
 
 
-@router.post("/register_login_google/v0")
+@router.post(
+    "/register_login_google/v0",
+    status_code=status.HTTP_200_OK,
+    response_model=RegisterLoginGoogleV0Response,
+)
 @global_object_square_logger.auto_logger()
 async def register_login_google_v0(body: RegisterLoginGoogleV0):
     try:

{square_administration-4.2.0 → square_administration-4.2.2}/square_administration/utils/routes/authentication.py

@@ -40,6 +40,7 @@ from square_administration.pydantic_models.authentication import (
     UpdatePasswordV0,
     UpdatePasswordV0Response,
     RegisterLoginGoogleV0,
+    RegisterLoginGoogleV0Response,
 )
 from square_administration.utils.common import global_int_app_id, is_https
 
@@ -776,23 +777,26 @@ def util_register_login_google_v0(body: RegisterLoginGoogleV0):
             google_id=google_id,
             assign_app_id_if_missing=False,
             app_id=global_int_app_id,
+            response_as_pydantic=True,
         )
         """
         return value
         """
-        refresh_token = response["data"]["main"]["refresh_token"]
-        refresh_token_expiry_time = response["data"]["main"][
-            "refresh_token_expiry_time"
-        ]
-        del response["data"]["main"]["refresh_token"]
-        del response["data"]["main"]["refresh_token_expiry_time"]
+        refresh_token = response.data.main.refresh_token
+        refresh_token_expiry_time = response.data.main.refresh_token_expiry_time
+        modified_response = response.model_dump()
+        del modified_response["data"]["main"]["refresh_token"]
+        del modified_response["data"]["main"]["refresh_token_expiry_time"]
         output_content = get_api_output_in_standard_format(
             message=messages["LOGIN_SUCCESSFUL"],
-            data={"main": response["data"]["main"]},
+            data=RegisterLoginGoogleV0Response(
+                **modified_response["data"]
+            ).model_dump(),
+            as_dict=False,
         )
         json_response = JSONResponse(
             status_code=status.HTTP_200_OK,
-            content=output_content,
+            content=output_content.model_dump(),
         )
         json_response.set_cookie(
             **create_cookie(