aiohttp-msal 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

aiohttp_msal/msal_async.py

@@ -8,7 +8,7 @@ Once you have the OAuth tokens store in the session, you are free to make reques
 import asyncio
 import json
 from collections.abc import Callable
-from functools import partial, partialmethod, wraps
+from functools import cached_property, partial, partialmethod, wraps
 from typing import Any, ClassVar, Literal, Unpack
 
 from aiohttp import web
@@ -70,8 +70,6 @@ class AsyncMSAL:
     Use until such time as MSAL Python gets a true async version.
     """
 
-    _token_cache: SerializableTokenCache
-    _app: ConfidentialClientApplication
     client_session: ClassVar[ClientSession | None] = None
 
     def __init__(
@@ -89,33 +87,27 @@ class AsyncMSAL:
         if not isinstance(session, Session | dict):
             raise ValueError(f"session or dict-like object required {session}")
 
-    @property
+    @cached_property
     def token_cache(self) -> SerializableTokenCache:
         """Get the token_cache."""
-        if not self._token_cache:
-            self._token_cache = SerializableTokenCache()
-            # _load_token_cache
-            if self.session and self.session.get(TOKEN_CACHE):
-                self._token_cache.deserialize(self.session[TOKEN_CACHE])
-
-        return self._token_cache
+        res = SerializableTokenCache()
+        if self.session and self.session.get(TOKEN_CACHE):
+            res.deserialize(self.session[TOKEN_CACHE])
+        return res
 
-    @property
+    @cached_property
     def app(self) -> ConfidentialClientApplication:
         """Create the application using the cache.
 
         Based on: https://github.com/Azure-Samples/ms-identity-python-webapp/blob/master/app.py#L76
         """
-        if not self._app:
-            token_cache = self.token_cache
-            self._app = ConfidentialClientApplication(
-                client_id=ENV.SP_APP_ID,
-                client_credential=ENV.SP_APP_PW,
-                authority=ENV.SP_AUTHORITY,  # common/oauth2/v2.0/token'
-                validate_authority=False,
-                token_cache=token_cache,
-            )
-        return self._app
+        return ConfidentialClientApplication(
+            client_id=ENV.SP_APP_ID,
+            client_credential=ENV.SP_APP_PW,
+            authority=ENV.SP_AUTHORITY,  # common/oauth2/v2.0/token'
+            validate_authority=False,
+            token_cache=self.token_cache,
+        )
 
     def save_token_cache(self) -> None:
         """Save the token cache if it changed."""
@@ -227,18 +219,10 @@ class AsyncMSAL:
     get = partialmethod(request_ctx, HTTP_GET)
     post = partialmethod(request_ctx, HTTP_POST)
 
-    # def get(self, url: str, **kwargs: Any) -> _RequestContextManager:
-    #     """GET Request."""
-    #     return _RequestContextManager(self.request(HTTP_GET, url, **kwargs))
-
-    # def post(self, url: str, **kwargs: Any) -> _RequestContextManager:
-    #     """POST request."""
-    #     return _RequestContextManager(self.request(HTTP_POST, url, **kwargs))
-
     @property
     def mail(self) -> str:
         """User email."""
-        return self.session.get("mail", "")
+        return self.session.get(USER_EMAIL, "")
 
     @property
     def manager_mail(self) -> str:

{aiohttp_msal-1.0.0.dist-info → aiohttp_msal-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aiohttp-msal
-Version: 1.0.0
+Version: 1.0.1
 Summary: Helper Library to use the Microsoft Authentication Library (MSAL) with aiohttp
 Keywords: aiohttp,asyncio,msal,oauth
 Author: Johann Kellerman
@@ -23,7 +23,7 @@ Project-URL: Homepage, https://github.com/kellerza/aiohttp_msal
 Provides-Extra: aioredis
 Description-Content-Type: text/markdown
 
-# aiohttp_msal Python library
+# Async based MSAL helper for aiohttp - aiohttp_msal Python library
 
 Authorization Code Flow Helper. Learn more about auth-code-flow at
 <https://learn.microsoft.com/en-us/entra/identity-platform/v2-oauth2-auth-code-flow>
@@ -124,8 +124,8 @@ from aiohttp_msal.redis_tools import get_session
 def main()
     # Uses the redis.asyncio driver to retrieve the current token
     # Will update the token_cache if a RefreshToken was used
-    ases = asyncio.run(get_session(MYEMAIL))
-    client = GraphClient(ases.get_token)
+    ses = asyncio.run(get_session(MYEMAIL))
+    client = GraphClient(ses.get_token)
     # ...
     # use the Graphclient
 ```

aiohttp_msal-1.0.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+aiohttp_msal/__init__.py,sha256=hnyifyJykI7NMvM93KrHIsTlrrfCVUrpKdbRKL6Gubw,4027
+aiohttp_msal/msal_async.py,sha256=p0OkF48ZDmCAUYN4qjn3UdMyH1oS4iBQSB5Z_C3yIBU,8816
+aiohttp_msal/redis_tools.py,sha256=6kCw0_zDQcvIcsJaPfG-zHUvT3vzkrNySNTV5y1tckE,6539
+aiohttp_msal/routes.py,sha256=8wU2jU9qSlqH5fq9kvkBZHAgrxQdmB-DvtQC-WlXbh0,8135
+aiohttp_msal/settings.py,sha256=ttbqGb2X1r7DsLvKb1AlDDKBYZWjIwHLHI-Sa-8K-lI,1562
+aiohttp_msal/settings_base.py,sha256=tRbjgphR1tvHCrFCcfOUhoFAyUnq_XnJBVO4NNiPdNg,3150
+aiohttp_msal/user_info.py,sha256=tO-vA_kxPseHseWxNlhGc_NlDfgJGdf1OMCaGmvDf8Q,1875
+aiohttp_msal-1.0.1.dist-info/WHEEL,sha256=4n27za1eEkOnA7dNjN6C5-O2rUiw6iapszm14Uj-Qmk,79
+aiohttp_msal-1.0.1.dist-info/METADATA,sha256=NJEzFuQyWHai3QcqvyTfeAWWfjq98nucwoYFt3qIOvc,4514
+aiohttp_msal-1.0.1.dist-info/RECORD,,

{aiohttp_msal-1.0.0.dist-info → aiohttp_msal-1.0.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.8.12
+Generator: uv 0.8.13
 Root-Is-Purelib: true
 Tag: py3-none-any

aiohttp_msal-1.0.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-aiohttp_msal/__init__.py,sha256=867ca27f2272908ecd32f33ddcaac722c4e5aeb7c2554ae929d6d128be86b9bc,4027
-aiohttp_msal/msal_async.py,sha256=8efdf9608c55e41f99ed66294a18303192e921739f49986cf90a015b07a50c55,9470
-aiohttp_msal/redis_tools.py,sha256=ea40b0d3fcc341cbc872c25a3df1becc752f4f7bf392b37248d4d5e72d6d7241,6539
-aiohttp_msal/routes.py,sha256=f305368d4f6a4a5a87e5fabd92f901647020af141d981f83bed402f969576e1d,8135
-aiohttp_msal/settings.py,sha256=b6d6ea19bd97d6bec3b0bbca6f50250c32816195a32301cb1c8f926bef0afa52,1562
-aiohttp_msal/settings_base.py,sha256=b516e3829851d6dbc70ab14271f394868140c949eafd79c90553b834d88f74d8,3150
-aiohttp_msal/user_info.py,sha256=b4efaf03f9313ec787b1e5b136584673f3650df80919d7f538c09a1a6bc37fc4,1875
-aiohttp_msal-1.0.0.dist-info/WHEEL,sha256=76443c98c0efcfdd1191eac5fa1d8223dba1c474dbd47676674a255e7ca48770,79
-aiohttp_msal-1.0.0.dist-info/METADATA,sha256=dd4a69bc47da5e6c559fda12c41505fdc047c8edde36d498d25a93fc0b7b4ec8,4478
-aiohttp_msal-1.0.0.dist-info/RECORD,,