External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Checks to make sure that OAUTH2_PROVIDER key is returned by api in settings options before attempting to use it. This fixes a bug where setting ACCESS_TOKEN_EXPIRE_SECONDS and AUTHORIZATION_CODE_EXPIRE_SECONDS manually in a file was causing the settings page to render improperly.

Browse Source
This commit is contained in:
mabashian
2019-10-01 10:17:33 -04:00
parent 80a17987ff
commit 4aeda635ff
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui/client/src/configuration/settings.service.js
View File

@@ -34,14 +34,16 @@ export default ['GetBasePath', '$q', 'Rest', 'i18n',
} }
delete optsFromAPI[key].child; delete optsFromAPI[key].child;
}; };
unnestOauth2ProviderKey('ACCESS_TOKEN_EXPIRE_SECONDS', if (optsFromAPI.OAUTH2_PROVIDER) {
i18n._('The duration (in seconds) access tokens remain valid since their creation.'), unnestOauth2ProviderKey('ACCESS_TOKEN_EXPIRE_SECONDS',
i18n._('Access Token Expiration'), i18n._('The duration (in seconds) access tokens remain valid since their creation.'),
'OAUTH2_PROVIDER'); i18n._('Access Token Expiration'),
unnestOauth2ProviderKey('AUTHORIZATION_CODE_EXPIRE_SECONDS', 'OAUTH2_PROVIDER');
i18n._('The duration (in seconds) authorization codes remain valid since their creation.'), unnestOauth2ProviderKey('AUTHORIZATION_CODE_EXPIRE_SECONDS',
i18n._('Authorization Code Expiration'), i18n._('The duration (in seconds) authorization codes remain valid since their creation.'),
'OAUTH2_PROVIDER'); i18n._('Authorization Code Expiration'),
'OAUTH2_PROVIDER');
}
return optsFromAPI; return optsFromAPI;
}; };
var getActions = appendOauth2ProviderKeys(data.actions.GET); var getActions = appendOauth2ProviderKeys(data.actions.GET);