spakky-fastapi 0.7.17__tar.gz → 0.7.19__tar.gz

{spakky_fastapi-0.7.17 → spakky_fastapi-0.7.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spakky-fastapi
-Version: 0.7.17
+Version: 0.7.19
 Summary: Highly abstracted Framework core to use DDD & DI/IoC & AOP & Etc...
 Author: Spakky
 Author-email: sejong418@icloud.com
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: fastapi (>=0.109.2,<0.110.0)
 Requires-Dist: orjson (>=3.9.15,<4.0.0)
-Requires-Dist: spakky-core (>=0.7.13)
+Requires-Dist: spakky-core (>=0.7.14)
 Requires-Dist: websockets (>=12.0,<13.0)
 Description-Content-Type: text/markdown
 

{spakky_fastapi-0.7.17 → spakky_fastapi-0.7.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spakky-fastapi"
-version = "0.7.17"
+version = "0.7.19"
 description = "Highly abstracted Framework core to use DDD & DI/IoC & AOP & Etc..."
 authors = ["Spakky <sejong418@icloud.com>"]
 readme = "README.md"
@@ -12,7 +12,7 @@ build-backend = "poetry.core.masonry.api"
 [tool.poetry.dependencies]
 python = ">=3.10"
 fastapi = "^0.109.2"
-spakky-core = ">=0.7.13"
+spakky-core = ">=0.7.14"
 websockets = "^12.0"
 orjson = "^3.9.15"
 

{spakky_fastapi-0.7.17 → spakky_fastapi-0.7.19}/spakky_fastapi/jwt_auth.py

@@ -31,6 +31,7 @@ IAuthenticatedFunction: TypeAlias = Callable[Concatenate[Any, JWT, P], Awaitable
 class JWTAuth(FunctionAnnotation):
     token_url: InitVar[str]
     authenticator: OAuth2PasswordBearer = field(init=False)
+    token_keywords: list[str] = field(init=False, default_factory=list)
 
     def __post_init__(self, token_url: str) -> None:
         self.authenticator = OAuth2PasswordBearer(tokenUrl=token_url)
@@ -38,10 +39,10 @@ class JWTAuth(FunctionAnnotation):
     def __call__(
         self, obj: IAuthenticatedFunction[P, R_co]
     ) -> IAuthenticatedFunction[P, R_co]:
-        obj.__annotations__ = {
-            k: Annotated[JWT, Depends(self.authenticator)] if v == JWT else v
-            for k, v in obj.__annotations__.items()
-        }
+        for key, value in obj.__annotations__.items():
+            if value == JWT:
+                obj.__annotations__[key] = Annotated[JWT, Depends(self.authenticator)]
+                self.token_keywords.append(key)
         return super().__call__(obj)
 
 
@@ -59,15 +60,17 @@ class AsyncJWTAuthAdvisor(IAsyncAdvisor):
 
     @Around(JWTAuth.contains)
     async def around_async(self, joinpoint: AsyncFunc, *args: Any, **kwargs: Any) -> Any:
-        token: str = kwargs["token"]
-        try:
-            jwt: JWT = JWT(token=token)
-        except (InvalidJWTFormatError, JWTDecodingError) as e:
-            raise Unauthorized(AuthenticationFailedError()) from e
-        if jwt.is_expired:
-            raise Unauthorized(AuthenticationFailedError())
-        if jwt.verify(self.__key) is False:
-            raise Unauthorized(AuthenticationFailedError())
-        self.__logger.info(f"[{type(self).__name__}] {jwt.payload!r}")
-        kwargs["token"] = jwt
+        annotation: JWTAuth = JWTAuth.single(joinpoint)
+        for keyword in annotation.token_keywords:
+            token: str = kwargs[keyword]
+            try:
+                jwt: JWT = JWT(token=token)
+            except (InvalidJWTFormatError, JWTDecodingError) as e:
+                raise Unauthorized(AuthenticationFailedError()) from e
+            if jwt.is_expired:
+                raise Unauthorized(AuthenticationFailedError())
+            if jwt.verify(self.__key) is False:
+                raise Unauthorized(AuthenticationFailedError())
+            self.__logger.info(f"[{type(self).__name__}] {jwt.payload!r}")
+            kwargs[keyword] = jwt
         return await joinpoint(*args, **kwargs)