From f029c3005e450cfbebb074c42dbdf65db9c8d56a Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sat, 6 Dec 2025 10:52:11 +0100 Subject: [PATCH] refactor: cleanup package names (#5605) --- auth/hook.go | 4 ++-- auth/proxy.go | 4 ++-- cmd/config.go | 12 ++++++------ errors/errors.go | 2 +- files/file.go | 6 +++--- http/auth.go | 6 +++--- http/commands.go | 2 +- http/data.go | 2 +- http/headers.go | 2 +- http/http.go | 2 +- http/preview.go | 2 +- http/preview_enum.go | 2 +- http/public.go | 2 +- http/public_test.go | 2 +- http/raw.go | 2 +- http/resource.go | 14 +++++++------- http/search.go | 2 +- http/settings.go | 2 +- http/share.go | 8 ++++---- http/static.go | 2 +- http/subtitle.go | 2 +- http/tus_handlers.go | 2 +- http/users.go | 12 ++++++------ http/utils.go | 2 +- settings/storage.go | 4 ++-- share/storage.go | 4 ++-- storage/bolt/auth.go | 4 ++-- storage/bolt/share.go | 12 ++++++------ storage/bolt/users.go | 10 +++++----- storage/bolt/utils.go | 4 ++-- users/password.go | 6 +++--- users/storage.go | 8 ++++---- users/users.go | 6 +++--- 33 files changed, 78 insertions(+), 78 deletions(-) diff --git a/auth/hook.go b/auth/hook.go index ec3c5bfb..9bb38969 100644 --- a/auth/hook.go +++ b/auth/hook.go @@ -11,7 +11,7 @@ import ( "slices" "strings" - fbErrors "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/files" "github.com/filebrowser/filebrowser/v2/settings" "github.com/filebrowser/filebrowser/v2/users" @@ -146,7 +146,7 @@ func (a *HookAuth) GetValues(s string) { // SaveUser updates the existing user or creates a new one when not found func (a *HookAuth) SaveUser() (*users.User, error) { u, err := a.Users.Get(a.Server.Root, a.Cred.Username) - if err != nil && !errors.Is(err, fbErrors.ErrNotExist) { + if err != nil && !errors.Is(err, fberrors.ErrNotExist) { return nil, err } diff --git a/auth/proxy.go b/auth/proxy.go index 301aa292..3f4a627c 100644 --- a/auth/proxy.go +++ b/auth/proxy.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - fbErrors "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/settings" "github.com/filebrowser/filebrowser/v2/users" ) @@ -21,7 +21,7 @@ type ProxyAuth struct { func (a ProxyAuth) Auth(r *http.Request, usr users.Store, setting *settings.Settings, srv *settings.Server) (*users.User, error) { username := r.Header.Get(a.Header) user, err := usr.Get(srv.Root, username) - if errors.Is(err, fbErrors.ErrNotExist) { + if errors.Is(err, fberrors.ErrNotExist) { return a.createUser(usr, setting, srv, username) } return user, err diff --git a/cmd/config.go b/cmd/config.go index 93ba29df..4766c389 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -2,7 +2,7 @@ package cmd import ( "encoding/json" - nerrors "errors" + "errors" "fmt" "os" "strings" @@ -12,7 +12,7 @@ import ( "github.com/spf13/pflag" "github.com/filebrowser/filebrowser/v2/auth" - "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/settings" ) @@ -104,7 +104,7 @@ func getProxyAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (a } if header == "" { - return nil, nerrors.New("you must set the flag 'auth.header' for method 'proxy'") + return nil, errors.New("you must set the flag 'auth.header' for method 'proxy'") } return &auth.ProxyAuth{Header: header}, nil @@ -163,7 +163,7 @@ func getHookAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (au } if command == "" { - return nil, nerrors.New("you must set the flag 'auth.command' for method 'hook'") + return nil, errors.New("you must set the flag 'auth.command' for method 'hook'") } return &auth.HookAuth{Command: command}, nil @@ -186,7 +186,7 @@ func getAuthentication(flags *pflag.FlagSet, defaults ...interface{}) (settings. case auth.MethodHookAuth: auther, err = getHookAuth(flags, defaultAuther) default: - return "", nil, errors.ErrInvalidAuthMethod + return "", nil, fberrors.ErrInvalidAuthMethod } if err != nil { @@ -361,7 +361,7 @@ func getSettings(flags *pflag.FlagSet, set *settings.Settings, ser *settings.Ser flags.Visit(visit) } - err := nerrors.Join(errs...) + err := errors.Join(errs...) if err != nil { return nil, err } diff --git a/errors/errors.go b/errors/errors.go index 5fd760c2..85258e5b 100644 --- a/errors/errors.go +++ b/errors/errors.go @@ -1,4 +1,4 @@ -package errors +package fberrors import ( "errors" diff --git a/files/file.go b/files/file.go index 0f96440e..5ce0aee7 100644 --- a/files/file.go +++ b/files/file.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/afero" - fbErrors "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/rules" ) @@ -168,7 +168,7 @@ func stat(opts *FileOptions) (*FileInfo, error) { // algorithm. The checksums data is saved on File object. func (i *FileInfo) Checksum(algo string) error { if i.IsDir { - return fbErrors.ErrIsDirectory + return fberrors.ErrIsDirectory } if i.Checksums == nil { @@ -193,7 +193,7 @@ func (i *FileInfo) Checksum(algo string) error { case "sha512": h = sha512.New() default: - return fbErrors.ErrInvalidOption + return fberrors.ErrInvalidOption } _, err = io.Copy(h, reader) diff --git a/http/auth.go b/http/auth.go index 4c052a5c..5a483a8d 100644 --- a/http/auth.go +++ b/http/auth.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "encoding/json" @@ -13,7 +13,7 @@ import ( "github.com/golang-jwt/jwt/v5/request" fbAuth "github.com/filebrowser/filebrowser/v2/auth" - fbErrors "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/settings" "github.com/filebrowser/filebrowser/v2/users" ) @@ -185,7 +185,7 @@ var signupHandler = func(_ http.ResponseWriter, r *http.Request, d *data) (int, log.Printf("new user: %s, home dir: [%s].", user.Username, userHome) err = d.store.Users.Save(user) - if errors.Is(err, fbErrors.ErrExist) { + if errors.Is(err, fberrors.ErrExist) { return http.StatusConflict, err } else if err != nil { return http.StatusInternalServerError, err diff --git a/http/commands.go b/http/commands.go index 6229d597..f0380c50 100644 --- a/http/commands.go +++ b/http/commands.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "bufio" diff --git a/http/data.go b/http/data.go index 3f949ad0..d591053e 100644 --- a/http/data.go +++ b/http/data.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "log" diff --git a/http/headers.go b/http/headers.go index a768a46c..a18e7b53 100644 --- a/http/headers.go +++ b/http/headers.go @@ -1,6 +1,6 @@ //go:build !dev -package http +package fbhttp // global headers to append to every response var globalHeaders = map[string]string{ diff --git a/http/http.go b/http/http.go index 2d87535f..e6fc185a 100644 --- a/http/http.go +++ b/http/http.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "io/fs" diff --git a/http/preview.go b/http/preview.go index cb64ba9c..e57d597b 100644 --- a/http/preview.go +++ b/http/preview.go @@ -1,5 +1,5 @@ //go:generate go-enum --sql --marshal --names --file $GOFILE -package http +package fbhttp import ( "bytes" diff --git a/http/preview_enum.go b/http/preview_enum.go index 50e3372c..2bb1a078 100644 --- a/http/preview_enum.go +++ b/http/preview_enum.go @@ -1,7 +1,7 @@ // Code generated by go-enum // DO NOT EDIT! -package http +package fbhttp import ( "database/sql/driver" diff --git a/http/public.go b/http/public.go index 92c8102d..ae1bd10a 100644 --- a/http/public.go +++ b/http/public.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "errors" diff --git a/http/public_test.go b/http/public_test.go index f102cc07..9a9c7f2e 100644 --- a/http/public_test.go +++ b/http/public_test.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "fmt" diff --git a/http/raw.go b/http/raw.go index f2548155..bed04310 100644 --- a/http/raw.go +++ b/http/raw.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "errors" diff --git a/http/resource.go b/http/resource.go index fba422df..9fe4caa6 100644 --- a/http/resource.go +++ b/http/resource.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "context" @@ -17,7 +17,7 @@ import ( "github.com/shirou/gopsutil/v4/disk" "github.com/spf13/afero" - fbErrors "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/files" "github.com/filebrowser/filebrowser/v2/fileutils" ) @@ -44,7 +44,7 @@ var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d if checksum := r.URL.Query().Get("checksum"); checksum != "" { err := file.Checksum(checksum) - if errors.Is(err, fbErrors.ErrInvalidOption) { + if errors.Is(err, fberrors.ErrInvalidOption) { return http.StatusBadRequest, nil } else if err != nil { return http.StatusInternalServerError, err @@ -238,7 +238,7 @@ func checkParent(src, dst string) error { rel = filepath.ToSlash(rel) if !strings.HasPrefix(rel, "../") && rel != ".." && rel != "." { - return fbErrors.ErrSourceIsParent + return fberrors.ErrSourceIsParent } return nil @@ -304,13 +304,13 @@ func patchAction(ctx context.Context, action, src, dst string, d *data, fileCach switch action { case "copy": if !d.user.Perm.Create { - return fbErrors.ErrPermissionDenied + return fberrors.ErrPermissionDenied } return fileutils.Copy(d.user.Fs, src, dst, d.settings.FileMode, d.settings.DirMode) case "rename": if !d.user.Perm.Rename { - return fbErrors.ErrPermissionDenied + return fberrors.ErrPermissionDenied } src = path.Clean("/" + src) dst = path.Clean("/" + dst) @@ -335,7 +335,7 @@ func patchAction(ctx context.Context, action, src, dst string, d *data, fileCach return fileutils.MoveFile(d.user.Fs, src, dst, d.settings.FileMode, d.settings.DirMode) default: - return fmt.Errorf("unsupported action %s: %w", action, fbErrors.ErrInvalidRequestParams) + return fmt.Errorf("unsupported action %s: %w", action, fberrors.ErrInvalidRequestParams) } } diff --git a/http/search.go b/http/search.go index 1c78b781..5b926b43 100644 --- a/http/search.go +++ b/http/search.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "net/http" diff --git a/http/settings.go b/http/settings.go index 500e1c2c..358ca7de 100644 --- a/http/settings.go +++ b/http/settings.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "encoding/json" diff --git a/http/share.go b/http/share.go index 670629bd..509a7b21 100644 --- a/http/share.go +++ b/http/share.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "crypto/rand" @@ -14,7 +14,7 @@ import ( "golang.org/x/crypto/bcrypt" - fbErrors "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/share" ) @@ -38,7 +38,7 @@ var shareListHandler = withPermShare(func(w http.ResponseWriter, r *http.Request } else { s, err = d.store.Share.FindByUserID(d.user.ID) } - if errors.Is(err, fbErrors.ErrNotExist) { + if errors.Is(err, fberrors.ErrNotExist) { return renderJSON(w, r, []*share.Link{}) } @@ -58,7 +58,7 @@ var shareListHandler = withPermShare(func(w http.ResponseWriter, r *http.Request var shareGetsHandler = withPermShare(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { s, err := d.store.Share.Gets(r.URL.Path, d.user.ID) - if errors.Is(err, fbErrors.ErrNotExist) { + if errors.Is(err, fberrors.ErrNotExist) { return renderJSON(w, r, []*share.Link{}) } diff --git a/http/static.go b/http/static.go index b8883c4e..d996cc07 100644 --- a/http/static.go +++ b/http/static.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "encoding/json" diff --git a/http/subtitle.go b/http/subtitle.go index 71fe8ae4..07c2dcfc 100644 --- a/http/subtitle.go +++ b/http/subtitle.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "bytes" diff --git a/http/tus_handlers.go b/http/tus_handlers.go index 05671cf7..d11920ae 100644 --- a/http/tus_handlers.go +++ b/http/tus_handlers.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "context" diff --git a/http/users.go b/http/users.go index 4185e82e..905f123b 100644 --- a/http/users.go +++ b/http/users.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "encoding/json" @@ -12,7 +12,7 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - fbErrors "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/users" ) @@ -36,7 +36,7 @@ func getUserID(r *http.Request) (uint, error) { func getUser(_ http.ResponseWriter, r *http.Request) (*modifyUserRequest, error) { if r.Body == nil { - return nil, fbErrors.ErrEmptyRequest + return nil, fberrors.ErrEmptyRequest } req := &modifyUserRequest{} @@ -46,7 +46,7 @@ func getUser(_ http.ResponseWriter, r *http.Request) (*modifyUserRequest, error) } if req.What != "user" { - return nil, fbErrors.ErrInvalidDataType + return nil, fberrors.ErrInvalidDataType } return req, nil @@ -87,7 +87,7 @@ var usersGetHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d * var userGetHandler = withSelfOrAdmin(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { u, err := d.store.Users.Get(d.server.Root, d.raw.(uint)) - if errors.Is(err, fbErrors.ErrNotExist) { + if errors.Is(err, fberrors.ErrNotExist) { return http.StatusNotFound, err } @@ -122,7 +122,7 @@ var userPostHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d * } if req.Data.Password == "" { - return http.StatusBadRequest, fbErrors.ErrEmptyPassword + return http.StatusBadRequest, fberrors.ErrEmptyPassword } req.Data.Password, err = users.ValidateAndHashPwd(req.Data.Password, d.settings.MinimumPasswordLength) diff --git a/http/utils.go b/http/utils.go index 03615263..c76cecf4 100644 --- a/http/utils.go +++ b/http/utils.go @@ -1,4 +1,4 @@ -package http +package fbhttp import ( "encoding/json" diff --git a/settings/storage.go b/settings/storage.go index 8bf11a64..573024f7 100644 --- a/settings/storage.go +++ b/settings/storage.go @@ -1,7 +1,7 @@ package settings import ( - "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/rules" "github.com/filebrowser/filebrowser/v2/users" ) @@ -72,7 +72,7 @@ var defaultEvents = []string{ // Save saves the settings for the current instance. func (s *Storage) Save(set *Settings) error { if len(set.Key) == 0 { - return errors.ErrEmptyKey + return fberrors.ErrEmptyKey } if set.Defaults.Locale == "" { diff --git a/share/storage.go b/share/storage.go index 398c192d..76ba26eb 100644 --- a/share/storage.go +++ b/share/storage.go @@ -3,7 +3,7 @@ package share import ( "time" - "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" ) // StorageBackend is the interface to implement for a share storage. @@ -79,7 +79,7 @@ func (s *Storage) GetByHash(hash string) (*Link, error) { if err := s.Delete(link.Hash); err != nil { return nil, err } - return nil, errors.ErrNotExist + return nil, fberrors.ErrNotExist } return link, nil diff --git a/storage/bolt/auth.go b/storage/bolt/auth.go index cf15a8fe..1de95192 100644 --- a/storage/bolt/auth.go +++ b/storage/bolt/auth.go @@ -4,7 +4,7 @@ import ( "github.com/asdine/storm/v3" "github.com/filebrowser/filebrowser/v2/auth" - "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/settings" ) @@ -25,7 +25,7 @@ func (s authBackend) Get(t settings.AuthMethod) (auth.Auther, error) { case auth.MethodNoAuth: auther = &auth.NoAuth{} default: - return nil, errors.ErrInvalidAuthMethod + return nil, fberrors.ErrInvalidAuthMethod } return auther, get(s.db, "auther", auther) diff --git a/storage/bolt/share.go b/storage/bolt/share.go index 373533f1..c5b91483 100644 --- a/storage/bolt/share.go +++ b/storage/bolt/share.go @@ -6,7 +6,7 @@ import ( "github.com/asdine/storm/v3" "github.com/asdine/storm/v3/q" - fbErrors "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/share" ) @@ -18,7 +18,7 @@ func (s shareBackend) All() ([]*share.Link, error) { var v []*share.Link err := s.db.All(&v) if errors.Is(err, storm.ErrNotFound) { - return v, fbErrors.ErrNotExist + return v, fberrors.ErrNotExist } return v, err @@ -28,7 +28,7 @@ func (s shareBackend) FindByUserID(id uint) ([]*share.Link, error) { var v []*share.Link err := s.db.Select(q.Eq("UserID", id)).Find(&v) if errors.Is(err, storm.ErrNotFound) { - return v, fbErrors.ErrNotExist + return v, fberrors.ErrNotExist } return v, err @@ -38,7 +38,7 @@ func (s shareBackend) GetByHash(hash string) (*share.Link, error) { var v share.Link err := s.db.One("Hash", hash, &v) if errors.Is(err, storm.ErrNotFound) { - return nil, fbErrors.ErrNotExist + return nil, fberrors.ErrNotExist } return &v, err @@ -48,7 +48,7 @@ func (s shareBackend) GetPermanent(path string, id uint) (*share.Link, error) { var v share.Link err := s.db.Select(q.Eq("Path", path), q.Eq("Expire", 0), q.Eq("UserID", id)).First(&v) if errors.Is(err, storm.ErrNotFound) { - return nil, fbErrors.ErrNotExist + return nil, fberrors.ErrNotExist } return &v, err @@ -58,7 +58,7 @@ func (s shareBackend) Gets(path string, id uint) ([]*share.Link, error) { var v []*share.Link err := s.db.Select(q.Eq("Path", path), q.Eq("UserID", id)).Find(&v) if errors.Is(err, storm.ErrNotFound) { - return v, fbErrors.ErrNotExist + return v, fberrors.ErrNotExist } return v, err diff --git a/storage/bolt/users.go b/storage/bolt/users.go index dc901c34..974c0a48 100644 --- a/storage/bolt/users.go +++ b/storage/bolt/users.go @@ -7,7 +7,7 @@ import ( "github.com/asdine/storm/v3" - fbErrors "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/users" ) @@ -25,14 +25,14 @@ func (st usersBackend) GetBy(i interface{}) (user *users.User, err error) { case string: arg = "Username" default: - return nil, fbErrors.ErrInvalidDataType + return nil, fberrors.ErrInvalidDataType } err = st.db.One(arg, i, user) if err != nil { if errors.Is(err, storm.ErrNotFound) { - return nil, fbErrors.ErrNotExist + return nil, fberrors.ErrNotExist } return nil, err } @@ -44,7 +44,7 @@ func (st usersBackend) Gets() ([]*users.User, error) { var allUsers []*users.User err := st.db.All(&allUsers) if errors.Is(err, storm.ErrNotFound) { - return nil, fbErrors.ErrNotExist + return nil, fberrors.ErrNotExist } if err != nil { @@ -76,7 +76,7 @@ func (st usersBackend) Update(user *users.User, fields ...string) error { func (st usersBackend) Save(user *users.User) error { err := st.db.Save(user) if errors.Is(err, storm.ErrAlreadyExists) { - return fbErrors.ErrExist + return fberrors.ErrExist } return err } diff --git a/storage/bolt/utils.go b/storage/bolt/utils.go index e275a0d1..b16bccff 100644 --- a/storage/bolt/utils.go +++ b/storage/bolt/utils.go @@ -5,13 +5,13 @@ import ( "github.com/asdine/storm/v3" - fbErrors "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" ) func get(db *storm.DB, name string, to interface{}) error { err := db.Get("config", name, to) if errors.Is(err, storm.ErrNotFound) { - return fbErrors.ErrNotExist + return fberrors.ErrNotExist } return err diff --git a/users/password.go b/users/password.go index 3a01053d..2e355ad4 100644 --- a/users/password.go +++ b/users/password.go @@ -6,17 +6,17 @@ import ( "golang.org/x/crypto/bcrypt" - fbErrors "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" ) // ValidateAndHashPwd validates and hashes a password. func ValidateAndHashPwd(password string, minimumLength uint) (string, error) { if uint(len(password)) < minimumLength { - return "", fbErrors.ErrShortPassword{MinimumLength: minimumLength} + return "", fberrors.ErrShortPassword{MinimumLength: minimumLength} } if _, ok := commonPasswords[password]; ok { - return "", fbErrors.ErrEasyPassword + return "", fberrors.ErrEasyPassword } return HashPwd(password) diff --git a/users/storage.go b/users/storage.go index 1dd0da3f..43c65fe4 100644 --- a/users/storage.go +++ b/users/storage.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" ) // StorageBackend is the interface to implement for a users storage. @@ -109,16 +109,16 @@ func (s *Storage) Delete(id interface{}) error { return err } if user.ID == 1 { - return errors.ErrRootUserDeletion + return fberrors.ErrRootUserDeletion } return s.back.DeleteByUsername(id) case uint: if id == 1 { - return errors.ErrRootUserDeletion + return fberrors.ErrRootUserDeletion } return s.back.DeleteByID(id) default: - return errors.ErrInvalidDataType + return fberrors.ErrInvalidDataType } } diff --git a/users/users.go b/users/users.go index 987a94f2..0fcc26d8 100644 --- a/users/users.go +++ b/users/users.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/afero" - "github.com/filebrowser/filebrowser/v2/errors" + fberrors "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/files" "github.com/filebrowser/filebrowser/v2/rules" ) @@ -64,11 +64,11 @@ func (u *User) Clean(baseScope string, fields ...string) error { switch field { case "Username": if u.Username == "" { - return errors.ErrEmptyUsername + return fberrors.ErrEmptyUsername } case "Password": if u.Password == "" { - return errors.ErrEmptyPassword + return fberrors.ErrEmptyPassword } case "ViewMode": if u.ViewMode == "" {