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

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

management/server/permissions/manager.go

@@ -21,7 +21,7 @@ type Manager interface {
 	ValidateRoleModuleAccess(ctx context.Context, accountID string, role roles.RolePermissions, module modules.Module, operation operations.Operation) bool
 	ValidateAccountAccess(ctx context.Context, accountID string, user *types.User, allowOwnerAndAdmin bool) error
 
-	GetRolePermissions(ctx context.Context, role types.UserRole) (roles.RolePermissions, error)
+	GetRolePermissions(ctx context.Context, role types.UserRole) (roles.Permissions, error)
 	GetPermissions(ctx context.Context) map[types.UserRole]roles.RolePermissions
 }
 
@@ -67,9 +67,9 @@ func (m *managerImpl) ValidateUserPermissions(
 		return true, nil // this should be replaced by proper granular access role
 	}
 
-	role, err := m.GetRolePermissions(ctx, user.Role)
-	if err != nil {
-		return false, err
+	role, ok := roles.RolesMap[user.Role]
+	if !ok {
+		return false, status.NewUserRoleNotFoundError(string(user.Role))
 	}
 
 	return m.ValidateRoleModuleAccess(ctx, accountID, role, module, operation), nil
@@ -100,10 +100,20 @@ func (m *managerImpl) ValidateAccountAccess(ctx context.Context, accountID strin
 	return nil
 }
 
-func (m *managerImpl) GetRolePermissions(ctx context.Context, role types.UserRole) (roles.RolePermissions, error) {
-	permissions, ok := roles.RolesMap[role]
+func (m *managerImpl) GetRolePermissions(ctx context.Context, role types.UserRole) (roles.Permissions, error) {
+	roleMap, ok := roles.RolesMap[role]
 	if !ok {
-		return roles.RolePermissions{}, status.NewUserRoleNotFoundError(string(role))
+		return roles.Permissions{}, status.NewUserRoleNotFoundError(string(role))
+	}
+
+	permissions := roles.Permissions{}
+
+	for k := range modules.All {
+		if rolePermissions, ok := roleMap.Permissions[k]; ok {
+			permissions[k] = rolePermissions
+			continue
+		}
+		permissions[k] = roleMap.AutoAllowNew
 	}
 
 	return permissions, nil

management/server/permissions/manager_mock.go

@@ -53,10 +53,10 @@ func (mr *MockManagerMockRecorder) GetPermissions(ctx interface{}) *gomock.Call
 }
 
 // GetRolePermissions mocks base method.
-func (m *MockManager) GetRolePermissions(ctx context.Context, role types.UserRole) (roles.RolePermissions, error) {
+func (m *MockManager) GetRolePermissions(ctx context.Context, role types.UserRole) (roles.Permissions, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetRolePermissions", ctx, role)
-	ret0, _ := ret[0].(roles.RolePermissions)
+	ret0, _ := ret[0].(roles.Permissions)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }

management/server/permissions/modules/module.go

@@ -17,3 +17,19 @@ const (
 	SetupKeys   Module = "setup_keys"
 	Pats        Module = "pats"
 )
+
+var All = map[Module]struct{}{
+	Networks:    {},
+	Peers:       {},
+	Groups:      {},
+	Settings:    {},
+	Accounts:    {},
+	Dns:         {},
+	Nameservers: {},
+	Events:      {},
+	Policies:    {},
+	Routes:      {},
+	Users:       {},
+	SetupKeys:   {},
+	Pats:        {},
+}