Fix Django 2.0 deprecation warnings (#185)
* explicit default foreign key delete operations * first iteration of Django 2.0 deprecation fixes
This commit is contained in:
parent
f78e2be3c5
commit
04c03787af
|
@ -1,6 +1,12 @@
|
||||||
from hashlib import sha224
|
from hashlib import sha224
|
||||||
|
|
||||||
from django.core.urlresolvers import reverse
|
import django
|
||||||
|
|
||||||
|
if django.VERSION >= (1, 11):
|
||||||
|
from django.urls import reverse
|
||||||
|
else:
|
||||||
|
from django.core.urlresolvers import reverse
|
||||||
|
|
||||||
from django.http import HttpResponse
|
from django.http import HttpResponse
|
||||||
|
|
||||||
from oidc_provider import settings
|
from oidc_provider import settings
|
||||||
|
|
|
@ -34,7 +34,7 @@ class Migration(migrations.Migration):
|
||||||
('expires_at', models.DateTimeField()),
|
('expires_at', models.DateTimeField()),
|
||||||
('_scope', models.TextField(default=b'')),
|
('_scope', models.TextField(default=b'')),
|
||||||
('code', models.CharField(unique=True, max_length=255)),
|
('code', models.CharField(unique=True, max_length=255)),
|
||||||
('client', models.ForeignKey(to='oidc_provider.Client')),
|
('client', models.ForeignKey(to='oidc_provider.Client', on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'abstract': False,
|
'abstract': False,
|
||||||
|
@ -49,7 +49,7 @@ class Migration(migrations.Migration):
|
||||||
('_scope', models.TextField(default=b'')),
|
('_scope', models.TextField(default=b'')),
|
||||||
('access_token', models.CharField(unique=True, max_length=255)),
|
('access_token', models.CharField(unique=True, max_length=255)),
|
||||||
('_id_token', models.TextField()),
|
('_id_token', models.TextField()),
|
||||||
('client', models.ForeignKey(to='oidc_provider.Client')),
|
('client', models.ForeignKey(to='oidc_provider.Client', on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'abstract': False,
|
'abstract': False,
|
||||||
|
@ -59,7 +59,7 @@ class Migration(migrations.Migration):
|
||||||
migrations.CreateModel(
|
migrations.CreateModel(
|
||||||
name='UserInfo',
|
name='UserInfo',
|
||||||
fields=[
|
fields=[
|
||||||
('user', models.OneToOneField(primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)),
|
('user', models.OneToOneField(primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
|
||||||
('given_name', models.CharField(max_length=255, null=True, blank=True)),
|
('given_name', models.CharField(max_length=255, null=True, blank=True)),
|
||||||
('family_name', models.CharField(max_length=255, null=True, blank=True)),
|
('family_name', models.CharField(max_length=255, null=True, blank=True)),
|
||||||
('middle_name', models.CharField(max_length=255, null=True, blank=True)),
|
('middle_name', models.CharField(max_length=255, null=True, blank=True)),
|
||||||
|
@ -89,13 +89,13 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='token',
|
model_name='token',
|
||||||
name='user',
|
name='user',
|
||||||
field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
|
field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
|
||||||
preserve_default=True,
|
preserve_default=True,
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='code',
|
model_name='code',
|
||||||
name='user',
|
name='user',
|
||||||
field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
|
field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
|
||||||
preserve_default=True,
|
preserve_default=True,
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -19,8 +19,8 @@ class Migration(migrations.Migration):
|
||||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||||
('expires_at', models.DateTimeField()),
|
('expires_at', models.DateTimeField()),
|
||||||
('_scope', models.TextField(default=b'')),
|
('_scope', models.TextField(default=b'')),
|
||||||
('client', models.ForeignKey(to='oidc_provider.Client')),
|
('client', models.ForeignKey(to='oidc_provider.Client', on_delete=models.CASCADE)),
|
||||||
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
|
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'abstract': False,
|
'abstract': False,
|
||||||
|
|
|
@ -83,8 +83,8 @@ class Client(models.Model):
|
||||||
|
|
||||||
class BaseCodeTokenModel(models.Model):
|
class BaseCodeTokenModel(models.Model):
|
||||||
|
|
||||||
user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_(u'User'))
|
user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_(u'User'), on_delete=models.CASCADE)
|
||||||
client = models.ForeignKey(Client, verbose_name=_(u'Client'))
|
client = models.ForeignKey(Client, verbose_name=_(u'Client'), on_delete=models.CASCADE)
|
||||||
expires_at = models.DateTimeField(verbose_name=_(u'Expiration Date'))
|
expires_at = models.DateTimeField(verbose_name=_(u'Expiration Date'))
|
||||||
_scope = models.TextField(default='', verbose_name=_(u'Scopes'))
|
_scope = models.TextField(default='', verbose_name=_(u'Scopes'))
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ from oidc_provider import (
|
||||||
views,
|
views,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
app_name = 'oidc_provider'
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^authorize/?$', views.AuthorizeView.as_view(), name='authorize'),
|
url(r'^authorize/?$', views.AuthorizeView.as_view(), name='authorize'),
|
||||||
url(r'^token/?$', csrf_exempt(views.TokenView.as_view()), name='token'),
|
url(r'^token/?$', csrf_exempt(views.TokenView.as_view()), name='token'),
|
||||||
|
|
|
@ -11,8 +11,14 @@ from django.contrib.auth.views import (
|
||||||
redirect_to_login,
|
redirect_to_login,
|
||||||
logout,
|
logout,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
import django
|
||||||
|
if django.VERSION >= (1, 11):
|
||||||
|
from django.urls import reverse
|
||||||
|
else:
|
||||||
|
from django.core.urlresolvers import reverse
|
||||||
|
|
||||||
from django.contrib.auth import logout as django_user_logout
|
from django.contrib.auth import logout as django_user_logout
|
||||||
from django.core.urlresolvers import reverse
|
|
||||||
from django.http import JsonResponse
|
from django.http import JsonResponse
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
from django.template.loader import render_to_string
|
from django.template.loader import render_to_string
|
||||||
|
|
Loading…
Reference in a new issue