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

management/server/http/api/openapi.yml

@@ -188,9 +188,13 @@ components:
         - auto_groups
         - status
         - is_blocked
+        - permissions
     UserPermissions:
       type: object
       properties:
+        is_restricted:
+          type: boolean
+          description: Indicates whether this User's Peers view is restricted
         modules:
           type: object
           additionalProperties:
@@ -219,6 +223,7 @@ components:
               - write
       required:
         - default
+        - is_restricted
     UserRequest:
       type: object
       properties:

management/server/http/api/types.gen.go

@@ -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,omitempty"`
+	Name        string          `json:"name"`
+	Permissions UserPermissions `json:"permissions"`
 
 	// Role User's NetBird account role
 	Role string `json:"role"`
@@ -1710,8 +1710,11 @@ type UserCreateRequest struct {
 
 // UserPermissions defines model for UserPermissions.
 type UserPermissions struct {
-	Default map[string]bool             `json:"default"`
-	Modules *map[string]map[string]bool `json:"modules,omitempty"`
+	Default map[string]bool `json:"default"`
+
+	// IsRestricted Indicates whether this User's Peers view is restricted
+	IsRestricted bool                        `json:"is_restricted"`
+	Modules      *map[string]map[string]bool `json:"modules,omitempty"`
 }
 
 // UserRequest defines model for UserRequest.