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

add RefreshToken Expiration setting in UI

Browse Source
This commit is contained in:
Christian Adams
2019-10-02 14:44:34 -04:00
parent 0e2b7767f5
commit f36f10a702
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/client/src/configuration/forms/settings-form.controller.js
View File

@@ -96,6 +96,8 @@ export default [
// OAUTH2_PROVIDER key // OAUTH2_PROVIDER key
data.ACCESS_TOKEN_EXPIRE_SECONDS = data data.ACCESS_TOKEN_EXPIRE_SECONDS = data
.OAUTH2_PROVIDER.ACCESS_TOKEN_EXPIRE_SECONDS; .OAUTH2_PROVIDER.ACCESS_TOKEN_EXPIRE_SECONDS;
data.REFRESH_TOKEN_EXPIRE_SECONDS = data
.OAUTH2_PROVIDER.REFRESH_TOKEN_EXPIRE_SECONDS;
data.AUTHORIZATION_CODE_EXPIRE_SECONDS = data data.AUTHORIZATION_CODE_EXPIRE_SECONDS = data
.OAUTH2_PROVIDER.AUTHORIZATION_CODE_EXPIRE_SECONDS; .OAUTH2_PROVIDER.AUTHORIZATION_CODE_EXPIRE_SECONDS;
var currentKeys = _.keys(data); var currentKeys = _.keys(data);
@@ -225,11 +227,12 @@ export default [
$scope.resetValue = function(key) { $scope.resetValue = function(key) {
Wait('start'); Wait('start');
var payload = {}; var payload = {};
if (key === 'ACCESS_TOKEN_EXPIRE_SECONDS' || key === 'AUTHORIZATION_CODE_EXPIRE_SECONDS') { if (key === 'ACCESS_TOKEN_EXPIRE_SECONDS' || key === 'REFRESH_TOKEN_EXPIRE_SECONDS' || key === 'AUTHORIZATION_CODE_EXPIRE_SECONDS') {
// the reset for these two keys needs to be nested under OAUTH2_PROVIDER // the reset for these two keys needs to be nested under OAUTH2_PROVIDER
if (payload.OAUTH2_PROVIDER === undefined) { if (payload.OAUTH2_PROVIDER === undefined) {
payload.OAUTH2_PROVIDER = { payload.OAUTH2_PROVIDER = {
ACCESS_TOKEN_EXPIRE_SECONDS: $scope.ACCESS_TOKEN_EXPIRE_SECONDS, ACCESS_TOKEN_EXPIRE_SECONDS: $scope.ACCESS_TOKEN_EXPIRE_SECONDS,
REFRESH_TOKEN_EXPIRE_SECONDS: $scope.REFRESH_TOKEN_EXPIRE_SECONDS,
AUTHORIZATION_CODE_EXPIRE_SECONDS: $scope.AUTHORIZATION_CODE_EXPIRE_SECONDS AUTHORIZATION_CODE_EXPIRE_SECONDS: $scope.AUTHORIZATION_CODE_EXPIRE_SECONDS
}; };
} }
@@ -314,11 +317,12 @@ export default [
var keys = _.keys(formDefs[formTracker.getCurrent()].fields); var keys = _.keys(formDefs[formTracker.getCurrent()].fields);
var payload = {}; var payload = {};
_.each(keys, function(key) { _.each(keys, function(key) {
if (key === 'ACCESS_TOKEN_EXPIRE_SECONDS' || key === 'AUTHORIZATION_CODE_EXPIRE_SECONDS') { if (key === 'ACCESS_TOKEN_EXPIRE_SECONDS' || key === 'REFRESH_TOKEN_EXPIRE_SECONDS' || key === 'AUTHORIZATION_CODE_EXPIRE_SECONDS') {
// These two values need to be POSTed nested under the OAUTH2_PROVIDER key // These two values need to be POSTed nested under the OAUTH2_PROVIDER key
if (payload.OAUTH2_PROVIDER === undefined) { if (payload.OAUTH2_PROVIDER === undefined) {
payload.OAUTH2_PROVIDER = { payload.OAUTH2_PROVIDER = {
ACCESS_TOKEN_EXPIRE_SECONDS: $scope.ACCESS_TOKEN_EXPIRE_SECONDS, ACCESS_TOKEN_EXPIRE_SECONDS: $scope.ACCESS_TOKEN_EXPIRE_SECONDS,
REFRESH_TOKEN_EXPIRE_SECONDS: $scope.REFRESH_TOKEN_EXPIRE_SECONDS,
AUTHORIZATION_CODE_EXPIRE_SECONDS: $scope.AUTHORIZATION_CODE_EXPIRE_SECONDS AUTHORIZATION_CODE_EXPIRE_SECONDS: $scope.AUTHORIZATION_CODE_EXPIRE_SECONDS
}; };
} }
@@ -539,11 +543,12 @@ export default [
var payload = {}; var payload = {};
clearApiErrors(); clearApiErrors();
_.each(keys, function(key) { _.each(keys, function(key) {
if (key === 'ACCESS_TOKEN_EXPIRE_SECONDS' || key === 'AUTHORIZATION_CODE_EXPIRE_SECONDS') { if (key === 'ACCESS_TOKEN_EXPIRE_SECONDS' || key === 'REFRESH_TOKEN_EXPIRE_SECONDS' || key === 'AUTHORIZATION_CODE_EXPIRE_SECONDS') {
// the reset for these two keys needs to be nested under OAUTH2_PROVIDER // the reset for these two keys needs to be nested under OAUTH2_PROVIDER
if (payload.OAUTH2_PROVIDER === undefined) { if (payload.OAUTH2_PROVIDER === undefined) {
payload.OAUTH2_PROVIDER = { payload.OAUTH2_PROVIDER = {
ACCESS_TOKEN_EXPIRE_SECONDS: $scope.ACCESS_TOKEN_EXPIRE_SECONDS, ACCESS_TOKEN_EXPIRE_SECONDS: $scope.ACCESS_TOKEN_EXPIRE_SECONDS,
REFRESH_TOKEN_EXPIRE_SECONDS: $scope.REFRESH_TOKEN_EXPIRE_SECONDS,
AUTHORIZATION_CODE_EXPIRE_SECONDS: $scope.AUTHORIZATION_CODE_EXPIRE_SECONDS AUTHORIZATION_CODE_EXPIRE_SECONDS: $scope.AUTHORIZATION_CODE_EXPIRE_SECONDS
}; };
} }

4
awx/ui/client/src/configuration/forms/system-form/sub-forms/system-misc.form.js
View File

@@ -47,6 +47,10 @@ export default ['i18n', function(i18n) {
type: 'text', type: 'text',
reset: 'ACCESS_TOKEN_EXPIRE_SECONDS' reset: 'ACCESS_TOKEN_EXPIRE_SECONDS'
}, },
REFRESH_TOKEN_EXPIRE_SECONDS: {
type: 'text',
reset: 'REFRESH_TOKEN_EXPIRE_SECONDS'
},
AUTHORIZATION_CODE_EXPIRE_SECONDS: { AUTHORIZATION_CODE_EXPIRE_SECONDS: {
type: 'text', type: 'text',
reset: 'AUTHORIZATION_CODE_EXPIRE_SECONDS' reset: 'AUTHORIZATION_CODE_EXPIRE_SECONDS'

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

@@ -39,6 +39,10 @@ export default ['GetBasePath', '$q', 'Rest', 'i18n',
i18n._('The duration (in seconds) access tokens remain valid since their creation.'), i18n._('The duration (in seconds) access tokens remain valid since their creation.'),
i18n._('Access Token Expiration'), i18n._('Access Token Expiration'),
'OAUTH2_PROVIDER'); 'OAUTH2_PROVIDER');
unnestOauth2ProviderKey('REFRESH_TOKEN_EXPIRE_SECONDS',
i18n._('The duration (in seconds) refresh tokens remain valid after the expiration of their associated access token.'),
i18n._('Refresh Token Expiration'),
'OAUTH2_PROVIDER');
unnestOauth2ProviderKey('AUTHORIZATION_CODE_EXPIRE_SECONDS', unnestOauth2ProviderKey('AUTHORIZATION_CODE_EXPIRE_SECONDS',
i18n._('The duration (in seconds) authorization codes remain valid since their creation.'), i18n._('The duration (in seconds) authorization codes remain valid since their creation.'),
i18n._('Authorization Code Expiration'), i18n._('Authorization Code Expiration'),