mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-18 00:06:38 +00:00
make user permissions optional
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -188,7 +188,6 @@ components:
|
||||
- auto_groups
|
||||
- status
|
||||
- is_blocked
|
||||
- permissions
|
||||
UserPermissions:
|
||||
type: object
|
||||
properties:
|
||||
|
||||
@@ -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"`
|
||||
|
||||
@@ -314,7 +314,7 @@ func toUserWithPermissionsResponse(user *users.UserInfoWithPermissions, userID s
|
||||
permissions.Modules = &modules
|
||||
}
|
||||
|
||||
response.Permissions = permissions
|
||||
response.Permissions = &permissions
|
||||
|
||||
return response
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user