External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4890 from rooftopcellist/refresh_expiry

Browse Source 
Add RefreshToken Expiration setting in UI

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-10-03 19:13:58 +00:00 committed by GitHub
commit 9e778b24c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show Stats 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
data.ACCESS_TOKEN_EXPIRE_SECONDS = data
.OAUTH2_PROVIDER.ACCESS_TOKEN_EXPIRE_SECONDS;
data.REFRESH_TOKEN_EXPIRE_SECONDS = data
.OAUTH2_PROVIDER.REFRESH_TOKEN_EXPIRE_SECONDS;
data.AUTHORIZATION_CODE_EXPIRE_SECONDS = data
.OAUTH2_PROVIDER.AUTHORIZATION_CODE_EXPIRE_SECONDS;
var currentKeys = _.keys(data);
@ -225,11 +227,12 @@ export default [
$scope.resetValue = function(key) {
Wait('start');
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
if (payload.OAUTH2_PROVIDER === undefined) {
payload.OAUTH2_PROVIDER = {
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
};
}
@ -314,11 +317,12 @@ export default [
var keys = _.keys(formDefs[formTracker.getCurrent()].fields);
var payload = {};
_.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
if (payload.OAUTH2_PROVIDER === undefined) {
payload.OAUTH2_PROVIDER = {
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
};
}
@ -539,11 +543,12 @@ export default [
var payload = {};
clearApiErrors();
_.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
if (payload.OAUTH2_PROVIDER === undefined) {
payload.OAUTH2_PROVIDER = {
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
};
}

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',
reset: 'ACCESS_TOKEN_EXPIRE_SECONDS'
},
REFRESH_TOKEN_EXPIRE_SECONDS: {
type: 'text',
reset: 'REFRESH_TOKEN_EXPIRE_SECONDS'
},
AUTHORIZATION_CODE_EXPIRE_SECONDS: {
type: 'text',
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._('Access Token Expiration'),
'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',
i18n._('The duration (in seconds) authorization codes remain valid since their creation.'),
i18n._('Authorization Code Expiration'),