mirror of
https://github.com/go-gitea/gitea.git
synced 2026-06-23 04:40:40 +00:00
fix(cli): default must-change-password to false for bot users (#38175)
This commit is contained in:
@@ -158,7 +158,8 @@ func runCreateUser(ctx context.Context, c *cli.Command) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
isAdmin := c.Bool("admin")
|
isAdmin := c.Bool("admin")
|
||||||
mustChangePassword := true // always default to true
|
// Only local, existing, regular users should be forced to update their password. Bot users for example are non-interactive
|
||||||
|
mustChangePassword := userType == user_model.UserTypeIndividual
|
||||||
if c.IsSet("must-change-password") {
|
if c.IsSet("must-change-password") {
|
||||||
if userType != user_model.UserTypeIndividual {
|
if userType != user_model.UserTypeIndividual {
|
||||||
return errors.New("must-change-password flag can only be set for individual users")
|
return errors.New("must-change-password flag can only be set for individual users")
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ func TestAdminUserCreate(t *testing.T) {
|
|||||||
u := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: "u"})
|
u := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: "u"})
|
||||||
assert.Equal(t, user_model.UserTypeBot, u.Type)
|
assert.Equal(t, user_model.UserTypeBot, u.Type)
|
||||||
assert.Empty(t, u.Passwd)
|
assert.Empty(t, u.Passwd)
|
||||||
|
assert.False(t, u.MustChangePassword, "bot users should not be forced to change password")
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("AccessToken", func(t *testing.T) {
|
t.Run("AccessToken", func(t *testing.T) {
|
||||||
|
|||||||
Reference in New Issue
Block a user