feat: add "redirect after copy/move" user setting (#5662)

auth/hook.go

@@ -158,16 +158,17 @@ func (a *HookAuth) SaveUser() (*users.User, error) {
 
 		// create user with the provided credentials
 		d := &users.User{
-			Username:     a.Cred.Username,
+			Username:              a.Cred.Username,
-			Password:     pass,
+			Password:              pass,
-			Scope:        a.Settings.Defaults.Scope,
+			Scope:                 a.Settings.Defaults.Scope,
-			Locale:       a.Settings.Defaults.Locale,
+			Locale:                a.Settings.Defaults.Locale,
-			ViewMode:     a.Settings.Defaults.ViewMode,
+			ViewMode:              a.Settings.Defaults.ViewMode,
-			SingleClick:  a.Settings.Defaults.SingleClick,
+			SingleClick:           a.Settings.Defaults.SingleClick,
-			Sorting:      a.Settings.Defaults.Sorting,
+			RedirectAfterCopyMove: a.Settings.Defaults.RedirectAfterCopyMove,
-			Perm:         a.Settings.Defaults.Perm,
+			Sorting:               a.Settings.Defaults.Sorting,
-			Commands:     a.Settings.Defaults.Commands,
+			Perm:                  a.Settings.Defaults.Perm,
-			HideDotfiles: a.Settings.Defaults.HideDotfiles,
+			Commands:              a.Settings.Defaults.Commands,
+			HideDotfiles:          a.Settings.Defaults.HideDotfiles,
 		}
 		u = a.GetUser(d)
 
@@ -219,13 +220,14 @@ func (a *HookAuth) GetUser(d *users.User) *users.User {
 		Download: isAdmin || a.Fields.GetBoolean("user.perm.download", d.Perm.Download),
 	}
 	user := users.User{
-		ID:          d.ID,
+		ID:                    d.ID,
-		Username:    d.Username,
+		Username:              d.Username,
-		Password:    d.Password,
+		Password:              d.Password,
-		Scope:       a.Fields.GetString("user.scope", d.Scope),
+		Scope:                 a.Fields.GetString("user.scope", d.Scope),
-		Locale:      a.Fields.GetString("user.locale", d.Locale),
+		Locale:                a.Fields.GetString("user.locale", d.Locale),
-		ViewMode:    users.ViewMode(a.Fields.GetString("user.viewMode", string(d.ViewMode))),
+		ViewMode:              users.ViewMode(a.Fields.GetString("user.viewMode", string(d.ViewMode))),
-		SingleClick: a.Fields.GetBoolean("user.singleClick", d.SingleClick),
+		SingleClick:           a.Fields.GetBoolean("user.singleClick", d.SingleClick),
+		RedirectAfterCopyMove: a.Fields.GetBoolean("user.redirectAfterCopyMove", d.RedirectAfterCopyMove),
 		Sorting: files.Sorting{
 			Asc: a.Fields.GetBoolean("user.sorting.asc", d.Sorting.Asc),
 			By:  a.Fields.GetString("user.sorting.by", d.Sorting.By),
@@ -251,6 +253,7 @@ var validHookFields = []string{
 	"user.locale",
 	"user.viewMode",
 	"user.singleClick",
+	"user.redirectAfterCopyMove",
 	"user.sorting.by",
 	"user.sorting.asc",
 	"user.commands",

cmd/config.go

@@ -240,6 +240,7 @@ func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Aut
 	fmt.Fprintf(w, "\tLocale:\t%s\n", set.Defaults.Locale)
 	fmt.Fprintf(w, "\tView mode:\t%s\n", set.Defaults.ViewMode)
 	fmt.Fprintf(w, "\tSingle Click:\t%t\n", set.Defaults.SingleClick)
+	fmt.Fprintf(w, "\tRedirect after Copy/Move:\t%t\n", set.Defaults.RedirectAfterCopyMove)
 	fmt.Fprintf(w, "\tFile Creation Mode:\t%O\n", set.FileMode)
 	fmt.Fprintf(w, "\tDirectory Creation Mode:\t%O\n", set.DirMode)
 	fmt.Fprintf(w, "\tCommands:\t%s\n", strings.Join(set.Defaults.Commands, " "))

cmd/root.go

@@ -393,10 +393,11 @@ func quickSetup(v *viper.Viper, s *storage.Storage) error {
 		MinimumPasswordLength: settings.DefaultMinimumPasswordLength,
 		UserHomeBasePath:      settings.DefaultUsersHomeBasePath,
 		Defaults: settings.UserDefaults{
-			Scope:          ".",
+			Scope:                 ".",
-			Locale:         "en",
+			Locale:                "en",
-			SingleClick:    false,
+			SingleClick:           false,
-			AceEditorTheme: v.GetString("defaults.aceEditorTheme"),
+			RedirectAfterCopyMove: true,
+			AceEditorTheme:        v.GetString("defaults.aceEditorTheme"),
 			Perm: users.Permissions{
 				Admin:    false,
 				Execute:  true,

cmd/users.go

@@ -30,13 +30,14 @@ func printUsers(usrs []*users.User) {
 	fmt.Fprintln(w, "ID\tUsername\tScope\tLocale\tV. Mode\tS.Click\tAdmin\tExecute\tCreate\tRename\tModify\tDelete\tShare\tDownload\tPwd Lock")
 
 	for _, u := range usrs {
-		fmt.Fprintf(w, "%d\t%s\t%s\t%s\t%s\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t\n",
+		fmt.Fprintf(w, "%d\t%s\t%s\t%s\t%s\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t\n",
 			u.ID,
 			u.Username,
 			u.Scope,
 			u.Locale,
 			u.ViewMode,
 			u.SingleClick,
+			u.RedirectAfterCopyMove,
 			u.Perm.Admin,
 			u.Perm.Execute,
 			u.Perm.Create,
@@ -77,6 +78,7 @@ func addUserFlags(flags *pflag.FlagSet) {
 	flags.String("locale", "en", "locale for users")
 	flags.String("viewMode", string(users.ListViewMode), "view mode for users")
 	flags.Bool("singleClick", false, "use single clicks only")
+	flags.Bool("redirectAfterCopyMove", false, "redirect to destination after copy/move")
 	flags.Bool("dateFormat", false, "use date format (true for absolute time, false for relative)")
 	flags.Bool("hideDotfiles", false, "hide dotfiles")
 	flags.String("aceEditorTheme", "", "ace editor's syntax highlighting theme for users")
@@ -110,6 +112,8 @@ func getUserDefaults(flags *pflag.FlagSet, defaults *settings.UserDefaults, all
 			defaults.ViewMode, err = getAndParseViewMode(flags)
 		case "singleClick":
 			defaults.SingleClick, err = flags.GetBool(flag.Name)
+		case "redirectAfterCopyMove":
+			defaults.RedirectAfterCopyMove, err = flags.GetBool(flag.Name)
 		case "aceEditorTheme":
 			defaults.AceEditorTheme, err = flags.GetString(flag.Name)
 		case "perm.admin":

cmd/users_update.go

@@ -52,13 +52,14 @@ options you want to change.`,
 		}
 
 		defaults := settings.UserDefaults{
-			Scope:       user.Scope,
+			Scope:                 user.Scope,
-			Locale:      user.Locale,
+			Locale:                user.Locale,
-			ViewMode:    user.ViewMode,
+			ViewMode:              user.ViewMode,
-			SingleClick: user.SingleClick,
+			SingleClick:           user.SingleClick,
-			Perm:        user.Perm,
+			RedirectAfterCopyMove: user.RedirectAfterCopyMove,
-			Sorting:     user.Sorting,
+			Perm:                  user.Perm,
-			Commands:    user.Commands,
+			Sorting:               user.Sorting,
+			Commands:              user.Commands,
 		}
 
 		err = getUserDefaults(flags, &defaults, false)
@@ -70,6 +71,7 @@ options you want to change.`,
 		user.Locale = defaults.Locale
 		user.ViewMode = defaults.ViewMode
 		user.SingleClick = defaults.SingleClick
+		user.RedirectAfterCopyMove = defaults.RedirectAfterCopyMove
 		user.Perm = defaults.Perm
 		user.Commands = defaults.Commands
 		user.Sorting = defaults.Sorting

frontend/src/components/prompts/Copy.vue

@@ -109,7 +109,8 @@ export default {
               return;
             }
 
-            this.$router.push({ path: this.dest });
+            if (this.user.redirectAfterCopyMove)
+              this.$router.push({ path: this.dest });
           })
           .catch((e) => {
             buttons.done("copy");

frontend/src/components/prompts/Move.vue

@@ -79,7 +79,7 @@ export default {
   computed: {
     ...mapState(useFileStore, ["req", "selected"]),
     ...mapState(useAuthStore, ["user"]),
-    ...mapWritableState(useFileStore, ["preselect"]),
+    ...mapWritableState(useFileStore, ["reload", "preselect"]),
     excludedFolders() {
       return this.selected
         .filter((idx) => this.req.items[idx].isDir)
@@ -108,7 +108,9 @@ export default {
           .then(() => {
             buttons.success("move");
             this.preselect = removePrefix(items[0].to);
-            this.$router.push({ path: this.dest });
+            if (this.user.redirectAfterCopyMove)
+              this.$router.push({ path: this.dest });
+            else this.reload = true;
           })
           .catch((e) => {
             buttons.done("move");

frontend/src/i18n/en.json

@@ -232,6 +232,7 @@
     "permissions": "Permissions",
     "permissionsHelp": "You can set the user to be an administrator or choose the permissions individually. If you select \"Administrator\", all of the other options will be automatically checked. The management of users remains a privilege of an administrator.\n",
     "profileSettings": "Profile Settings",
+    "redirectAfterCopyMove": "Redirect to destination after copy/move",
     "ruleExample1": "prevents the access to any dotfile (such as .git, .gitignore) in every folder.\n",
     "ruleExample2": "blocks the access to the file named Caddyfile on the root of the scope.",
     "rules": "Rules",

frontend/src/types/settings.d.ts

@@ -18,6 +18,7 @@ interface SettingsDefaults {
   locale: string;
   viewMode: ViewModeType;
   singleClick: boolean;
+  redirectAfterCopyMove: boolean;
   sorting: Sorting;
   perm: Permissions;
   commands: any[];

frontend/src/types/user.d.ts

@@ -10,6 +10,7 @@ interface IUser {
   lockPassword: boolean;
   hideDotfiles: boolean;
   singleClick: boolean;
+  redirectAfterCopyMove: boolean;
   dateFormat: boolean;
   viewMode: ViewModeType;
   sorting?: Sorting;
@@ -30,6 +31,7 @@ interface IUserForm {
   lockPassword?: boolean;
   hideDotfiles?: boolean;
   singleClick?: boolean;
+  redirectAfterCopyMove?: boolean;
   dateFormat?: boolean;
 }
 

frontend/src/views/settings/Profile.vue

@@ -15,6 +15,14 @@
             <input type="checkbox" name="singleClick" v-model="singleClick" />
             {{ t("settings.singleClick") }}
           </p>
+          <p>
+            <input
+              type="checkbox"
+              name="redirectAfterCopyMove"
+              v-model="redirectAfterCopyMove"
+            />
+            {{ t("settings.redirectAfterCopyMove") }}
+          </p>
           <p>
             <input type="checkbox" name="dateFormat" v-model="dateFormat" />
             {{ t("settings.setDateFormat") }}
@@ -116,6 +124,7 @@ const currentPassword = ref<string>("");
 const isCurrentPasswordRequired = ref<boolean>(false);
 const hideDotfiles = ref<boolean>(false);
 const singleClick = ref<boolean>(false);
+const redirectAfterCopyMove = ref<boolean>(false);
 const dateFormat = ref<boolean>(false);
 const locale = ref<string>("");
 const aceEditorTheme = ref<string>("");
@@ -140,6 +149,7 @@ onMounted(async () => {
   locale.value = authStore.user.locale;
   hideDotfiles.value = authStore.user.hideDotfiles;
   singleClick.value = authStore.user.singleClick;
+  redirectAfterCopyMove.value = authStore.user.redirectAfterCopyMove;
   dateFormat.value = authStore.user.dateFormat;
   aceEditorTheme.value = authStore.user.aceEditorTheme;
   layoutStore.loading = false;
@@ -187,6 +197,7 @@ const updateSettings = async (event: Event) => {
       locale: locale.value,
       hideDotfiles: hideDotfiles.value,
       singleClick: singleClick.value,
+      redirectAfterCopyMove: redirectAfterCopyMove.value,
       dateFormat: dateFormat.value,
       aceEditorTheme: aceEditorTheme.value,
     };
@@ -195,6 +206,7 @@ const updateSettings = async (event: Event) => {
       "locale",
       "hideDotfiles",
       "singleClick",
+      "redirectAfterCopyMove",
       "dateFormat",
       "aceEditorTheme",
     ]);

http/auth.go

@@ -23,17 +23,18 @@ const (
 )
 
 type userInfo struct {
-	ID             uint              `json:"id"`
+	ID                    uint              `json:"id"`
-	Locale         string            `json:"locale"`
+	Locale                string            `json:"locale"`
-	ViewMode       users.ViewMode    `json:"viewMode"`
+	ViewMode              users.ViewMode    `json:"viewMode"`
-	SingleClick    bool              `json:"singleClick"`
+	SingleClick           bool              `json:"singleClick"`
-	Perm           users.Permissions `json:"perm"`
+	RedirectAfterCopyMove bool              `json:"redirectAfterCopyMove"`
-	Commands       []string          `json:"commands"`
+	Perm                  users.Permissions `json:"perm"`
-	LockPassword   bool              `json:"lockPassword"`
+	Commands              []string          `json:"commands"`
-	HideDotfiles   bool              `json:"hideDotfiles"`
+	LockPassword          bool              `json:"lockPassword"`
-	DateFormat     bool              `json:"dateFormat"`
+	HideDotfiles          bool              `json:"hideDotfiles"`
-	Username       string            `json:"username"`
+	DateFormat            bool              `json:"dateFormat"`
-	AceEditorTheme string            `json:"aceEditorTheme"`
+	Username              string            `json:"username"`
+	AceEditorTheme        string            `json:"aceEditorTheme"`
 }
 
 type authToken struct {
@@ -204,17 +205,18 @@ func renewHandler(tokenExpireTime time.Duration) handleFunc {
 func printToken(w http.ResponseWriter, _ *http.Request, d *data, user *users.User, tokenExpirationTime time.Duration) (int, error) {
 	claims := &authToken{
 		User: userInfo{
-			ID:             user.ID,
+			ID:                    user.ID,
-			Locale:         user.Locale,
+			Locale:                user.Locale,
-			ViewMode:       user.ViewMode,
+			ViewMode:              user.ViewMode,
-			SingleClick:    user.SingleClick,
+			SingleClick:           user.SingleClick,
-			Perm:           user.Perm,
+			RedirectAfterCopyMove: user.RedirectAfterCopyMove,
-			LockPassword:   user.LockPassword,
+			Perm:                  user.Perm,
-			Commands:       user.Commands,
+			LockPassword:          user.LockPassword,
-			HideDotfiles:   user.HideDotfiles,
+			Commands:              user.Commands,
-			DateFormat:     user.DateFormat,
+			HideDotfiles:          user.HideDotfiles,
-			Username:       user.Username,
+			DateFormat:            user.DateFormat,
-			AceEditorTheme: user.AceEditorTheme,
+			Username:              user.Username,
+			AceEditorTheme:        user.AceEditorTheme,
 		},
 		RegisteredClaims: jwt.RegisteredClaims{
 			IssuedAt:  jwt.NewNumericDate(time.Now()),

settings/defaults.go

@@ -8,16 +8,17 @@ import (
 // UserDefaults is a type that holds the default values
 // for some fields on User.
 type UserDefaults struct {
-	Scope          string            `json:"scope"`
+	Scope                 string            `json:"scope"`
-	Locale         string            `json:"locale"`
+	Locale                string            `json:"locale"`
-	ViewMode       users.ViewMode    `json:"viewMode"`
+	ViewMode              users.ViewMode    `json:"viewMode"`
-	SingleClick    bool              `json:"singleClick"`
+	SingleClick           bool              `json:"singleClick"`
-	Sorting        files.Sorting     `json:"sorting"`
+	RedirectAfterCopyMove bool              `json:"redirectAfterCopyMove"`
-	Perm           users.Permissions `json:"perm"`
+	Sorting               files.Sorting     `json:"sorting"`
-	Commands       []string          `json:"commands"`
+	Perm                  users.Permissions `json:"perm"`
-	HideDotfiles   bool              `json:"hideDotfiles"`
+	Commands              []string          `json:"commands"`
-	DateFormat     bool              `json:"dateFormat"`
+	HideDotfiles          bool              `json:"hideDotfiles"`
-	AceEditorTheme string            `json:"aceEditorTheme"`
+	DateFormat            bool              `json:"dateFormat"`
+	AceEditorTheme        string            `json:"aceEditorTheme"`
 }
 
 // Apply applies the default options to a user.
@@ -26,6 +27,7 @@ func (d *UserDefaults) Apply(u *users.User) {
 	u.Locale = d.Locale
 	u.ViewMode = d.ViewMode
 	u.SingleClick = d.SingleClick
+	u.RedirectAfterCopyMove = d.RedirectAfterCopyMove
 	u.Perm = d.Perm
 	u.Sorting = d.Sorting
 	u.Commands = d.Commands

users/users.go

@@ -20,22 +20,23 @@ const (
 
 // User describes a user.
 type User struct {
-	ID             uint          `storm:"id,increment" json:"id"`
+	ID                    uint          `storm:"id,increment" json:"id"`
-	Username       string        `storm:"unique" json:"username"`
+	Username              string        `storm:"unique" json:"username"`
-	Password       string        `json:"password"`
+	Password              string        `json:"password"`
-	Scope          string        `json:"scope"`
+	Scope                 string        `json:"scope"`
-	Locale         string        `json:"locale"`
+	Locale                string        `json:"locale"`
-	LockPassword   bool          `json:"lockPassword"`
+	LockPassword          bool          `json:"lockPassword"`
-	ViewMode       ViewMode      `json:"viewMode"`
+	ViewMode              ViewMode      `json:"viewMode"`
-	SingleClick    bool          `json:"singleClick"`
+	SingleClick           bool          `json:"singleClick"`
-	Perm           Permissions   `json:"perm"`
+	RedirectAfterCopyMove bool          `json:"redirectAfterCopyMove"`
-	Commands       []string      `json:"commands"`
+	Perm                  Permissions   `json:"perm"`
-	Sorting        files.Sorting `json:"sorting"`
+	Commands              []string      `json:"commands"`
-	Fs             afero.Fs      `json:"-" yaml:"-"`
+	Sorting               files.Sorting `json:"sorting"`
-	Rules          []rules.Rule  `json:"rules"`
+	Fs                    afero.Fs      `json:"-" yaml:"-"`
-	HideDotfiles   bool          `json:"hideDotfiles"`
+	Rules                 []rules.Rule  `json:"rules"`
-	DateFormat     bool          `json:"dateFormat"`
+	HideDotfiles          bool          `json:"hideDotfiles"`
-	AceEditorTheme string        `json:"aceEditorTheme"`
+	DateFormat            bool          `json:"dateFormat"`
+	AceEditorTheme        string        `json:"aceEditorTheme"`
 }
 
 // GetRules implements rules.Provider.

www/docs/cli/filebrowser-config-init.md

@@ -61,6 +61,7 @@ filebrowser config init [flags]
       --recaptcha.host string            use another host for ReCAPTCHA. recaptcha.net might be useful in China (default "https://www.google.com")
       --recaptcha.key string             ReCaptcha site key
       --recaptcha.secret string          ReCaptcha secret
+      --redirectAfterCopyMove            redirect to destination after copy/move
   -r, --root string                      root to prepend to relative paths (default ".")
       --scope string                     scope for users (default ".")
       --shell string                     shell command to which other commands should be appended

www/docs/cli/filebrowser-config-set.md

@@ -58,6 +58,7 @@ filebrowser config set [flags]
       --recaptcha.host string            use another host for ReCAPTCHA. recaptcha.net might be useful in China (default "https://www.google.com")
       --recaptcha.key string             ReCaptcha site key
       --recaptcha.secret string          ReCaptcha secret
+      --redirectAfterCopyMove            redirect to destination after copy/move
   -r, --root string                      root to prepend to relative paths (default ".")
       --scope string                     scope for users (default ".")
       --shell string                     shell command to which other commands should be appended

www/docs/cli/filebrowser-users-add.md

@@ -28,6 +28,7 @@ filebrowser users add <username> <password> [flags]
       --perm.modify             modify perm for users (default true)
       --perm.rename             rename perm for users (default true)
       --perm.share              share perm for users (default true)
+      --redirectAfterCopyMove   redirect to destination after copy/move
       --scope string            scope for users (default ".")
       --singleClick             use single clicks only
       --sorting.asc             sorting by ascending order

www/docs/cli/filebrowser-users-update.md

@@ -30,6 +30,7 @@ filebrowser users update <id|username> [flags]
       --perm.modify             modify perm for users (default true)
       --perm.rename             rename perm for users (default true)
       --perm.share              share perm for users (default true)
+      --redirectAfterCopyMove   redirect to destination after copy/move
       --scope string            scope for users (default ".")
       --singleClick             use single clicks only
       --sorting.asc             sorting by ascending order