navigator-session 0.4.3__py3-none-any.whl → 0.4.5__py3-none-any.whl

navigator_session/data.py

@@ -54,10 +54,10 @@ class SessionData(MutableMapping[str, Any]):
         self._new = new if data != {} else True
         self._max_age = max_age if max_age else None
         created = data.get('created', None) if data else None
-        self._now = pendulum.now('UTC') # time for this instance creation
+        self._now = pendulum.now('UTC')  # time for this instance creation
         self.__created__ = self._now
         now = int(self._now.int_timestamp)
-        self._now = now # time for this instance creation
+        self._now = now  # time for this instance creation
         age = now - created if created else now
         if max_age is not None and age > max_age:
             data = None
@@ -75,7 +75,7 @@ class SessionData(MutableMapping[str, Any]):
         self.args = args
 
     def __repr__(self) -> str:
-        return '<{} [new:{}, created:{}] {!r}>'.format( # pylint: disable=C0209
+        return '<{} [new:{}, created:{}] {!r}>'.format(  # pylint: disable=C0209
             'NAV-Session ', self.new, self.created, self._data
         )
 

navigator_session/middleware.py

@@ -14,14 +14,14 @@ Middleware = Callable[[web.Request, Handler], Awaitable[web.StreamResponse]]
 
 ### Basic Middleware for Session System
 def session_middleware(
-        app: web.Application, # pylint: disable=W0613
+        app: web.Application,  # pylint: disable=W0613
         storage: AbstractStorage
 ) -> Middleware:
     """Middleware to attach Session Storage to every Request."""
     if not isinstance(storage, AbstractStorage):
         raise RuntimeError(
             f"Expected an AbstractStorage got {storage!s}"
-    )
+        )
 
     @web.middleware
     async def middleware(

navigator_session/session.py

@@ -8,7 +8,7 @@ class SessionHandler:
     """Authentication Backend for Navigator."""
     storage: Callable = None
 
-    def __init__(self,storage: str = 'redis', **kwargs) -> None:
+    def __init__(self, storage: str = 'redis', **kwargs) -> None:
         # TODO: Session Support with parametrization (other storages):
         if storage == 'redis':
             self.storage = RedisStorage(**kwargs)
@@ -19,9 +19,9 @@ class SessionHandler:
 
     def setup(self, app: web.Application) -> None:
         if isinstance(app, web.Application):
-            self.app = app # register the app into the Extension
+            self.app = app  # register the app into the Extension
         else:
-            self.app = app.get_app() # Nav Application
+            self.app = app.get_app()  # Nav Application
         ## Configure the Middleware for NAV Session.
         self.app.middlewares.append(
             session_middleware(app, self.storage)
@@ -38,7 +38,6 @@ class SessionHandler:
         # register the Auth extension into the app
         self.app['nav_session'] = self
 
-
     async def session_startup(self, app: web.Application):
         """
         Calling Session (and Storage) Startup.

navigator_session/storages/abstract.py

@@ -43,7 +43,7 @@ class AbstractStorage(metaclass=abc.ABCMeta):
             httponly: bool = True,
             samesite: Optional[str] = 'Lax',
             **kwargs
-        ) -> None:
+    ) -> None:
         if not max_age:
             self.max_age = SESSION_TIMEOUT
         else:
@@ -105,7 +105,8 @@ class AbstractStorage(metaclass=abc.ABCMeta):
         return SessionData(None, data=None, new=True, max_age=self.max_age)
 
     @abc.abstractmethod
-    async def save_session(self,
+    async def save_session(
+        self,
         request: web.Request,
         response: web.StreamResponse,
         session: SessionData
@@ -128,7 +129,7 @@ class AbstractStorage(metaclass=abc.ABCMeta):
         try:
             del request[SESSION_KEY]
             del request[SESSION_OBJECT]
-        except Exception as err: # pylint: disable=W0703
+        except Exception as err:  # pylint: disable=W0703
             logging.warning(
                 f'Session: Error on Forgot Method: {err}'
             )
@@ -180,7 +181,6 @@ class AbstractStorage(metaclass=abc.ABCMeta):
             else:
                 response.set_cookie(self.__name__, cookie_data, **params)
 
-
     def session_info(self, session: SessionData, request: web.Request) -> SessionData:
         """session_info.
             Session Helper for adding more information extracted from Request.

navigator_session/storages/cookie.py

@@ -24,7 +24,7 @@ class CookieStorage(AbstractStorage):
             path: str = "/",
             secret_key: Union[str, bytes, bytearray, fernet.Fernet] = None,
             **kwargs
-        ) -> None:
+    ) -> None:
         super(
             CookieStorage, self
         ).__init__(
@@ -75,7 +75,8 @@ class CookieStorage(AbstractStorage):
     async def get_session(self, request: web.Request) -> SessionData:
         pass
 
-    async def save_session(self,
+    async def save_session(
+        self,
         request: web.Request,
         response: web.StreamResponse,
         session: SessionData

navigator_session/storages/redis.py

@@ -4,7 +4,7 @@ import logging
 from typing import Optional
 from collections.abc import Callable
 from aiohttp import web
-import aioredis
+from redis import asyncio as aioredis
 from navigator_session.conf import (
     SESSION_URL,
     SESSION_KEY,
@@ -24,7 +24,7 @@ class RedisStorage(AbstractStorage):
             domain: Optional[str] = None,
             path: str = "/",
             **kwargs
-        ) -> None:
+    ) -> None:
         self._redis: Callable = None
         super(
             RedisStorage, self
@@ -43,20 +43,24 @@ class RedisStorage(AbstractStorage):
                 decode_responses=True,
                 encoding='utf-8'
             )
-        except Exception as err: # pylint: disable=W0703
+        except Exception as err:  # pylint: disable=W0703
             logging.exception(err, stack_info=True)
             return False
 
     async def on_cleanup(self, app: web.Application):
         try:
-            await self._redis.disconnect(inuse_connections = True)
-        except Exception as ex: # pylint: disable=W0703
+            await self._redis.disconnect(inuse_connections=True)
+        except Exception as ex:  # pylint: disable=W0703
             logging.warning(ex)
 
-    async def get_session(self, request: web.Request, userdata: dict = None) -> SessionData:
+    async def get_session(
+        self,
+        request: web.Request,
+        userdata: dict = None
+    ) -> SessionData:
         try:
             session = request.get(SESSION_OBJECT)
-        except Exception as err: # pylint: disable=W0703
+        except Exception as err:  # pylint: disable=W0703
             logging.debug(f'Redis Storage: Error on get Session: {err!s}')
             session = None
         if session is None:
@@ -83,8 +87,8 @@ class RedisStorage(AbstractStorage):
         try:
             # delete the ID of the session
             await conn.delete(session.identity)
-            session.invalidate() # invalidate this session object
-        except Exception as err: # pylint: disable=W0703
+            session.invalidate()  # invalidate this session object
+        except Exception as err:  # pylint: disable=W0703
             logging.error(err)
             return False
         return True
@@ -108,7 +112,7 @@ class RedisStorage(AbstractStorage):
         """
         # TODO: first: for security, check if cookie csrf_secure exists
         session_id = None
-        if ignore_cookie is False and  self.use_cookie is True:
+        if ignore_cookie is False and self.use_cookie is True:
             cookie = self.load_cookie(request)
             try:
                 session_id = cookie['session_id']
@@ -135,7 +139,7 @@ class RedisStorage(AbstractStorage):
         logging.debug(f':::::: LOAD SESSION FOR {session_id} ::::: ')
         try:
             data = await conn.get(session_id)
-        except Exception as err: # pylint: disable=W0703
+        except Exception as err:  # pylint: disable=W0703
             logging.error(
                 f'Redis Storage: Error Getting Session data: {err!s}'
             )
@@ -154,7 +158,7 @@ class RedisStorage(AbstractStorage):
                 new=False,
                 max_age=self.max_age
             )
-        except Exception as err: # pylint: disable=W0703
+        except Exception as err:  # pylint: disable=W0703
             logging.warning(err)
             session = SessionData(
                 identity=None,
@@ -176,7 +180,8 @@ class RedisStorage(AbstractStorage):
             self.save_cookie(response, cookie_data=cookie_data, max_age=self.max_age)
         return session
 
-    async def save_session(self,
+    async def save_session(
+        self,
         request: web.Request,
         response: web.StreamResponse,
         session: SessionData
@@ -198,7 +203,7 @@ class RedisStorage(AbstractStorage):
             result = await conn.set(
                 session_id, data, expire
             )
-        except Exception as err: # pylint: disable=W0703
+        except Exception as err:  # pylint: disable=W0703
             print('Error Saving Session: ', err)
             logging.exception(err, stack_info=True)
             return False
@@ -232,7 +237,7 @@ class RedisStorage(AbstractStorage):
                 session_id, dt, self.max_age
             )
             logging.info(f'Creation of New Session: {result}')
-        except Exception as err: # pylint: disable=W0703
+        except Exception as err:  # pylint: disable=W0703
             logging.exception(err)
             return False
         try:
@@ -248,9 +253,12 @@ class RedisStorage(AbstractStorage):
                     "session_id": session_id
                 }
                 cookie_data = self._encoder(cookie_data)
-                self.save_cookie(response, cookie_data=cookie_data, max_age=self.max_age)
-        except Exception as err: # pylint: disable=W0703
-            print(err)
+                self.save_cookie(
+                    response,
+                    cookie_data=cookie_data,
+                    max_age=self.max_age
+                )
+        except Exception as err:  # pylint: disable=W0703
             logging.exception(f'Error creating Session Data: {err!s}')
         # Saving Session Object:
         ## add other options to session:

navigator_session/version.py

@@ -5,7 +5,7 @@
 __title__ = 'navigator_session'
 __description__ = ('Navigator Session allows us to store user-specific data '
                    'into session object.')
-__version__ = '0.4.3'
+__version__ = '0.4.5'
 __author__ = 'Jesus Lara'
 __author_email__ = 'jesuslarag@gmail.com'
 __license__ = 'Apache-2.0'

{navigator_session-0.4.3.dist-info → navigator_session-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: navigator-session
-Version: 0.4.3
+Version: 0.4.5
 Summary: Navigator Session allows us to store user-specific data into session object.
 Home-page: https://github.com/phenobarbital/navigator-session
 Author: Jesus Lara
@@ -27,12 +27,13 @@ Requires-Python: >=3.9.16
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyNaCl (==1.5.0)
-Requires-Dist: aiohttp (==3.8.4)
+Requires-Dist: aiohttp (==3.8.5)
 Requires-Dist: uvloop (==0.17.0)
 Requires-Dist: asyncio (==3.4.3)
 Requires-Dist: navconfig[default] (>=1.0.15)
 Requires-Dist: jsonpickle (==3.0.1)
 Requires-Dist: aioredis (==2.0.1)
+Requires-Dist: redis (==4.5.5)
 Requires-Dist: pendulum (==2.1.2)
 Requires-Dist: python-datamodel (>=0.2.1)
 

navigator_session-0.4.5.dist-info/RECORD

@@ -0,0 +1,15 @@
+navigator_session/__init__.py,sha256=xsmc90K04EgQEtYidPN7bsXn0WIqw6GucNwy138Mmno,3038
+navigator_session/conf.py,sha256=PwCGoYpg_2MEq5_zObvbx4yXKf7AIKObO-lzTh2AvxM,1466
+navigator_session/data.py,sha256=9XEaLDRIs3qrIVmeouN2Tx_mTPa2QbLZlB6s4ewelG8,5815
+navigator_session/middleware.py,sha256=kbTFWwY-NrFE-yen7DyOEyWjy8Pfol-5qiXCnm0vGa8,1959
+navigator_session/session.py,sha256=I6qWkMbqIpVX1RjxmccGsk1sCcqWZ_ZBVGwLXjV8wjw,2188
+navigator_session/version.py,sha256=fkvyKMVYoGczSFva3uyYFfnF5fTiOIZWsjHvhZyeGrM,394
+navigator_session/storages/__init__.py,sha256=ln0Xli0lppUopDMrvQGt69BFtUAe1Grmy2DGkEpANNU,132
+navigator_session/storages/abstract.py,sha256=mgtCvUD5KKlkWa-xOUBAoZbtZyPG_R7MbxIDOKGANYU,6074
+navigator_session/storages/cookie.py,sha256=_qL5kIGbT4rtCMze4yj1h4J7Zauz_e7HnorPnFbi90w,2468
+navigator_session/storages/redis.py,sha256=XSNEJ_xuyM-8y6xrraDyF6w_BT_JR4eGyclfa8ZvODo,9361
+navigator_session-0.4.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+navigator_session-0.4.5.dist-info/METADATA,sha256=jfelSp2_PhNfw36rwnTKScWJaLCxT-jVc2u6T8Gr574,2403
+navigator_session-0.4.5.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+navigator_session-0.4.5.dist-info/top_level.txt,sha256=ZpOEy3wLKGsxG2rc0nHqcqJCV3HIOG_XCfE6mtsYYYY,18
+navigator_session-0.4.5.dist-info/RECORD,,

navigator_session-0.4.3.dist-info/RECORD

@@ -1,15 +0,0 @@
-navigator_session/__init__.py,sha256=xsmc90K04EgQEtYidPN7bsXn0WIqw6GucNwy138Mmno,3038
-navigator_session/conf.py,sha256=PwCGoYpg_2MEq5_zObvbx4yXKf7AIKObO-lzTh2AvxM,1466
-navigator_session/data.py,sha256=CwvOqi0ZfJU4wsppMQ-m-he0PEgim3xdhBhTEYgPucs,5812
-navigator_session/middleware.py,sha256=EE2efxSzcCmh13tDu7_-qGROk6xlD174Fo3j3vCVcx4,1954
-navigator_session/session.py,sha256=k0RuyWix41rmlcTsSHRg5ZDxsU20n4igrRYCwTT6L8M,2186
-navigator_session/version.py,sha256=D8Lt03n0mQ6PxA0E4eMd8aYOcZoWkG0PRzqz5r2JxHw,394
-navigator_session/storages/__init__.py,sha256=ln0Xli0lppUopDMrvQGt69BFtUAe1Grmy2DGkEpANNU,132
-navigator_session/storages/abstract.py,sha256=ceVOCPV7SOEfTq5iKFdjvP9139qQBvvXPFwJsXc9Nis,6069
-navigator_session/storages/cookie.py,sha256=2jmpC4asep_qPH-Lte2aGXLEHi2v4P1U5dpkziP0foY,2463
-navigator_session/storages/redis.py,sha256=CUa05CmMJDLV5lsGqvySrReqUcUD-ylJkuSV2rU838Y,9242
-navigator_session-0.4.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-navigator_session-0.4.3.dist-info/METADATA,sha256=c_9CBvtXkqWAxwpt8672etLbF3z0hrLulf__gs2BiA4,2372
-navigator_session-0.4.3.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-navigator_session-0.4.3.dist-info/top_level.txt,sha256=ZpOEy3wLKGsxG2rc0nHqcqJCV3HIOG_XCfE6mtsYYYY,18
-navigator_session-0.4.3.dist-info/RECORD,,