style: try to remove user storage (withUser removing step-3)

packages/backend/cmd/root.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"github.com/filebrowser/filebrowser/v2/common"
 	"github.com/filebrowser/filebrowser/v2/my_redis"
+	"github.com/filebrowser/filebrowser/v2/users"
 	"io"
 	"log"
 	"net"
@@ -33,7 +34,6 @@ import (
 	"github.com/filebrowser/filebrowser/v2/rpc"
 	"github.com/filebrowser/filebrowser/v2/settings"
 	"github.com/filebrowser/filebrowser/v2/storage"
-	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 var (
@@ -448,29 +448,29 @@ func quickSetup(flags *pflag.FlagSet, d pythonData) {
 	err = d.store.Settings.SaveServer(ser)
 	checkErr(err)
 
-	username := getParam(flags, "username")
-	password := getParam(flags, "password")
-
-	if password == "" {
-		password, err = users.HashPwd("admin")
-		checkErr(err)
-	}
-
-	if username == "" || password == "" {
-		log.Fatal("username and password cannot be empty during quick setup")
-	}
-
-	user := &users.User{
-		Username:     username,
-		Password:     password,
-		LockPassword: false,
-	}
-
-	set.Defaults.Apply(user)
-	user.Perm.Admin = true
-
-	err = d.store.Users.Save(user)
-	checkErr(err)
+	//username := getParam(flags, "username")
+	//password := getParam(flags, "password")
+	//
+	//if password == "" {
+	//	password, err = users.HashPwd("admin")
+	//	checkErr(err)
+	//}
+	//
+	//if username == "" || password == "" {
+	//	log.Fatal("username and password cannot be empty during quick setup")
+	//}
+	//
+	//user := &users.User{
+	//	Username:     username,
+	//	Password:     password,
+	//	LockPassword: false,
+	//}
+	//
+	//set.Defaults.Apply(user)
+	//user.Perm.Admin = true
+	//
+	//err = d.store.Users.Save(user)
+	//checkErr(err)
 }
 
 func initConfig() {

packages/backend/http/paste.go

@@ -1002,7 +1002,8 @@ func resourcePasteHandler(fileCache FileCache) handleFunc {
 		override := r.URL.Query().Get("override") == "true"
 		rename := r.URL.Query().Get("rename") == "true"
 		if !override && !rename {
-			if _, err := d.user.Fs.Stat(dst); err == nil {
+			//if _, err := d.user.Fs.Stat(dst); err == nil {
+			if _, err := files.DefaultFs.Stat(dst); err == nil {
 				return http.StatusConflict, nil
 			}
 		}
@@ -1028,7 +1029,7 @@ func resourcePasteHandler(fileCache FileCache) handleFunc {
 			}
 		}
 		if rename && dstType != "google" {
-			dst = pasteAddVersionSuffix(dst, dstType, d.user.Fs, w, r)
+			dst = pasteAddVersionSuffix(dst, dstType, files.DefaultFs, w, r) // d.user.Fs, w, r)
 		}
 		// Permission for overwriting the file
 		if override { // && !d.user.Perm.Modify {
@@ -1796,7 +1797,8 @@ func copyFile(fs afero.Fs, srcType, src, dstType, dst string, d *data, mode os.F
 
 	rename := r.URL.Query().Get("rename") == "true"
 	if rename && dstType != "google" && srcType == "google" {
-		dst = pasteAddVersionSuffix(dst, dstType, d.user.Fs, w, r)
+		//dst = pasteAddVersionSuffix(dst, dstType, d.user.Fs, w, r)
+		dst = pasteAddVersionSuffix(dst, dstType, files.DefaultFs, w, r)
 	}
 
 	// paste
@@ -2145,12 +2147,14 @@ func pasteActionDiffArch(ctx context.Context, action, srcType, src, dstType, dst
 		//	return errors.ErrPermissionDenied
 		//}
 
-		return doPaste(d.user.Fs, srcType, src, dstType, dst, d, w, r)
+		//return doPaste(d.user.Fs, srcType, src, dstType, dst, d, w, r)
+		return doPaste(files.DefaultFs, srcType, src, dstType, dst, d, w, r)
 	case "rename":
 		//if !d.user.Perm.Rename {
 		//	return errors.ErrPermissionDenied
 		//}
-		err := doPaste(d.user.Fs, srcType, src, dstType, dst, d, w, r)
+		//err := doPaste(d.user.Fs, srcType, src, dstType, dst, d, w, r)
+		err := doPaste(files.DefaultFs, srcType, src, dstType, dst, d, w, r)
 		if err != nil {
 			return err
 		}

packages/backend/http/resource.go

@@ -677,7 +677,8 @@ func patchAction(ctx context.Context, action, src, dst string, d *data, fileCach
 		//	return errors.ErrPermissionDenied
 		//}
 
-		return fileutils.Copy(d.user.Fs, src, dst)
+		//return fileutils.Copy(d.user.Fs, src, dst)
+		return fileutils.Copy(files.DefaultFs, src, dst)
 	case "rename":
 		//if !d.user.Perm.Rename {
 		//	return errors.ErrPermissionDenied

packages/backend/storage/bolt/bolt.go

@@ -6,12 +6,12 @@ import (
 	//"github.com/filebrowser/filebrowser/v2/auth"
 	"github.com/filebrowser/filebrowser/v2/settings"
 	"github.com/filebrowser/filebrowser/v2/storage"
-	"github.com/filebrowser/filebrowser/v2/users"
+	//"github.com/filebrowser/filebrowser/v2/users"
 )
 
 // NewStorage creates a storage.Storage based on Bolt DB.
 func NewStorage(db *storm.DB) (*storage.Storage, error) {
-	userStore := users.NewStorage(usersBackend{db: db})
+	//userStore := users.NewStorage(usersBackend{db: db})
 	settingsStore := settings.NewStorage(settingsBackend{db: db})
 	//authStore := auth.NewStorage(authBackend{db: db}, userStore)
 
@@ -22,7 +22,7 @@ func NewStorage(db *storm.DB) (*storage.Storage, error) {
 
 	return &storage.Storage{
 		//Auth:     authStore,
-		Users:    userStore,
+		//Users:    userStore,
 		Settings: settingsStore,
 	}, nil
 }

packages/backend/storage/storage.go

@@ -2,12 +2,11 @@ package storage
 
 import (
 	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 // Storage is a storage powered by a Backend which makes the necessary
 // verifications when fetching and saving data to ensure consistency.
 type Storage struct {
-	Users    users.Store
+	//Users    users.Store
 	Settings *settings.Storage
 }