vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change the encrypted password dialog to use the user's external username, if one exists.

Browse source 
Fixes #1538
This commit is contained in:
Joseph Schorr 2016-06-14 18:09:42 -04:00
parent f36442aa0d
commit 4b3420eddf
3 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
static/js/directives/ui/credentials-dialog.js
View file

@ -83,6 +83,10 @@ angular.module('quay').directive('credentialsDialog', function () {
return '';
}
if (credentials.namespace) {
return credentials.namespace;
}
return credentials.username.split('+')[0];
};
@ -166,8 +170,7 @@ angular.module('quay').directive('credentialsDialog', function () {
return '';
}
var username = credentials.username.replace('+', '-');
return username + '-pull-secret';
return $scope.getEscapedUsername(credentials) + '-pull-secret';
};
$scope.getKubernetesFile = function(credentials) {
@ -190,13 +193,16 @@ angular.module('quay').directive('credentialsDialog', function () {
return $scope.getSuffixedFilename(credentials, 'secret.yml')
};
$scope.getEscapedUsername = function(credentials) {
return credentials.username.replace(/[^a-zA-Z0-9]/, '-');
};
$scope.getSuffixedFilename = function(credentials, suffix) {
if (!credentials || !credentials.username) {
return '';
}
var username = credentials.username.replace('+', '-');
return username + '-' + suffix;
return $scope.getEscapedUsername(credentials) + '-' + suffix;
};
}
};