Validate token after OAuth on Adapters for better response in oauth_authorized event

Author: EvieePy

twitchio/authentication/payloads.py

@@ -100,9 +100,14 @@ class UserTokenPayload(BasePayload):
         A ``str`` or ``list[str]`` containing the scopes the user authenticated with.
     token_type: str
         The type of token provided. Usually ``bearer``.
+    user_id: str | None
+        An optional :class:`str` representing the ID of the User who authorized your application. This could be ``None``.
+    user_login: str | None
+        An optional :class:`str` representing the user name of the User who authorized your application.
+        This could be ``None``.
     """
 
-    __slots__ = ("access_token", "expires_in", "refresh_token", "scope", "token_type")
+    __slots__ = ("_user_id", "_user_login", "access_token", "expires_in", "refresh_token", "scope", "token_type")
 
     def __init__(self, raw: UserTokenResponse, /) -> None:
         super().__init__(raw)
@@ -112,6 +117,24 @@ def __init__(self, raw: UserTokenResponse, /) -> None:
         self.expires_in: int = raw["expires_in"]
         self.scope: str | list[str] = raw["scope"]
         self.token_type: str = raw["token_type"]
+        self._user_id: str | None = None
+        self._user_login: str | None = None
+
+    @property
+    def user_id(self) -> str | None:
+        return self._user_id
+
+    @user_id.setter
+    def user_id(self, other: str) -> None:
+        self._user_id = other
+
+    @property
+    def user_login(self) -> str | None:
+        return self._user_login
+
+    @user_login.setter
+    def user_login(self, other: str) -> None:
+        self._user_login = other
 
 
 class ClientCredentialsPayload(BasePayload):

twitchio/web/aio_adapter.py

@@ -33,6 +33,8 @@
 
 from aiohttp import web
 
+from twitchio.authentication.payloads import ValidateTokenPayload
+
 from ..authentication import Scopes
 from ..eventsub.subscriptions import _SUB_MAPPING
 from ..exceptions import HTTPException
@@ -44,7 +46,7 @@
 if TYPE_CHECKING:
     from ssl import SSLContext
 
-    from ..authentication import AuthorizationURLPayload, UserTokenPayload
+    from ..authentication import AuthorizationURLPayload, UserTokenPayload, ValidateTokenPayload
     from ..client import Client
     from ..types_.eventsub import EventSubHeaders
 
@@ -321,7 +323,12 @@ async def fetch_token(self, request: web.Request) -> FetchTokenPayload:
             status: int = e.status
             return FetchTokenPayload(status=status, response=web.Response(status=status), exception=e)
 
+        validated: ValidateTokenPayload = await self.client._http.validate_token(resp.access_token)
+        resp._user_id = validated.user_id
+        resp._user_login = validated.login
+
         self.client.dispatch(event="oauth_authorized", payload=resp)
+
         return FetchTokenPayload(
             status=20,
             response=web.Response(body="Success. You can leave this page.", status=200),

twitchio/web/starlette_adapter.py

@@ -47,7 +47,7 @@
 if TYPE_CHECKING:
     from starlette.requests import Request
 
-    from ..authentication import AuthorizationURLPayload, UserTokenPayload
+    from ..authentication import AuthorizationURLPayload, UserTokenPayload, ValidateTokenPayload
     from ..client import Client
     from ..types_.eventsub import EventSubHeaders
 
@@ -347,7 +347,12 @@ async def fetch_token(self, request: Request) -> FetchTokenPayload:
             status: int = e.status
             return FetchTokenPayload(status=status, response=Response(status_code=status), exception=e)
 
+        validated: ValidateTokenPayload = await self.client._http.validate_token(resp.access_token)
+        resp._user_id = validated.user_id
+        resp._user_login = validated.login
+
         self.client.dispatch(event="oauth_authorized", payload=resp)
+
         return FetchTokenPayload(
             status=200,
             response=Response(content="Success. You can leave this page.", status_code=200),