From 776f0406244e7cf52d4fa7caa34933dde7b813ad Mon Sep 17 00:00:00 2001 From: Juan Ignacio Fiorentino Date: Fri, 13 Apr 2018 16:36:51 -0300 Subject: [PATCH] Fix BaseCodeTokenModel and user attr. --- ...5_client_credentials.py => 0025_user_field_codetoken.py} | 2 +- oidc_provider/models.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) rename oidc_provider/migrations/{0025_client_credentials.py => 0025_user_field_codetoken.py} (94%) diff --git a/oidc_provider/migrations/0025_client_credentials.py b/oidc_provider/migrations/0025_user_field_codetoken.py similarity index 94% rename from oidc_provider/migrations/0025_client_credentials.py rename to oidc_provider/migrations/0025_user_field_codetoken.py index 5ca3c4e..d757fb0 100644 --- a/oidc_provider/migrations/0025_client_credentials.py +++ b/oidc_provider/migrations/0025_user_field_codetoken.py @@ -1,4 +1,4 @@ -# Generated by Django 2.0.3 on 2018-04-07 21:51 +# Generated by Django 2.0.3 on 2018-04-13 19:34 from django.conf import settings from django.db import migrations, models diff --git a/oidc_provider/models.py b/oidc_provider/models.py index 0ca6b12..411633c 100644 --- a/oidc_provider/models.py +++ b/oidc_provider/models.py @@ -130,8 +130,6 @@ class Client(models.Model): class BaseCodeTokenModel(models.Model): - user = models.ForeignKey( - settings.AUTH_USER_MODEL, verbose_name=_(u'User'), on_delete=models.CASCADE) client = models.ForeignKey(Client, verbose_name=_(u'Client'), on_delete=models.CASCADE) expires_at = models.DateTimeField(verbose_name=_(u'Expiration Date')) _scope = models.TextField(default='', verbose_name=_(u'Scopes')) @@ -159,6 +157,8 @@ class BaseCodeTokenModel(models.Model): class Code(BaseCodeTokenModel): + user = models.ForeignKey( + settings.AUTH_USER_MODEL, verbose_name=_(u'User'), on_delete=models.CASCADE) code = models.CharField(max_length=255, unique=True, verbose_name=_(u'Code')) nonce = models.CharField(max_length=255, blank=True, default='', verbose_name=_(u'Nonce')) is_authentication = models.BooleanField(default=False, verbose_name=_(u'Is Authentication?')) @@ -206,6 +206,8 @@ class Token(BaseCodeTokenModel): class UserConsent(BaseCodeTokenModel): + user = models.ForeignKey( + settings.AUTH_USER_MODEL, verbose_name=_(u'User'), on_delete=models.CASCADE) date_given = models.DateTimeField(verbose_name=_(u'Date Given')) class Meta: