Merge branch 'feature/user-info-with-role-permissions' into feature/users-roles-endpoint

# Conflicts:
#	management/server/http/handlers/users/users_handler.go
This commit is contained in:
Pedro Costa
2025-04-17 15:34:05 +01:00
6 changed files with 9 additions and 10 deletions
-1
View File
@@ -188,7 +188,6 @@ components:
- auto_groups
- status
- is_blocked
- permissions
UserPermissions:
type: object
properties:
+2 -2
View File
@@ -1677,8 +1677,8 @@ type User struct {
LastLogin *time.Time `json:"last_login,omitempty"`
// Name User's name from idp provider
Name string `json:"name"`
Permissions UserPermissions `json:"permissions"`
Name string `json:"name"`
Permissions *UserPermissions `json:"permissions,omitempty"`
// Role User's NetBird account role
Role string `json:"role"`