Change Tokens to ApiKey

Added name to ApiKey model

app/dao/api_key_dao.py

@@ -0,0 +1,51 @@
+from flask import current_app
+from itsdangerous import URLSafeSerializer
+
+from app import db
+from app.models import ApiKey
+
+
+def save_model_api_key(api_key, update_dict={}):
+    if update_dict:
+        del update_dict['id']
+        db.session.query(ApiKey).filter_by(id=api_key.id).update(update_dict)
+    else:
+        api_key.secret = _generate_secret()
+        db.session.add(api_key)
+    db.session.commit()
+
+
+def get_model_api_keys(service_id=None, raise_=True):
+    """
+    :param raise_: when True query api_keys using one() which will raise NoResultFound exception
+                   when False query api_keys usong first() which will return None and not raise an exception.
+    """
+    if service_id:
+        # If expiry date is None the api_key is active
+        if raise_:
+            return ApiKey.query.filter_by(service_id=service_id, expiry_date=None).one()
+        else:
+            return ApiKey.query.filter_by(service_id=service_id, expiry_date=None).first()
+    return ApiKey.query.filter_by().all()
+
+
+def get_unsigned_secret(service_id):
+    """
+    There should only be one valid api_keys for each service.
+    This method can only be exposed to the Authentication of the api calls.
+    """
+    api_key = ApiKey.query.filter_by(service_id=service_id, expiry_date=None).one()
+    return _get_secret(api_key.secret)
+
+
+def _generate_secret(token=None):
+    import uuid
+    if not token:
+        token = uuid.uuid4()
+    serializer = URLSafeSerializer(current_app.config.get('SECRET_KEY'))
+    return serializer.dumps(str(token), current_app.config.get('DANGEROUS_SALT'))
+
+
+def _get_secret(signed_secret):
+    serializer = URLSafeSerializer(current_app.config.get('SECRET_KEY'))
+    return serializer.loads(signed_secret, salt=current_app.config.get('DANGEROUS_SALT'))

app/dao/tokens_dao.py

@@ -1,51 +0,0 @@
-from flask import current_app
-from itsdangerous import URLSafeSerializer
-
-from app import db
-from app.models import Token
-
-
-def save_model_token(token, update_dict={}):
-    if update_dict:
-        del update_dict['id']
-        db.session.query(Token).filter_by(id=token.id).update(update_dict)
-    else:
-        token.token = _generate_token()
-        db.session.add(token)
-    db.session.commit()
-
-
-def get_model_tokens(service_id=None, raise_=True):
-    """
-    :param raise_: when True query tokens using one() which will raise NoResultFound exception
-                   when False query tokens usong first() which will return None and not raise an exception.
-    """
-    if service_id:
-        # If expiry date is None the token is active
-        if raise_:
-            return Token.query.filter_by(service_id=service_id, expiry_date=None).one()
-        else:
-            return Token.query.filter_by(service_id=service_id, expiry_date=None).first()
-    return Token.query.filter_by().all()
-
-
-def get_unsigned_token(service_id):
-    """
-    There should only be one valid token for each service.
-    This method can only be exposed to the Authentication of the api calls.
-    """
-    token = Token.query.filter_by(service_id=service_id, expiry_date=None).one()
-    return _get_token(token.token)
-
-
-def _generate_token(token=None):
-    import uuid
-    if not token:
-        token = uuid.uuid4()
-    serializer = URLSafeSerializer(current_app.config.get('SECRET_KEY'))
-    return serializer.dumps(str(token), current_app.config.get('DANGEROUS_SALT'))
-
-
-def _get_token(token):
-    serializer = URLSafeSerializer(current_app.config.get('SECRET_KEY'))
-    return serializer.loads(token, salt=current_app.config.get('DANGEROUS_SALT'))