From 8b22c86b10873316f439fd84ea67639286cc1ff2 Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Wed, 2 Oct 2019 15:29:45 -0400 Subject: [PATCH] Register default settings for OAUTH2_PROVIDER app Grab AUTHORIZATION_CODE_EXPIRE_SECONDS from oauth2_settings rather than hard code. Add REFRESH_TOKEN_EXPIRE_SECONDS to valid_key_names in OAuth2ProviderField class --- awx/api/conf.py | 3 ++- awx/api/fields.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/api/conf.py b/awx/api/conf.py index 27f255c68b..c4a4ea1f5b 100644 --- a/awx/api/conf.py +++ b/awx/api/conf.py @@ -38,7 +38,8 @@ register( 'OAUTH2_PROVIDER', field_class=OAuth2ProviderField, default={'ACCESS_TOKEN_EXPIRE_SECONDS': oauth2_settings.ACCESS_TOKEN_EXPIRE_SECONDS, - 'AUTHORIZATION_CODE_EXPIRE_SECONDS': 600}, + 'AUTHORIZATION_CODE_EXPIRE_SECONDS': oauth2_settings.AUTHORIZATION_CODE_EXPIRE_SECONDS, + 'REFRESH_TOKEN_EXPIRE_SECONDS': oauth2_settings.REFRESH_TOKEN_EXPIRE_SECONDS}, label=_('OAuth 2 Timeout Settings'), help_text=_('Dictionary for customizing OAuth 2 timeouts, available items are ' '`ACCESS_TOKEN_EXPIRE_SECONDS`, the duration of access tokens in the number ' diff --git a/awx/api/fields.py b/awx/api/fields.py index 3197e80c55..ace0667a9a 100644 --- a/awx/api/fields.py +++ b/awx/api/fields.py @@ -80,7 +80,7 @@ class OAuth2ProviderField(fields.DictField): default_error_messages = { 'invalid_key_names': _('Invalid key names: {invalid_key_names}'), } - valid_key_names = {'ACCESS_TOKEN_EXPIRE_SECONDS', 'AUTHORIZATION_CODE_EXPIRE_SECONDS'} + valid_key_names = {'ACCESS_TOKEN_EXPIRE_SECONDS', 'AUTHORIZATION_CODE_EXPIRE_SECONDS', 'REFRESH_TOKEN_EXPIRE_SECONDS'} child = fields.IntegerField(min_value=1) def to_internal_value(self, data):