Skip to content

Drop custom separator in favor of default colon (:) #28

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
Nov 14, 2021
Merged

Drop custom separator in favor of default colon (:) #28

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
a6eb1aa
Drop custom separator in favor of default colon (`:`)
amureki Nov 8, 2021
9268167
Change token
amureki Nov 10, 2021
8a981cf
Pin psycopg2-binary<2.9 in CI
amureki Nov 10, 2021
d56f6e3
Fix token for Django 2.2
amureki Nov 10, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- run: python -m pip install --upgrade pip setuptools wheel
- uses: actions/[email protected]
- run: python -m pip install psycopg2-binary Django~=${{ matrix.django-version }}
- run: python -m pip install "psycopg2-binary<2.9" Django~=${{ matrix.django-version }}
- run: python setup.py test
env:
DB_PORT: ${{ job.services.postgres.ports[5432] }}
Expand Down
3 changes: 0 additions & 3 deletions mailauth/signing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ class UserDoesNotExist(signing.BadSignature):
class UserSigner(signing.TimestampSigner):
"""Issue and verify URL safe access tokens for users."""

def __init__(self, key=None, sep=".", salt=None):
super().__init__(key=key, sep=sep, salt=salt)

@staticmethod
def to_timestamp(value):
"""
Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ def admin_user(db):
def signature():
"""Return a signature matching the user fixture."""
if django.VERSION < (3, 1):
return "LZ.173QUS.1Hjptg.lf2hFgOXQtjQsFypS2ItRG2hkpA"
return "LZ.173QUS.1Hjptg.UtFdkTPoyrSA0IB6AUEhtz_hMyFZY0kcREE1HnWdFq4"
return "LZ:173QUS:1Hjptg:umUR9iKN1rxDezT-dZGwqcqsM5Y"
return "LZ:173QUS:1Hjptg:6oq5DS1NJ7SxJ1o-CpfgaqrImVaRpkcHrzV9yltwcHM"


@pytest.fixture()
Expand Down