Kill utils.tokens

flaskbb/email.py

@@ -14,7 +14,6 @@ from flask_mail import Message
 from flask_babelplus import lazy_gettext as _
 
 from flaskbb.extensions import mail, celery
-from flaskbb.utils.tokens import make_token
 
 
 logger = logging.getLogger(__name__)

flaskbb/utils/tokens.py

@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    flaskbb.utils.tokens
-    ~~~~~~~~~~~~~~~~~~~~
-
-    A module that helps to create and verify various tokens that
-    are used by FlaskBB.
-
-    :copyright: (c) 2014 by the FlaskBB Team.
-    :license: BSD, see LICENSE for more details.
-"""
-import logging
-from flask import current_app
-from itsdangerous import (TimedJSONWebSignatureSerializer, SignatureExpired,
-                          BadSignature)
-
-from flaskbb.user.models import User
-
-
-logger = logging.getLogger(__name__)
-
-
-def make_token(user_id, operation, expire=3600):
-    """Generates a JSON Web Signature (JWS).
-    See `RFC 7515 <https://tools.ietf.org/html/rfc7515>` if you want to know
-    more about JWS.
-
-    :param user_id: The user_id for which the token should be generated.
-    :param operation: The function of the token. For example, you might want
-                      to generate two different tokens. One for a
-                      password reset link, which you hypothetically want
-                      to name 'reset' and the second one, for the generation
-                      of a token for a E-Mail confirmation link, which you
-                      name 'email'.
-    :param expire: The time, in seconds, after which the token should be
-                   invalid. Defaults to 3600.
-    """
-    s = TimedJSONWebSignatureSerializer(
-        current_app.config['SECRET_KEY'], expire
-    )
-    data = {"id": user_id, "op": operation}
-    return s.dumps(data)
-
-
-def get_token_status(token, operation, return_data=False):
-    """Returns the expired status, invalid status, the user and optionally
-    the content of the JSON Web Signature token.
-
-    :param token: A valid JSON Web Signature token.
-    :param operation: The function of the token.
-    :param return_data: If set to ``True``, it will also return the content
-                        of the token.
-    """
-    s = TimedJSONWebSignatureSerializer(current_app.config['SECRET_KEY'])
-    user, data = None, None
-    expired, invalid = False, False
-
-    try:
-        data = s.loads(token)
-    except SignatureExpired:
-        expired = True
-    except (BadSignature, TypeError, ValueError):
-        invalid = True
-
-    if data is not None:
-        # check if the operation matches the one from the token
-        if operation == data.get("op", None):
-            user = User.query.filter_by(id=data.get('id')).first()
-        else:
-            invalid = True
-
-    if return_data:
-        return expired, invalid, user, data
-
-    return expired, invalid, user

tests/unit/utils/test_tokens.py

@@ -1,55 +0,0 @@
-from flask import current_app
-from itsdangerous import TimedJSONWebSignatureSerializer
-from flaskbb.utils.tokens import make_token, get_token_status
-
-
-def test_make_token(user):
-    token = make_token(user.id, "test")
-    s = TimedJSONWebSignatureSerializer(current_app.config['SECRET_KEY'])
-    unpacked_token = s.loads(token)
-    assert user.id == unpacked_token["id"]
-    assert "test" == unpacked_token["op"]
-
-
-def test_valid_token_status(user):
-    token = make_token(user.id, "valid_test")
-    expired, invalid, token_user = get_token_status(token, "valid_test")
-
-    assert not expired
-    assert not invalid
-    assert token_user == user
-
-
-def test_token_status_with_data(user):
-    token = make_token(user.id, "test_data")
-    expired, invalid, token_user, data = \
-        get_token_status(token, "test_data", return_data=True)
-    assert user.id == data["id"]
-    assert "test_data" == data["op"]
-
-
-def test_token_operation(user):
-    token = make_token(user.id, "operation_test")
-    expired, invalid, token_user = get_token_status(token, "invalid_op")
-    assert invalid
-    assert not expired
-    assert not token_user
-
-
-def test_invalid_token_status(user):
-    token = "this-is-not-a-token"
-    expired, invalid, token_user, data = \
-        get_token_status(token, "invalid_test", return_data=True)
-
-    assert invalid
-    assert not expired
-    assert not token_user
-    assert data is None
-
-
-def test_expired_token_status(user):
-    token = make_token(user.id, "expired_test", -1)
-    expired, invalid, token_user = get_token_status(token, "expired_test")
-    assert expired
-    assert not invalid
-    assert not token_user