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

# Conflicts:
#	management/server/http/handlers/users/users_handler.go

README.md

@@ -61,7 +61,7 @@
 |----|----|----|----|----|
 | <ul><li>- \[x] Kernel WireGuard</ul></li> | <ul><li>- \[x] [Admin Web UI](https://github.com/netbirdio/dashboard)</ul></li> | <ul><li>- \[x] [SSO & MFA support](https://docs.netbird.io/how-to/installation#running-net-bird-with-sso-login)</ul></li> | <ul><li>- \[x] [Public API](https://docs.netbird.io/api)</ul></li> | <ul><li>- \[x] Linux</ul></li> |
 | <ul><li>- \[x] Peer-to-peer connections</ul></li> | <ul><li>- \[x] Auto peer discovery and configuration</ui></li> | <ul><li>- \[x] [Access control - groups & rules](https://docs.netbird.io/how-to/manage-network-access)</ui></li> | <ul><li>- \[x] [Setup keys for bulk network provisioning](https://docs.netbird.io/how-to/register-machines-using-setup-keys)</ui></li> | <ul><li>- \[x] Mac</ui></li> |
-| <ul><li>- \[x] Connection relay fallback</ui></li> | <ul><li>- \[x] [IdP integrations](https://docs.netbird.io/selfhosted/identity-providers)</ui></li> | <ul><li>- \[x] [Activity logging](https://docs.netbird.io/how-to/monitor-system-and-network-activity)</ui></li> | <ul><li>- \[x] [Self-hosting quickstart script](https://docs.netbird.io/selfhosted/selfhosted-quickstart)</ui></li> | <ul><li>- \[x] Windows</ui></li> |
+| <ul><li>- \[x] Connection relay fallback</ui></li> | <ul><li>- \[x] [IdP integrations](https://docs.netbird.io/selfhosted/identity-providers)</ui></li> | <ul><li>- \[x] [Activity logging](https://docs.netbird.io/how-to/audit-events-logging)</ui></li> | <ul><li>- \[x] [Self-hosting quickstart script](https://docs.netbird.io/selfhosted/selfhosted-quickstart)</ui></li> | <ul><li>- \[x] Windows</ui></li> |
 | <ul><li>- \[x] [Routes to external networks](https://docs.netbird.io/how-to/routing-traffic-to-private-networks)</ui></li> | <ul><li>- \[x] [Private DNS](https://docs.netbird.io/how-to/manage-dns-in-your-network)</ui></li> | <ul><li>- \[x] [Device posture checks](https://docs.netbird.io/how-to/manage-posture-checks)</ui></li> | <ul><li>- \[x] IdP groups sync with JWT</ui></li> | <ul><li>- \[x] Android</ui></li> |
 | <ul><li>- \[x] NAT traversal with BPF</ui></li> | <ul><li>- \[x] [Multiuser support](https://docs.netbird.io/how-to/add-users-to-your-network)</ui></li> | <ul><li>- \[x] Peer-to-peer encryption</ui></li> || <ul><li>- \[x] iOS</ui></li> |
 ||| <ul><li>- \[x] [Quantum-resistance with Rosenpass](https://netbird.io/knowledge-hub/the-first-quantum-resistant-mesh-vpn)</ui></li> || <ul><li>- \[x] OpenWRT</ui></li> |

management/client/rest/users_test.go

@@ -30,7 +30,7 @@ var (
 		Issued:        ptr("api"),
 		LastLogin:     &time.Time{},
 		Name:          "M. Essam",
-		Permissions: api.UserPermissions{
+		Permissions: &api.UserPermissions{
 			Default: map[string]bool{
 				"read":  false,
 				"write": false,

management/server/http/api/openapi.yml

@@ -188,7 +188,6 @@ components:
         - auto_groups
         - status
         - is_blocked
-        - permissions
     UserPermissions:
       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"`
+	Name        string           `json:"name"`
+	Permissions *UserPermissions `json:"permissions,omitempty"`
 
 	// Role User's NetBird account role
 	Role string `json:"role"`

management/server/http/handlers/users/users_handler.go

@@ -328,7 +328,7 @@ func toRolesResponse(roles map[types.UserRole]roles.RolePermissions) []api.RoleP
 func toUserWithPermissionsResponse(user *users.UserInfoWithPermissions, userID string) *api.User {
 	response := toUserResponse(user.UserInfo, userID)
 
-	response.Permissions = api.UserPermissions{
+	response.Permissions = &api.UserPermissions{
 		IsRestricted: user.Restricted,
 		Default:      toOperationsMapResponse(user.Permissions.AutoAllowNew),
 		Modules:      toModulesMapResponse(user.Permissions.Permissions),

management/server/http/handlers/users/users_handler_test.go

@@ -605,7 +605,7 @@ func TestCurrentUser(t *testing.T) {
 				AutoGroups:    []string{},
 				Issued:        ptr("api"),
 				LastLogin:     ptr(time.Time{}),
-				Permissions: api.UserPermissions{
+				Permissions: &api.UserPermissions{
 					IsRestricted: false,
 					Default: map[string]bool{
 						"read":   true,
@@ -630,7 +630,7 @@ func TestCurrentUser(t *testing.T) {
 				AutoGroups:    []string{},
 				Issued:        ptr("api"),
 				LastLogin:     ptr(time.Time{}),
-				Permissions: api.UserPermissions{
+				Permissions: &api.UserPermissions{
 					Default: map[string]bool{
 						"read":   false,
 						"create": false,
@@ -654,7 +654,7 @@ func TestCurrentUser(t *testing.T) {
 				AutoGroups:    []string{},
 				Issued:        ptr("api"),
 				LastLogin:     ptr(time.Time{}),
-				Permissions: api.UserPermissions{
+				Permissions: &api.UserPermissions{
 					IsRestricted: false,
 					Default: map[string]bool{
 						"read":   true,
@@ -687,7 +687,7 @@ func TestCurrentUser(t *testing.T) {
 				AutoGroups:    []string{},
 				Issued:        ptr("api"),
 				LastLogin:     ptr(time.Time{}),
-				Permissions: api.UserPermissions{
+				Permissions: &api.UserPermissions{
 					IsRestricted: true,
 					Default: map[string]bool{
 						"read":   false,