Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-08 23:35:31 +02:00
Code Issues Releases Activity

feat(api): introduces swagger.yml (#1112)

Browse source
This commit is contained in:
Anthony Lapenna 2017-08-13 16:45:55 +02:00 • committed by GitHub
parent d3e87b2435
commit 92391254bc
19 changed files with 2691 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/directives/accessControlForm/porAccessControlFormController.js
View file

@ -1,6 +1,6 @@
angular.module('portainer')
.controller('porAccessControlFormController', ['$q', 'UserService', 'Notifications', 'Authentication', 'ResourceControlService',
function ($q, UserService, Notifications, Authentication, ResourceControlService) {
.controller('porAccessControlFormController', ['$q', 'UserService', 'TeamService', 'Notifications', 'Authentication', 'ResourceControlService',
function ($q, UserService, TeamService, Notifications, Authentication, ResourceControlService) {
var ctrl = this;
ctrl.availableTeams = [];
@ -42,7 +42,7 @@ function ($q, UserService, Notifications, Authentication, ResourceControlService
}
$q.all({
availableTeams: UserService.userTeams(userDetails.ID),
availableTeams: TeamService.teams(),
availableUsers: isAdmin ? UserService.users(false) : []
})
.then(function success(data) {

6
app/directives/accessControlPanel/porAccessControlPanelController.js
View file

@ -1,6 +1,6 @@
angular.module('portainer')
.controller('porAccessControlPanelController', ['$q', '$state', 'UserService', 'ResourceControlService', 'Notifications', 'Authentication', 'ModalService', 'FormValidator',
function ($q, $state, UserService, ResourceControlService, Notifications, Authentication, ModalService, FormValidator) {
.controller('porAccessControlPanelController', ['$q', '$state', 'UserService', 'TeamService', 'ResourceControlService', 'Notifications', 'Authentication', 'ModalService', 'FormValidator',
function ($q, $state, UserService, TeamService, ResourceControlService, Notifications, Authentication, ModalService, FormValidator) {
var ctrl = this;
@ -121,7 +121,7 @@ function ($q, $state, UserService, ResourceControlService, Notifications, Authen
return $q.all({
availableUsers: isAdmin ? UserService.users(false) : [],
availableTeams: isAdmin || data.isPartOfRestrictedUsers ? UserService.userTeams(userId) : []
availableTeams: isAdmin || data.isPartOfRestrictedUsers ? TeamService.teams() : []
});
})
.then(function success(data) {

1
app/rest/api/user.js
View file

@ -8,7 +8,6 @@ angular.module('portainer.rest')
update: { method: 'PUT', params: { id: '@id' } },
remove: { method: 'DELETE', params: { id: '@id'} },
queryMemberships: { method: 'GET', isArray: true, params: { id: '@id', entity: 'memberships' } },
queryTeams: { method: 'GET', isArray: true, params: { id: '@id', entity: 'teams' } },
// RPCs should be moved to a specific endpoint
checkPassword: { method: 'POST', params: { id: '@id', entity: 'passwd' } },
checkAdminUser: { method: 'GET', params: { id: 'admin', entity: 'check' }, isArray: true },

21
app/services/api/userService.js
View file

@ -1,5 +1,5 @@
angular.module('portainer.services')
.factory('UserService', ['$q', 'Users', 'UserHelper', 'TeamMembershipService', function UserServiceFactory($q, Users, UserHelper, TeamMembershipService) {
.factory('UserService', ['$q', 'Users', 'UserHelper', 'TeamService', 'TeamMembershipService', function UserServiceFactory($q, Users, UserHelper, TeamService, TeamMembershipService) {
'use strict';
var service = {};
@ -110,28 +110,11 @@ angular.module('portainer.services')
return deferred.promise;
};
service.userTeams = function(id) {
var deferred = $q.defer();
Users.queryTeams({id: id}).$promise
.then(function success(data) {
var teams = data.map(function (item) {
return new TeamViewModel(item);
});
deferred.resolve(teams);
})
.catch(function error(err) {
deferred.reject({ msg: 'Unable to retrieve user teams', err: err });
});
return deferred.promise;
};
service.userLeadingTeams = function(id) {
var deferred = $q.defer();
$q.all({
teams: service.userTeams(id),
teams: TeamService.teams(),
memberships: service.userMemberships(id)
})
.then(function success(data) {