MarcoBuster/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-02-14 20:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into issue-updates

Browse Source
This commit is contained in:
Anbraten 2024-02-03 21:14:04 +01:00
commit e4beba8bdb
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/admin_user_change_password.go
View File

@ -32,6 +32,10 @@ var microcmdUserChangePassword = &cli.Command{
Value: "", Value: "",
Usage: "New password to set for user", Usage: "New password to set for user",
}, },
&cli.BoolFlag{
Name: "must-change-password",
Usage: "User must change password",
},
}, },
} }
@ -69,7 +73,11 @@ func runChangePassword(c *cli.Context) error {
return err return err
} }
if err = user_model.UpdateUserCols(ctx, user, "passwd", "passwd_hash_algo", "salt"); err != nil { if c.IsSet("must-change-password") {
user.MustChangePassword = c.Bool("must-change-password")
}
if err = user_model.UpdateUserCols(ctx, user, "must_change_password", "passwd", "passwd_hash_algo", "salt"); err != nil {
return err return err
} }

1
docs/content/administration/command-line.en-us.md
View File

@ -95,6 +95,7 @@ Admin operations:
- Options: - Options:
- `--username value`, `-u value`: Username. Required. - `--username value`, `-u value`: Username. Required.
- `--password value`, `-p value`: New password. Required. - `--password value`, `-p value`: New password. Required.
- `--must-change-password`: If provided, the user is required to choose a new password after the login. Optional.
- Examples: - Examples:
- `gitea admin user change-password --username myname --password asecurepassword` - `gitea admin user change-password --username myname --password asecurepassword`
- `must-change-password`: - `must-change-password`: