Skip to content

Fix: Support PyJWT 2 and up #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 2, 2021
Merged

Fix: Support PyJWT 2 and up #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
747f978
Fix incorrect kwarg name
marcgibbons Jan 20, 2021
8babf8d
Add support for pyjwt 2.x+
marcgibbons Jan 20, 2021
0cdbedd
Unpin dev requirement versions so CI uses most recent
marcgibbons Jan 20, 2021
c134526
Pin correct pylint version for python 2/3
jonathanlloyd Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
nose==1.3.7
pylint==1.9.4
pylint==1.9.4; python_version < '3.0'
pylint==2.6.0; python_version > '3.5'
requests-mock==1.5.2
collective.checkdocs==0.2
codecov==2.0.15
3 changes: 2 additions & 1 deletion pusher_push_notifications/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,8 @@ def generate_token(self, user_id):
},
self.secret_key,
algorithm='HS256',
).decode('utf-8')
)
token = six.ensure_text(token)

return {
'token': token,
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
six>1.4.0,<2
requests>2.5.0,<3
pyjwt>1.1.0,<2
pyjwt>1.1.0,<3
2 changes: 1 addition & 1 deletion tests/test_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def test_generate_token_should_return_token(self):
decoded_token = jwt.decode(
token_string,
'SECRET_KEY',
algorithm='HS256',
algorithms='HS256',
)

expected_issuer = 'https://INSTANCE_ID.pushnotifications.pusher.com'
Expand Down