Merge pull request #83 from joegasewicz/auth_model

Auth model not assigned correctly fixes #82

Author: Joe Gasewicz

flask_jwt_router/_authentication.py

@@ -28,14 +28,14 @@ def update_entity(self):
 class BaseAuthStrategy(ABC):
 
     @abstractmethod
-    def register_entity(self, extensions: Config, exp: Any, **kwargs):
+    def register_entity(self, extensions: Config, exp: int, **kwargs):
         pass
 
     @abstractmethod
-    def update_entity(self, extensions: Config, exp: Any, **kwargs):
+    def update_entity(self, extensions: Config, exp: int, **kwargs):
         pass
 
-    def encode_token(self, extensions: Config, entity_id: Any, exp: Any):
+    def encode_token(self, extensions: Config, entity_id: Any, exp: int):
         pass
 
 
@@ -57,7 +57,7 @@ class JWTAuthStrategy(BaseAuthStrategy):
     def __init__(self):
         super(JWTAuthStrategy, self).__init__()
 
-    def encode_token(self, extensions: Config, entity_id: Any, exp: Any) -> str:
+    def encode_token(self, extensions: Config, entity_id: Any, exp: int) -> str:
         """
         :param extensions: See :class:`~flask_jwt_router._extensions`
         :param entity_id: Normally the primary key `id` or `user_id`
@@ -76,7 +76,7 @@ def encode_token(self, extensions: Config, entity_id: Any, exp: Any) -> str:
         ).decode("utf-8")
         return encoded
 
-    def register_entity(self, extensions: Config, exp: Any, **kwargs) -> Union[str, None]:
+    def register_entity(self, extensions: Config, exp: int, **kwargs) -> Union[str, None]:
         """
         :param extensions: See :class:`~flask_jwt_router._extensions`
         :param exp: The expiry duration set when encoding a new token
@@ -85,12 +85,12 @@ def register_entity(self, extensions: Config, exp: Any, **kwargs) -> Union[str,
         """
         self.entity_id = kwargs.get("entity_id", None)
         if self.entity_id:
-            token = self.encode_token(extensions, exp, self.entity_id)
+            token = self.encode_token(extensions, self.entity_id, exp)
             return token
         else:
             return None
 
-    def update_entity(self, extensions: Config, exp: Any, **kwargs) -> Union[str, None]:
+    def update_entity(self, extensions: Config, exp: int, **kwargs) -> Union[str, None]:
         """
         :param extensions:
         :param exp:
@@ -99,7 +99,7 @@ def update_entity(self, extensions: Config, exp: Any, **kwargs) -> Union[str, No
         """
         self.entity_id = kwargs.get("entity_id", None)
         if self.entity_id:
-            token = self.encode_token(extensions, exp, self.entity_id)
+            token = self.encode_token(extensions, self.entity_id, exp)
             return token
         else:
             return None

flask_jwt_router/_jwt_router.py

@@ -24,8 +24,8 @@ class FlaskJWTRouter:
     #: The Flask application instance.
     app = None
 
-    #: Token expiry.
-    exp = 30
+    #: Token expiry value. eg. 30 = 30 days from creation date.
+    exp: int = 30
 
     _auth_model: ClassVar = None
 
@@ -51,7 +51,7 @@ class FlaskJWTRouter:
 
     def __init__(self, app=None, **kwargs):
         self.ext = Extensions()
-        _auth_model = kwargs.get("entity_model", None)
+        self._auth_model = kwargs.get("entity_model", None)
 
         if app:
             self.init_app(app)

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='flask-jwt-router',
-    version='0.0.18',
+    version='0.0.19',
     description='Flask JWT Router is a Python library that adds authorised routes to a Flask app',
     packages=["flask_jwt_router"],
     classifiers=[