Skip to content

Commit ae37ec2

Browse files
authored
Sem-Ver: bugfix Deduplicate the various framework test create_token methods.
Signed-off-by: David Black <[email protected]>
1 parent 8584489 commit ae37ec2

File tree

4 files changed

+24
-27
lines changed

4 files changed

+24
-27
lines changed

atlassian_jwt_auth/frameworks/django/tests/test_django.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
import django
44
from django.test.testcases import SimpleTestCase
55
from django.test.utils import override_settings, modify_settings
6+
67
try:
78
from django.urls import reverse
89
except ImportError:
910
from django.core.urlresolvers import reverse
1011

11-
from atlassian_jwt_auth import create_signer
12-
from atlassian_jwt_auth.contrib.tests.utils import get_static_retriever_class
12+
from atlassian_jwt_auth.contrib.tests.utils import (
13+
get_static_retriever_class,
14+
)
1315
from atlassian_jwt_auth.tests import utils
14-
from atlassian_jwt_auth.tests.utils import RS256KeyTestMixin
15-
16-
17-
def create_token(issuer, audience, key_id, private_key, subject=None):
18-
signer = create_signer(issuer, key_id, private_key, subject=subject)
19-
return signer.generate_jwt(audience)
16+
from atlassian_jwt_auth.tests.utils import (
17+
create_token,
18+
RS256KeyTestMixin,
19+
)
2020

2121

2222
class DjangoAsapMixin(object):

atlassian_jwt_auth/frameworks/flask/tests/test_flask.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
from flask import Flask
44

5-
import atlassian_jwt_auth
6-
from atlassian_jwt_auth.tests import utils
7-
from atlassian_jwt_auth.frameworks.flask import with_asap
85
from atlassian_jwt_auth.contrib.flask_app import requires_asap
96
from atlassian_jwt_auth.contrib.tests.utils import get_static_retriever_class
7+
from atlassian_jwt_auth.frameworks.flask import with_asap
8+
from atlassian_jwt_auth.tests import utils
9+
from atlassian_jwt_auth.tests.utils import (
10+
create_token,
11+
)
1012

1113

1214
def get_app():
@@ -30,13 +32,6 @@ def view_for_another_client_app():
3032
return app
3133

3234

33-
def create_token(issuer, audience, key_id, private_key):
34-
signer = atlassian_jwt_auth.create_signer(
35-
issuer, key_id, private_key
36-
)
37-
return signer.generate_jwt(audience)
38-
39-
4035
class FlaskTests(utils.RS256KeyTestMixin, unittest.TestCase):
4136
""" tests for the atlassian_jwt_auth.contrib.tests.flask """
4237

atlassian_jwt_auth/frameworks/wsgi/tests/test_wsgi.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
import unittest
22

3-
import atlassian_jwt_auth
4-
from atlassian_jwt_auth.tests import utils
53
from atlassian_jwt_auth.contrib.tests.utils import get_static_retriever_class
64
from atlassian_jwt_auth.frameworks.wsgi.middleware import ASAPMiddleware
5+
from atlassian_jwt_auth.tests import utils
6+
from atlassian_jwt_auth.tests.utils import (
7+
create_token,
8+
)
79

810

911
def app(environ, start_response):
1012
start_response('200 OK', [], None)
1113
return "OK"
1214

1315

14-
def create_token(issuer, audience, key_id, private_key):
15-
signer = atlassian_jwt_auth.create_signer(
16-
issuer, key_id, private_key
17-
)
18-
return signer.generate_jwt(audience)
19-
20-
2116
class WsgiTests(utils.RS256KeyTestMixin, unittest.TestCase):
2217
""" tests for the atlassian_jwt_auth.contrib.tests.flask """
2318

atlassian_jwt_auth/tests/utils.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ def get_example_jwt_auth_signer(**kwargs):
4141
issuer, key_id, key, algorithm=algorithm)
4242

4343

44+
def create_token(issuer, audience, key_id, private_key, subject=None):
45+
"""" returns a token based upon the supplied parameters. """
46+
signer = atlassian_jwt_auth.create_signer(
47+
issuer, key_id, private_key, subject=subject)
48+
return signer.generate_jwt(audience)
49+
50+
4451
class BaseJWTAlgorithmTestMixin(object):
4552

4653
""" A mixin class to make testing different support for different

0 commit comments

Comments
 (0)