diff --git a/awx/main/migrations/0041_v330_update_oauth_refreshtoken.py b/awx/main/migrations/0041_v330_update_oauth_refreshtoken.py new file mode 100644 index 0000000000..6f71563e29 --- /dev/null +++ b/awx/main/migrations/0041_v330_update_oauth_refreshtoken.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.11 on 2018-06-14 21:03 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL), + ('main', '0040_v330_unifiedjob_controller_node'), + ] + + operations = [ + migrations.AddField( + model_name='oauth2accesstoken', + name='source_refresh_token', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='refreshed_access_token', to=settings.OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL), + ), + ] diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 978cbf05c0..f0f4d68b88 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -348,6 +348,7 @@ AUTHENTICATION_BACKENDS = ( # Django OAuth Toolkit settings OAUTH2_PROVIDER_APPLICATION_MODEL = 'main.OAuth2Application' OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL = 'main.OAuth2AccessToken' +OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = 'oauth2_provider.RefreshToken' OAUTH2_PROVIDER = {'ACCESS_TOKEN_EXPIRE_SECONDS': 31536000000, 'AUTHORIZATION_CODE_EXPIRE_SECONDS': 600} diff --git a/requirements/requirements.in b/requirements/requirements.in index 17b7b95e17..994c75adfe 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -16,7 +16,7 @@ django-celery==3.2.2 django-crum==0.7.2 django-extensions==2.0.0 django-jsonfield==1.0.1 -django-oauth-toolkit==1.0.0 +django-oauth-toolkit==1.1.2 django-polymorphic==2.0.2 django-pglocks==1.0.2 django-radius==1.3.3 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index a45f3453de..26efa3b99a 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -114,7 +114,7 @@ django-celery==3.2.2 django-crum==0.7.2 django-extensions==2.0.0 django-jsonfield==1.0.1 -django-oauth-toolkit==1.0.0 +django-oauth-toolkit==1.1.2 django-pglocks==1.0.2 django-polymorphic==2.0.2 django-radius==1.3.3