Skip to content

Commit 3622f85

Browse files
committed
Change all default IDs to BigAutoField
Closes #177
1 parent d1620b2 commit 3622f85

File tree

2 files changed

+54
-9
lines changed

2 files changed

+54
-9
lines changed

oauth2_provider/migrations/0005_auto_20170514_1141.py

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import unicode_literals
44

55
from oauth2_provider.settings import oauth2_settings
6+
from django.conf import settings
67
from django.db import migrations, models
78
import django.db.models.deletion
89

@@ -19,4 +20,39 @@ class Migration(migrations.Migration):
1920
name='application',
2021
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=oauth2_settings.APPLICATION_MODEL),
2122
),
23+
migrations.AlterField(
24+
model_name='accesstoken',
25+
name='id',
26+
field=models.BigAutoField(primary_key=True, serialize=False),
27+
),
28+
migrations.AlterField(
29+
model_name='accesstoken',
30+
name='user',
31+
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='oauth2_provider_accesstoken', to=settings.AUTH_USER_MODEL),
32+
),
33+
migrations.AlterField(
34+
model_name='application',
35+
name='id',
36+
field=models.BigAutoField(primary_key=True, serialize=False),
37+
),
38+
migrations.AlterField(
39+
model_name='grant',
40+
name='id',
41+
field=models.BigAutoField(primary_key=True, serialize=False),
42+
),
43+
migrations.AlterField(
44+
model_name='grant',
45+
name='user',
46+
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='oauth2_provider_grant', to=settings.AUTH_USER_MODEL),
47+
),
48+
migrations.AlterField(
49+
model_name='refreshtoken',
50+
name='id',
51+
field=models.BigAutoField(primary_key=True, serialize=False),
52+
),
53+
migrations.AlterField(
54+
model_name='refreshtoken',
55+
name='user',
56+
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='oauth2_provider_refreshtoken', to=settings.AUTH_USER_MODEL),
57+
),
2258
]

oauth2_provider/models.py

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class AbstractApplication(models.Model):
5757
(GRANT_CLIENT_CREDENTIALS, _("Client credentials")),
5858
)
5959

60+
id = models.BigAutoField(primary_key=True)
6061
client_id = models.CharField(
6162
max_length=100, unique=True, default=generate_client_id, db_index=True
6263
)
@@ -168,11 +169,15 @@ class AbstractGrant(models.Model):
168169
* :attr:`redirect_uri` Self explained
169170
* :attr:`scope` Required scopes, optional
170171
"""
171-
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE,
172-
related_name="%(app_label)s_%(class)s")
172+
id = models.BigAutoField(primary_key=True)
173+
user = models.ForeignKey(
174+
settings.AUTH_USER_MODEL, on_delete=models.CASCADE,
175+
related_name="%(app_label)s_%(class)s"
176+
)
173177
code = models.CharField(max_length=255, unique=True) # code comes from oauthlib
174-
application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL,
175-
on_delete=models.CASCADE)
178+
application = models.ForeignKey(
179+
oauth2_settings.APPLICATION_MODEL, on_delete=models.CASCADE
180+
)
176181
expires = models.DateTimeField()
177182
redirect_uri = models.CharField(max_length=255)
178183
scope = models.TextField(blank=True)
@@ -215,12 +220,15 @@ class AbstractAccessToken(models.Model):
215220
* :attr:`expires` Date and time of token expiration, in DateTime format
216221
* :attr:`scope` Allowed scopes
217222
"""
218-
user = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True,
219-
on_delete=models.CASCADE,
220-
related_name="%(app_label)s_%(class)s")
223+
id = models.BigAutoField(primary_key=True)
224+
user = models.ForeignKey(
225+
settings.AUTH_USER_MODEL, on_delete=models.CASCADE, blank=True, null=True,
226+
related_name="%(app_label)s_%(class)s"
227+
)
221228
token = models.CharField(max_length=255, unique=True, )
222-
application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL, blank=True, null=True,
223-
on_delete=models.CASCADE)
229+
application = models.ForeignKey(
230+
oauth2_settings.APPLICATION_MODEL, on_delete=models.CASCADE, blank=True, null=True,
231+
)
224232
expires = models.DateTimeField()
225233
scope = models.TextField(blank=True)
226234

@@ -297,6 +305,7 @@ class AbstractRefreshToken(models.Model):
297305
* :attr:`access_token` AccessToken instance this refresh token is
298306
bounded to
299307
"""
308+
id = models.BigAutoField(primary_key=True)
300309
user = models.ForeignKey(
301310
settings.AUTH_USER_MODEL, on_delete=models.CASCADE,
302311
related_name="%(app_label)s_%(class)s"

0 commit comments

Comments
 (0)