extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-20 01:38:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow owners that did not create the account to delete it (#1825)

Browse Source 
Sometimes the Owner role will be passed to new users, and they need to be able to delete the account
This commit is contained in:
Maycon Santos 2024-04-11 10:02:51 +02:00 committed by GitHub
parent 3ed2f08f3c
commit 704c67dec8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
management/server/account.go
View File

@ -242,19 +242,19 @@ type UserPermissions struct {
} }
type UserInfo struct { type UserInfo struct {
ID string `json:"id"` ID string `json:"id"`
Email string `json:"email"` Email string `json:"email"`
Name string `json:"name"` Name string `json:"name"`
Role string `json:"role"` Role string `json:"role"`
AutoGroups []string `json:"auto_groups"` AutoGroups []string `json:"auto_groups"`
Status string `json:"-"` Status string `json:"-"`
IsServiceUser bool `json:"is_service_user"` IsServiceUser bool `json:"is_service_user"`
IsBlocked bool `json:"is_blocked"` IsBlocked bool `json:"is_blocked"`
NonDeletable bool `json:"non_deletable"` NonDeletable bool `json:"non_deletable"`
LastLogin time.Time `json:"last_login"` LastLogin time.Time `json:"last_login"`
Issued string `json:"issued"` Issued string `json:"issued"`
IntegrationReference integration_reference.IntegrationReference `json:"-"` IntegrationReference integration_reference.IntegrationReference `json:"-"`
Permissions UserPermissions `json:"permissions"` Permissions UserPermissions `json:"permissions"`
} }
// getRoutesToSync returns the enabled routes for the peer ID and the routes // getRoutesToSync returns the enabled routes for the peer ID and the routes
@ -1120,7 +1120,7 @@ func (am *DefaultAccountManager) DeleteAccount(accountID, userID string) error {
return status.Errorf(status.PermissionDenied, "user is not allowed to delete account") return status.Errorf(status.PermissionDenied, "user is not allowed to delete account")
} }
if user.Id != account.CreatedBy { if user.Role != UserRoleOwner {
return status.Errorf(status.PermissionDenied, "user is not allowed to delete account. Only account owner can delete account") return status.Errorf(status.PermissionDenied, "user is not allowed to delete account. Only account owner can delete account")
} }
for _, otherUser := range account.Users { for _, otherUser := range account.Users {