Improve Python token propagation examples (#1873)

Author: n0tl3ss

guides/micronaut-token-propagation/gateway/python/src/example/micronaut/user_controller.py

@@ -2,7 +2,6 @@
 from micronaut.http.annotation import Controller, Get, Produces
 from micronaut.security.annotation import Secured
 from micronaut.security.rules import SecurityRule
-from org.reactivestreams import Publisher
 
 from .username_fetcher import UsernameFetcher
 
@@ -16,6 +15,6 @@ def __init__(self, username_fetcher: UsernameFetcher):
     @Secured(SecurityRule.IS_AUTHENTICATED)
     @Produces(MediaType.TEXT_PLAIN)
     @Get
-    def index(self) -> Publisher[str]:
-        return self.username_fetcher.findUsername()
+    async def index(self) -> str:
+        return await self.username_fetcher.find_username()
 # end::clazz[]

guides/micronaut-token-propagation/gateway/python/src/example/micronaut/user_echo_client.py

@@ -5,7 +5,6 @@
 from micronaut.http import MediaType
 from micronaut.http.annotation import Consumes, Get
 from micronaut.http.client.annotation import Client
-from org.reactivestreams import Publisher
 
 from .username_fetcher import UsernameFetcher
 
@@ -18,6 +17,6 @@ class UserEchoClient(UsernameFetcher):
     @Consumes(MediaType.TEXT_PLAIN)
     @Get("/user")
     @abstractmethod
-    def findUsername(self) -> Publisher[str]:
+    async def find_username(self) -> str:
         ...
 # end::clazz[]

guides/micronaut-token-propagation/gateway/python/src/example/micronaut/username_fetcher.py

@@ -1,11 +1,9 @@
 from abc import ABC, abstractmethod
 
-from org.reactivestreams import Publisher
-
 
 # tag::clazz[]
 class UsernameFetcher(ABC):
     @abstractmethod
-    def findUsername(self) -> Publisher[str]:
+    async def find_username(self) -> str:
         ...
 # end::clazz[]

guides/micronaut-token-propagation/gateway/python/tests/example/micronaut/test_user_echo_client_replacement.py

@@ -1,7 +1,5 @@
 from jakarta.inject import Singleton
 from micronaut.context.annotation import Requires
-from org.reactivestreams import Publisher
-from reactor.core.publisher import Mono
 
 from example.micronaut.username_fetcher import UsernameFetcher
 
@@ -11,6 +9,6 @@
 @Singleton
 class UserEchoClientReplacement(UsernameFetcher):
 
-    def findUsername(self) -> Publisher[str]:
-        return Mono.just("sherlock")
+    async def find_username(self) -> str:
+        return "sherlock"
 # end::clazz[]

guides/micronaut-token-propagation/intermediate-gateway/python/src/example/micronaut/user_controller.py

@@ -4,7 +4,6 @@
 from micronaut.http.annotation import Controller, Get, Header, Produces
 from micronaut.security.annotation import Secured
 from micronaut.security.rules import SecurityRule
-from org.reactivestreams import Publisher
 
 from .username_fetcher import UsernameFetcher
 
@@ -18,9 +17,9 @@ def __init__(self, username_fetcher: UsernameFetcher):  # <2>
     @Secured(SecurityRule.IS_AUTHENTICATED)  # <3>
     @Produces(MediaType.TEXT_PLAIN)  # <4>
     @Get  # <5>
-    def index(
+    async def index(
         self,
         authorization: Annotated[str, Header(HttpHeaders.AUTHORIZATION)],  # <6>
-    ) -> Publisher[str]:
-        return self.username_fetcher.findUsername(authorization)
+    ) -> str:
+        return await self.username_fetcher.find_username(authorization)
 # end::clazz[]

guides/micronaut-token-propagation/intermediate-gateway/python/src/example/micronaut/user_echo_client.py

@@ -6,7 +6,6 @@
 from micronaut.http import HttpHeaders, MediaType
 from micronaut.http.annotation import Consumes, Get, Header
 from micronaut.http.client.annotation import Client
-from org.reactivestreams import Publisher
 
 from .username_fetcher import UsernameFetcher
 
@@ -19,9 +18,9 @@ class UserEchoClient(UsernameFetcher):
     @Consumes(MediaType.TEXT_PLAIN)
     @Get("/user")  # <3>
     @abstractmethod
-    def findUsername(
+    async def find_username(
         self,
         authorization: Annotated[str, Header(HttpHeaders.AUTHORIZATION)],  # <4>
-    ) -> Publisher[str]:
+    ) -> str:
         ...
 # end::clazz[]

guides/micronaut-token-propagation/intermediate-gateway/python/src/example/micronaut/username_fetcher.py

@@ -1,11 +1,9 @@
 from abc import ABC, abstractmethod
 
-from org.reactivestreams import Publisher
-
 
 # tag::clazz[]
 class UsernameFetcher(ABC):
     @abstractmethod
-    def findUsername(self, authorization: str) -> Publisher[str]:
+    async def find_username(self, authorization: str) -> str:
         ...
 # end::clazz[]

guides/micronaut-token-propagation/intermediate-gateway/python/tests/example/micronaut/test_user_echo_client_replacement.py

@@ -1,7 +1,5 @@
 from jakarta.inject import Singleton
 from micronaut.context.annotation import Requires
-from org.reactivestreams import Publisher
-from reactor.core.publisher import Mono
 
 from example.micronaut.username_fetcher import UsernameFetcher
 
@@ -11,6 +9,6 @@
 @Singleton
 class UserEchoClientReplacement(UsernameFetcher):
 
-    def findUsername(self, authorization: str) -> Publisher[str]:
-        return Mono.just("sherlock")
+    async def find_username(self, authorization: str) -> str:
+        return "sherlock"
 # end::clazz[]

guides/micronaut-token-propagation/intermediate-userecho/python/src/example/micronaut/user_controller.py

@@ -1,14 +1,14 @@
-from java.security import Principal
 from micronaut.http import MediaType
 from micronaut.http.annotation import Get, Produces
 from micronaut.security.annotation import Secured
+from micronaut.security.authentication import Authentication
 from micronaut.security.rules import SecurityRule
 
 
 # tag::clazz[]
 @Secured(SecurityRule.IS_AUTHENTICATED)  # <2>
 @Produces(MediaType.TEXT_PLAIN)  # <3>
 @Get("/user")  # <1> <4>
-def index(principal: Principal) -> str:  # <5>
-    return principal.getName()
+def index(authentication: Authentication) -> str:  # <5>
+    return authentication.getName()
 # end::clazz[]

guides/micronaut-token-propagation/micronaut-token-propagation.adoc

@@ -155,7 +155,12 @@ source:UserController[app=intermediate-userecho]
 <2> Annotate with `io.micronaut.security.Secured` to configure secured access. The `isAuthenticated()` expression will allow access only to authenticated users.
 <3> Since we return a string which is not valid JSON, set the media type to `text/plain`.
 <4> You can specify the HTTP verb that a controller action responds to. To respond to a GET request, use the `io.micronaut.http.annotation.Get` annotation.
+:exclude-for-languages:python
 <5> If a user is authenticated, the Micronaut framework will bind the user object to an argument of type `java.security.Principal` (if present).
+:exclude-for-languages:
+:only-for-languages:python
+<5> If a user is authenticated, the Micronaut framework binds the `Authentication` object to a controller argument of that type.
+:only-for-languages:
 
 Add this snippet to the application configuration to change the port where `userecho` starts: