vvzvlad/portainer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move registry struct definitions to dataservice/registry

Browse Source 
Signed-off-by: Sven Dowideit <sven.dowideit@portainer.io>
This commit is contained in:
Sven Dowideit
2022-02-23 16:21:35 +10:00
parent 1598ec47ff
commit ea0b34de72
101 changed files with 610 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/http/handler/users/user_remove_access_token.go
+4 -3
View File
@@ -1,6 +1,7 @@
package users
import (
"github.com/portainer/portainer/api/database"
"net/http"
httperror "github.com/portainer/libhttp/error"
@@ -43,11 +44,11 @@ func (handler *Handler) userRemoveAccessToken(w http.ResponseWriter, r *http.Req
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve user authentication token", err}
}
if tokenData.Role != portainer.AdministratorRole && tokenData.ID != portainer.UserID(userID) {
if tokenData.Role != portainer.AdministratorRole && tokenData.ID != database.UserID(userID) {
return &httperror.HandlerError{http.StatusForbidden, "Permission denied to get user access tokens", httperrors.ErrUnauthorized}
}
_, err = handler.DataStore.User().User(portainer.UserID(userID))
_, err = handler.DataStore.User().User(database.UserID(userID))
if err != nil {
if handler.DataStore.IsErrObjectNotFound(err) {
return &httperror.HandlerError{http.StatusNotFound, "Unable to find a user with the specified identifier inside the database", err}
@@ -60,7 +61,7 @@ func (handler *Handler) userRemoveAccessToken(w http.ResponseWriter, r *http.Req
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "API Key not found", err}
}
if apiKey.UserID != portainer.UserID(userID) {
if apiKey.UserID != database.UserID(userID) {
return &httperror.HandlerError{http.StatusForbidden, "Permission denied to remove api-key", httperrors.ErrUnauthorized}
}