Skip to content
This repository was archived by the owner on Aug 29, 2023. It is now read-only.
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
18 changes: 18 additions & 0 deletions oauth2_provider/migrations/0008_alter_idtoken_token.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.15 on 2023-04-10 18:32

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('oauth2_provider', '0007_alter_idtoken_jti'),
]

operations = [
migrations.AlterField(
model_name='idtoken',
name='token',
field=models.TextField(null=True, unique=False, blank=True),
),
]
2 changes: 1 addition & 1 deletion oauth2_provider/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ class AbstractIDToken(models.Model):
null=True,
related_name="%(app_label)s_%(class)s",
)
token = models.TextField(unique=True)
token = models.TextField(null=True, unique=False, blank=True)
jti = models.UUIDField(unique=True, default=uuid.uuid4, editable=False, verbose_name="JWT Token ID")
application = models.ForeignKey(
oauth2_settings.APPLICATION_MODEL,
Expand Down
6 changes: 2 additions & 4 deletions oauth2_provider/oauth2_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -704,12 +704,10 @@ def validate_refresh_token(self, refresh_token, client, request, *args, **kwargs
return rt.application == client

@transaction.atomic
def _save_id_token(self, id_token, jwt_token, request, expires, *args, **kwargs):
def _save_id_token(self, id_token, request, expires, *args, **kwargs):
scopes = request.scope or " ".join(request.scopes)

id_token = IDToken.objects.create(
# TODO sc-77179: Once reading from jti is live, we can stop writing to token.
token=jwt_token.serialize(),
user=request.user,
scope=scopes,
expires=expires,
Expand Down Expand Up @@ -781,7 +779,7 @@ def finalize_id_token(self, id_token, token, token_handler, request):
claims=json.dumps(id_token, default=str),
)
jwt_token.make_signed_token(request.client.jwk_key)
id_token = self._save_id_token(id_token, jwt_token, request, expiration_time)
id_token = self._save_id_token(id_token, request, expiration_time)
# this is needed by django rest framework
request.access_token = id_token
request.id_token = id_token
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = django-oauth-toolkit
version = 1.5.2
version = 1.5.3
description = OAuth2 Provider for Django
long_description = file: README.rst
long_description_content_type = text/x-rst
Expand Down