updated

backend/auth/hook.go

@@ -202,7 +202,7 @@ func (a *HookAuth) SaveUser() (*users.User, error) {
 func (a *HookAuth) GetUser(d *users.User) *users.User {
 	// adds all permissions when user is admin
 	isAdmin := a.Fields.GetBoolean("user.perm.admin", d.Perm.Admin)
-	perm := users.Perm{
+	perms := users.Permissions{
 		Admin:    isAdmin,
 		Execute:  isAdmin || a.Fields.GetBoolean("user.perm.execute", d.Perm.Execute),
 		Create:   isAdmin || a.Fields.GetBoolean("user.perm.create", d.Perm.Create),
@@ -226,7 +226,7 @@ func (a *HookAuth) GetUser(d *users.User) *users.User {
 		},
 		Commands:     a.Fields.GetArray("user.commands", d.Commands),
 		HideDotfiles: a.Fields.GetBoolean("user.hideDotfiles", d.HideDotfiles),
-		Perm:         perm,
+		Perm:         perms,
 		LockPassword: true,
 	}
 

backend/filebrowser.yaml

@@ -7,7 +7,7 @@ auth:
 userDefaults:
   hideDotfiles: true
   singleClick: false
-  permissions:
+  perm:
     admin: false
     create: true
     rename: true

backend/http/auth.go

@@ -20,15 +20,15 @@ const (
 )
 
 type userInfo struct {
-	ID           uint       `json:"id"`
-	Locale       string     `json:"locale"`
-	ViewMode     string     `json:"viewMode"`
-	SingleClick  bool       `json:"singleClick"`
-	Perm         users.Perm `json:"perm"`
-	Commands     []string   `json:"commands"`
-	LockPassword bool       `json:"lockPassword"`
-	HideDotfiles bool       `json:"hideDotfiles"`
-	DateFormat   bool       `json:"dateFormat"`
+	ID           uint              `json:"id"`
+	Locale       string            `json:"locale"`
+	ViewMode     string            `json:"viewMode"`
+	SingleClick  bool              `json:"singleClick"`
+	Perm         users.Permissions `json:"perm"`
+	Commands     []string          `json:"commands"`
+	LockPassword bool              `json:"lockPassword"`
+	HideDotfiles bool              `json:"hideDotfiles"`
+	DateFormat   bool              `json:"dateFormat"`
 }
 
 type authToken struct {

backend/settings/config.go

@@ -67,7 +67,7 @@ func setDefaults() Settings {
 		UserDefaults: UserDefaults{
 			LockPassword: false,
 			HideDotfiles: true,
-			Perm: users.Perm{
+			Perm: users.Permissions{
 				Create:   true,
 				Rename:   true,
 				Modify:   true,

backend/settings/structs.go

@@ -89,8 +89,8 @@ type UserDefaults struct {
 		By  string `json:"by"`
 		Asc bool   `json:"asc"`
 	} `json:"sorting"`
-	Perm         users.Perm `json:"permissions"`
-	Commands     []string   `json:"commands"`
-	HideDotfiles bool       `json:"hideDotfiles"`
-	DateFormat   bool       `json:"dateFormat"`
+	Perm         users.Permissions `json:"perm"`
+	Commands     []string          `json:"commands"`
+	HideDotfiles bool              `json:"hideDotfiles"`
+	DateFormat   bool              `json:"dateFormat"`
 }

backend/users/users.go

@@ -16,7 +16,7 @@ var (
 	MosaicViewMode = "mosaic"
 )
 
-type Perm struct {
+type Permissions struct {
 	Admin    bool `json:"admin"`
 	Execute  bool `json:"execute"`
 	Create   bool `json:"create"`
@@ -37,7 +37,7 @@ type User struct {
 	LockPassword bool          `json:"lockPassword"`
 	ViewMode     string        `json:"viewMode"`
 	SingleClick  bool          `json:"singleClick"`
-	Perm         Perm          `json:"perm"`
+	Perm         Permissions   `json:"perm"`
 	Commands     []string      `json:"commands"`
 	Sorting      files.Sorting `json:"sorting"`
 	Fs           afero.Fs      `json:"-" yaml:"-"`