spakky-fastapi 0.7.16__py3-none-any.whl → 0.7.19__py3-none-any.whl

spakky_fastapi/jwt_auth.py

@@ -1,5 +1,4 @@
-from typing import Any, TypeVar, Protocol, Awaitable, runtime_checkable
-from inspect import signature
+from typing import Any, TypeVar, Callable, Annotated, Awaitable, TypeAlias, Concatenate
 from logging import Logger
 from dataclasses import InitVar, field, dataclass
 
@@ -25,26 +24,14 @@ class AuthenticationFailedError(SpakkyAOPError):
     message = "사용자 인증에 실패했습니다."
 
 
-@runtime_checkable
-class IAuthenticatedFunction(Protocol[P, R_co]):
-    __defaults__: tuple[Any, ...] | None
-    __kwdefaults__: dict[str, Any] | None
-
-    # pylint: disable=no-self-argument
-    def __call__(
-        self_,  # type: ignore
-        self: Any,
-        token: JWT,
-        *args: P.args,
-        **kwargs: P.kwargs,
-    ) -> Awaitable[R_co]:
-        raise NotImplementedError
+IAuthenticatedFunction: TypeAlias = Callable[Concatenate[Any, JWT, P], Awaitable[R_co]]
 
 
 @dataclass
 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)
@@ -52,12 +39,10 @@ class JWTAuth(FunctionAnnotation):
     def __call__(
         self, obj: IAuthenticatedFunction[P, R_co]
     ) -> IAuthenticatedFunction[P, R_co]:
-        parameters = list(signature(obj).parameters.values())
-        if obj.__defaults__ is not None:
-            extra = obj.__defaults__
-        else:
-            extra = tuple(Depends() for x in parameters[1:] if x.name != "token")
-        obj.__defaults__ = (Depends(self.authenticator),) + extra
+        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)
 
 
@@ -75,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)

spakky_fastapi/post_processor.py

@@ -26,7 +26,7 @@ class FastAPIBeanPostProcessor(IBeanPostProcessor):
             return bean
         controller = ApiController.single(bean)
         router: APIRouter = APIRouter(prefix=controller.prefix, tags=controller.tags)
-        for name, method in getmembers(bean):
+        for name, method in getmembers(bean, callable):
             route: Route | None = Route.single_or_none(method)
             websocket_route: WebSocketRoute | None = WebSocketRoute.single_or_none(method)
             if route is None and websocket_route is None:

{spakky_fastapi-0.7.16.dist-info → spakky_fastapi-0.7.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spakky-fastapi
-Version: 0.7.16
+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.16.dist-info → spakky_fastapi-0.7.19.dist-info}/RECORD

@@ -1,13 +1,13 @@
 spakky_fastapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spakky_fastapi/error.py,sha256=SWyNZk1kxbTCiy-tLxB8saLpX5rBxwvy7q7JRCtNQV0,1124
-spakky_fastapi/jwt_auth.py,sha256=ymi3VaZEk8CjvABpoxgXIeLEs6PiGu7daC4AF0bis-M,2999
+spakky_fastapi/jwt_auth.py,sha256=Ug3DPEHQQn14gFb-j_o_NW0SUF-4NyfR67FLngjPCCQ,2822
 spakky_fastapi/middlewares/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spakky_fastapi/middlewares/error_handling.py,sha256=w_zy4PtEdGkFNN79AHh7TfwWUGSQ1JFNvPo3Dy8ojDM,1325
-spakky_fastapi/post_processor.py,sha256=LPmaL3bhZeFSQHO3_A8CnxiBj05HmNKl0VLcG7MGzVE,2879
+spakky_fastapi/post_processor.py,sha256=33czA6PLYzNxnwQ5dKz0fXjpM_7kyMf9kaY88b_GoCI,2889
 spakky_fastapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spakky_fastapi/routing.py,sha256=3OhnnDIzaDeNhuIMWpPG17--98ti6LsgdfENsWr332g,19181
 spakky_fastapi/stereotypes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spakky_fastapi/stereotypes/api_controller.py,sha256=hLeIYM-olZHwvFZkd1joQ-5-OQAiZXznFu4CEhrcskk,196
-spakky_fastapi-0.7.16.dist-info/METADATA,sha256=6DQ255miSFzNddrpuULtGIr3yorlw24DlvA7rL7dBng,1702
-spakky_fastapi-0.7.16.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-spakky_fastapi-0.7.16.dist-info/RECORD,,
+spakky_fastapi-0.7.19.dist-info/METADATA,sha256=Epf3M5LlqNrHnnwrv0UDDnIuSKW4wRqo11C91P2BS38,1702
+spakky_fastapi-0.7.19.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+spakky_fastapi-0.7.19.dist-info/RECORD,,