make user permissions optional

This commit is contained in:
Pedro Costa
2025-04-17 15:32:44 +01:00
parent e42d4c06c2
commit 82ab78d176
5 changed files with 8 additions and 9 deletions

View File

@@ -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,

View File

@@ -188,7 +188,6 @@ components:
- auto_groups
- status
- is_blocked
- permissions
UserPermissions:
type: object
properties:

View File

@@ -1670,8 +1670,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"`

View File

@@ -314,7 +314,7 @@ func toUserWithPermissionsResponse(user *users.UserInfoWithPermissions, userID s
permissions.Modules = &modules
}
response.Permissions = permissions
response.Permissions = &permissions
return response
}

View File

@@ -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,