-
Robot accounts allow for delegating access in multiple repositories to tokens
+
Robot accounts allow for delegating access in multiple repositories to role-based accounts that you manage
-
-
+
+
+
+
+ {{ shownRobot.name }}
diff --git a/static/js/app.js b/static/js/app.js
index 7561fd2e6..a2d30a5fb 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -550,7 +550,7 @@ quayApp.directive('plansTable', function () {
priority: 0,
templateUrl: '/static/directives/plans-table.html',
replace: false,
- transclude: true,
+ transclude: false,
restrict: 'C',
scope: {
'plans': '=plans',
@@ -566,13 +566,65 @@ quayApp.directive('plansTable', function () {
});
+quayApp.directive('dockerAuthDialog', function () {
+ var directiveDefinitionObject = {
+ priority: 0,
+ templateUrl: '/static/directives/docker-auth-dialog.html',
+ replace: false,
+ transclude: true,
+ restrict: 'C',
+ scope: {
+ 'username': '=username',
+ 'token': '=token',
+ 'shown': '=shown',
+ 'counter': '=counter'
+ },
+ controller: function($scope, $element, Restangular) {
+ $scope.isDownloadSupported = function() {
+ try { return !!new Blob(); } catch(e){}
+ return false;
+ };
+
+ $scope.downloadCfg = function() {
+ var auth = $.base64.encode($scope.username + ":" + $scope.token);
+ config = {
+ "https://quay.io/v1/": {
+ "auth": auth,
+ "email": ""
+ }
+ };
+
+ var file = JSON.stringify(config, null, ' ');
+ var blob = new Blob([file]);
+ saveAs(blob, '.dockercfg');
+ };
+
+ var show = function(r) {
+ if (!$scope.shown || !$scope.username || !$scope.token) {
+ $('#dockerauthmodal').modal('hide');
+ return;
+ }
+
+ $('#copyClipboard').clipboardCopy();
+ $('#dockerauthmodal').modal({});
+ };
+
+ $scope.$watch('counter', show);
+ $scope.$watch('shown', show);
+ $scope.$watch('username', show);
+ $scope.$watch('token', show);
+ }
+ };
+ return directiveDefinitionObject;
+});
+
quayApp.directive('robotsManager', function () {
var directiveDefinitionObject = {
priority: 0,
templateUrl: '/static/directives/robots-manager.html',
replace: false,
- transclude: true,
+ transclude: false,
restrict: 'C',
scope: {
'organization': '=organization',
@@ -581,6 +633,13 @@ quayApp.directive('robotsManager', function () {
controller: function($scope, $element, Restangular) {
$scope.robots = null;
$scope.loading = false;
+ $scope.shownRobot = null;
+ $scope.showRobotCounter = 0;
+
+ $scope.showRobot = function(info) {
+ $scope.shownRobot = info;
+ $scope.showRobotCounter++;
+ };
$scope.getShortenedName = function(name) {
var plus = name.indexOf('+');
@@ -592,6 +651,28 @@ quayApp.directive('robotsManager', function () {
return name.substr(0, plus);
};
+ $scope.createRobot = function(name) {
+ if (!name) { return; }
+
+ var url = $scope.organization ? getRestUrl('organization', $scope.organization.name, 'robots', name) :
+ getRestUrl('user/robots', name);
+ var createRobot = Restangular.one(url);
+ createRobot.customPUT().then(function(resp) {
+ $scope.robots.push(resp);
+ }, function(resp) {
+ bootbox.dialog({
+ "message": resp.data ? resp.data : 'The robot account could not be created',
+ "title": "Cannot create robot account",
+ "buttons": {
+ "close": {
+ "label": "Close",
+ "className": "btn-primary"
+ }
+ }
+ });
+ });
+ };
+
$scope.deleteRobot = function(info) {
var shortName = $scope.getShortenedName(info.name);
var url = $scope.organization ? getRestUrl('organization', $scope.organization.name, 'robots', shortName) :
@@ -601,12 +682,21 @@ quayApp.directive('robotsManager', function () {
deleteRobot.customDELETE().then(function(resp) {
for (var i = 0; i < $scope.robots.length; ++i) {
if ($scope.robots[i].name == info.name) {
- $scope.robots.slice(i, 1);
+ $scope.robots.splice(i, 1);
return;
}
}
}, function() {
-
+ bootbox.dialog({
+ "message": 'The selected robot account could not be deleted',
+ "title": "Cannot delete robot account",
+ "buttons": {
+ "close": {
+ "label": "Close",
+ "className": "btn-primary"
+ }
+ }
+ });
});
};
@@ -631,6 +721,52 @@ quayApp.directive('robotsManager', function () {
});
+quayApp.directive('popupInputButton', function () {
+ var directiveDefinitionObject = {
+ priority: 0,
+ templateUrl: '/static/directives/popup-input-button.html',
+ replace: false,
+ transclude: true,
+ restrict: 'C',
+ scope: {
+ 'placeholder': '=placeholder',
+ 'pattern': '=pattern',
+ 'submitted': '&submitted'
+ },
+ controller: function($scope, $element) {
+ $scope.popupShown = function() {
+ setTimeout(function() {
+ var box = $('#input-box');
+ box[0].value = '';
+ box.focus();
+ }, 10);
+ };
+
+ $scope.getRegexp = function(pattern) {
+ if (!pattern) {
+ pattern = '.*';
+ }
+ return new RegExp(pattern);
+ };
+
+ $scope.inputSubmit = function() {
+ var box = $('#input-box');
+ if (box.hasClass('ng-invalid')) { return; }
+
+ var entered = box[0].value;
+ if (!entered) {
+ return;
+ }
+
+ if ($scope.submitted) {
+ $scope.submitted({'value': entered});
+ }
+ };
+ }
+ };
+ return directiveDefinitionObject;
+});
+
quayApp.directive('organizationHeader', function () {
var directiveDefinitionObject = {
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 2d6dd6ccc..c3edc3733 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -422,30 +422,19 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
'html': true
});
- $('#copyClipboard').clipboardCopy();
-
var namespace = $routeParams.namespace;
var name = $routeParams.name;
$scope.permissions = {'team': [], 'user': []};
- $scope.isDownloadSupported = function() {
- try { return !!new Blob(); } catch(e){}
- return false;
+ $scope.getPrefix = function(name) {
+ var plus = name.indexOf('+');
+ return name.substr(0, plus + 1);
};
- $scope.downloadCfg = function(token) {
- var auth = $.base64.encode("$token:" + token.code);
- config = {
- "https://quay.io/v1/": {
- "auth": auth,
- "email": ""
- }
- };
-
- var file = JSON.stringify(config, null, ' ');
- var blob = new Blob([file]);
- saveAs(blob, '.dockercfg');
+ $scope.getShortenedName = function(name) {
+ var plus = name.indexOf('+');
+ return name.substr(plus + 1);
};
$scope.grantRole = function() {
@@ -554,9 +543,11 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
});
};
+ $scope.shownTokenCounter = 0;
+
$scope.showToken = function(tokenCode) {
$scope.shownToken = $scope.tokens[tokenCode];
- $('#tokenmodal').modal({});
+ $scope.shownTokenCounter++;
};
$scope.askChangeAccess = function(newAccess) {
@@ -1103,17 +1094,7 @@ function OrgViewCtrl($rootScope, $scope, Restangular, $routeParams) {
});
};
- $scope.createTeamShown = function() {
- setTimeout(function() {
- $('#create-team-box').focus();
- }, 10);
- };
-
- $scope.createTeam = function() {
- var box = $('#create-team-box');
- if (box.hasClass('ng-invalid')) { return; }
-
- var teamname = box[0].value.toLowerCase();
+ $scope.createTeam = function(teamname) {
if (!teamname) {
return;
}
diff --git a/static/partials/create-team-dialog.html b/static/partials/create-team-dialog.html
deleted file mode 100644
index 41a599189..000000000
--- a/static/partials/create-team-dialog.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/static/partials/org-view.html b/static/partials/org-view.html
index c1011d74f..2d05e1426 100644
--- a/static/partials/org-view.html
+++ b/static/partials/org-view.html
@@ -9,7 +9,12 @@
diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index 34f378cb5..df7ff652c 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -34,16 +34,16 @@
-
User
and Team Access Permissions
+
Access Permissions
-
+
- | User/Team |
+ User/Team/Robot Account |
Permissions |
|
@@ -52,7 +52,7 @@
|
-
+
{{name}}
|
@@ -69,9 +69,9 @@
|
|
-
-
- {{name}}
+
+
+ {{getPrefix(name)}}{{getShortenedName(name)}}
|
@@ -88,7 +88,7 @@
|
- |
+ |
|
@@ -107,7 +107,7 @@
- | Token Description |
+ Token Description |
Permissions |
|
@@ -133,10 +133,10 @@
- |
+ |
|
-
+ |
|
@@ -238,6 +238,10 @@
+
+ {{ shownToken.friendlyName }}
+
@@ -257,36 +261,6 @@
-
-
-
-
-
-
-
The docker username is $token and the password is the token. You may use any value for email.
-
-
-
-
-
-
-
-