fix(admin): keep must_change_password unless it is passed to user edit

--must-change-password defaulted to true on admin user edit as well, so
changing a password with --password silently forced the user to change
it again at the next sign-in. On edit the flag now defaults to unset and
is sent only when passed; create keeps requiring a change by default.

Signed-off-by: bircni <bircni@icloud.com>
This commit is contained in:
bircni committed 2026-10-11 22:00:29 +02:00
1 parent b6b3ddc91b
commit 1c9cc32d28
2 files changed
+25 -3

No files matched your search

+3 -3
View File
@@ -73,7 +73,7 @@ func (a *application) adminCommand() *cobra.Command {
} }
command.Flags().StringVar(&password, "password", "", "Password (prefer --password-file)") command.Flags().StringVar(&password, "password", "", "Password (prefer --password-file)")
command.Flags().StringVar(&passwordFile, "password-file", "", "Read password from file or - for stdin; remove one trailing line ending") command.Flags().StringVar(&passwordFile, "password-file", "", "Read password from file or - for stdin; remove one trailing line ending")
command.Flags().BoolVar(&mustChangePassword, "must-change-password", true, "Require password change on next sign-in (use =false to disable)") command.Flags().BoolVar(&mustChangePassword, "must-change-password", verb == "create", "Require password change on next sign-in (use =false to disable)")
} }
command.RunE = func(cmd *cobra.Command, args []string) error { command.RunE = func(cmd *cobra.Command, args []string) error {
if verb == "create" { if verb == "create" {
@@ -161,8 +161,8 @@ func (a *application) adminCommand() *cobra.Command {
return clierr.Wrap(clierr.Usage, errors.New("password cannot be empty")) return clierr.Wrap(clierr.Usage, errors.New("password cannot be empty"))
} }
opts.Password = password opts.Password = password
opts.MustChangePassword = &mustChangePassword }
} else if cmd.Flags().Changed("must-change-password") { if verb == "create" || cmd.Flags().Changed("must-change-password") {
opts.MustChangePassword = &mustChangePassword opts.MustChangePassword = &mustChangePassword
} }
+22
View File
@@ -38,3 +38,25 @@ func TestAdminPromptAndFlagsReachEquivalentPayloads(t *testing.T) {
require.Len(t, prompt.secrets, 2) require.Len(t, prompt.secrets, 2)
require.NotContains(t, out.String(), "password") require.NotContains(t, out.String(), "password")
} }
func TestAdminUserEditSetsMustChangePasswordOnlyWhenPassed(t *testing.T) {
var edits []map[string]any
server := newAuthenticatedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method == http.MethodPatch {
var payload map[string]any
require.NoError(t, json.NewDecoder(r.Body).Decode(&payload))
edits = append(edits, payload)
}
_, _ = w.Write([]byte(`{"id":2,"login":"bob"}`))
}))
defer server.Close()
deps, _, _ := serverDeps(t, server.URL)
for _, flags := range [][]string{{"--password", "new password"}, {"--password", "new password", "--must-change-password"}, {"--must-change-password=false"}} {
require.NoError(t, Execute(context.Background(), deps, append([]string{"admin", "user", "edit", "bob", "--no-input"}, flags...)))
}
require.Len(t, edits, 3)
require.Equal(t, "new password", edits[0]["password"])
require.Nil(t, edits[0]["must_change_password"])
require.Equal(t, true, edits[1]["must_change_password"])
require.Equal(t, false, edits[2]["must_change_password"])
}