Skip to content
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.

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

Stop deleting blacklist on user delete #516

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Generated by Django 3.2.10 on 2022-01-24 06:42

import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("token_blacklist", "0011_linearizes_history"),
]

operations = [
migrations.AlterField(
model_name="outstandingtoken",
name="user",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to=settings.AUTH_USER_MODEL,
),
),
]
2 changes: 1 addition & 1 deletion rest_framework_simplejwt/token_blacklist/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class OutstandingToken(models.Model):
id = models.BigAutoField(primary_key=True, serialize=False)
user = models.ForeignKey(
settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True, blank=True
settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, null=True, blank=True
)

jti = models.CharField(unique=True, max_length=255)
Expand Down
23 changes: 23 additions & 0 deletions tests/test_token_blacklist.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,29 @@ def test_it_should_delete_any_expired_tokens(self):
[not_expired_2["jti"], not_expired_3["jti"]],
)

def test_token_blacklist_will_not_be_removed_on_User_delete(self):
token = RefreshToken.for_user(self.user)
outstanding_token = OutstandingToken.objects.first()

# Should raise no exception
RefreshToken(str(token))

# Add token to blacklist
BlacklistedToken.objects.create(token=outstanding_token)

with self.assertRaises(TokenError) as e:
# Should raise exception
RefreshToken(str(token))
self.assertIn("blacklisted", e.exception.args[0])

# Delete the User and try again
self.user.delete()

with self.assertRaises(TokenError) as e:
# Should raise exception
RefreshToken(str(token))
self.assertIn("blacklisted", e.exception.args[0])


class TestPopulateJtiHexMigration(MigrationTestCase):
migrate_from = ("token_blacklist", "0002_outstandingtoken_jti_hex")
Expand Down