mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-09 16:55:16 +00:00
Merge pull request 'fix(cli): admin user create first user never require a password change' (#3412) from earl-warren/forgejo:wip-cli-user-create into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3412 Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
This commit is contained in:
commit
bdb729a5f2
|
@ -25,6 +25,7 @@ This is a bug fix release. See the documentation for more information on the [up
|
|||
In addition to the following notable bug fixes, you can browse the [full list of commits](https://codeberg.org/forgejo/forgejo/compare/v7.0.0...v7.0.1) included in this release.
|
||||
|
||||
* **Bug fixes:**
|
||||
* The regression in the [`fogejo admin user create`](https://forgejo.org/docs/v7.0/admin/command-line/#admin-user-create) CLI command [is fixed](https://codeberg.org/forgejo/forgejo/issues/3399) and it is backward compatible.
|
||||
|
||||
## 7.0.0
|
||||
|
||||
|
|
|
@ -124,7 +124,7 @@ func runCreateUser(c *cli.Context) error {
|
|||
if err != nil {
|
||||
return fmt.Errorf("IsTableNotEmpty: %w", err)
|
||||
}
|
||||
if !hasUserRecord && isAdmin {
|
||||
if !hasUserRecord {
|
||||
// if this is the first admin being created, don't force to change password (keep the old behavior)
|
||||
mustChangePassword = false
|
||||
}
|
||||
|
|
146
tests/integration/cmd_admin_test.go
Normal file
146
tests/integration/cmd_admin_test.go
Normal file
|
@ -0,0 +1,146 @@
|
|||
// Copyright 2024 The Forgejo Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package integration
|
||||
|
||||
import (
|
||||
"net/url"
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/models/db"
|
||||
"code.gitea.io/gitea/models/unittest"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func Test_Cmd_AdminUser(t *testing.T) {
|
||||
onGiteaRun(t, func(*testing.T, *url.URL) {
|
||||
for _, testCase := range []struct {
|
||||
name string
|
||||
options []string
|
||||
mustChangePassword bool
|
||||
}{
|
||||
{
|
||||
name: "default",
|
||||
options: []string{},
|
||||
mustChangePassword: true,
|
||||
},
|
||||
{
|
||||
name: "--must-change-password=false",
|
||||
options: []string{"--must-change-password=false"},
|
||||
mustChangePassword: false,
|
||||
},
|
||||
{
|
||||
name: "--must-change-password=true",
|
||||
options: []string{"--must-change-password=true"},
|
||||
mustChangePassword: true,
|
||||
},
|
||||
{
|
||||
name: "--must-change-password",
|
||||
options: []string{"--must-change-password"},
|
||||
mustChangePassword: true,
|
||||
},
|
||||
} {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
name := "testuser"
|
||||
|
||||
options := []string{"user", "create", "--username", name, "--password", "password", "--email", name + "@example.com"}
|
||||
options = append(options, testCase.options...)
|
||||
output, err := runMainApp("admin", options...)
|
||||
assert.NoError(t, err)
|
||||
assert.Contains(t, output, "has been successfully created")
|
||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: name})
|
||||
assert.Equal(t, testCase.mustChangePassword, user.MustChangePassword)
|
||||
|
||||
options = []string{"user", "change-password", "--username", name, "--password", "password"}
|
||||
options = append(options, testCase.options...)
|
||||
output, err = runMainApp("admin", options...)
|
||||
assert.NoError(t, err)
|
||||
assert.Contains(t, output, "has been successfully updated")
|
||||
user = unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: name})
|
||||
assert.Equal(t, testCase.mustChangePassword, user.MustChangePassword)
|
||||
|
||||
_, err = runMainApp("admin", "user", "delete", "--username", name)
|
||||
assert.NoError(t, err)
|
||||
unittest.AssertNotExistsBean(t, &user_model.User{Name: name})
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func Test_Cmd_AdminFirstUser(t *testing.T) {
|
||||
onGiteaRun(t, func(*testing.T, *url.URL) {
|
||||
for _, testCase := range []struct {
|
||||
name string
|
||||
options []string
|
||||
mustChangePassword bool
|
||||
isAdmin bool
|
||||
}{
|
||||
{
|
||||
name: "default",
|
||||
options: []string{},
|
||||
mustChangePassword: false,
|
||||
isAdmin: false,
|
||||
},
|
||||
{
|
||||
name: "--must-change-password=false",
|
||||
options: []string{"--must-change-password=false"},
|
||||
mustChangePassword: false,
|
||||
isAdmin: false,
|
||||
},
|
||||
{
|
||||
name: "--must-change-password=true",
|
||||
options: []string{"--must-change-password=true"},
|
||||
mustChangePassword: true,
|
||||
isAdmin: false,
|
||||
},
|
||||
{
|
||||
name: "--must-change-password",
|
||||
options: []string{"--must-change-password"},
|
||||
mustChangePassword: true,
|
||||
isAdmin: false,
|
||||
},
|
||||
{
|
||||
name: "--admin default",
|
||||
options: []string{"--admin"},
|
||||
mustChangePassword: false,
|
||||
isAdmin: true,
|
||||
},
|
||||
{
|
||||
name: "--admin --must-change-password=false",
|
||||
options: []string{"--admin", "--must-change-password=false"},
|
||||
mustChangePassword: false,
|
||||
isAdmin: true,
|
||||
},
|
||||
{
|
||||
name: "--admin --must-change-password=true",
|
||||
options: []string{"--admin", "--must-change-password=true"},
|
||||
mustChangePassword: true,
|
||||
isAdmin: true,
|
||||
},
|
||||
{
|
||||
name: "--admin --must-change-password",
|
||||
options: []string{"--admin", "--must-change-password"},
|
||||
mustChangePassword: true,
|
||||
isAdmin: true,
|
||||
},
|
||||
} {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
db.GetEngine(db.DefaultContext).Exec("DELETE FROM `user`")
|
||||
db.GetEngine(db.DefaultContext).Exec("DELETE FROM `email_address`")
|
||||
assert.Equal(t, int64(0), user_model.CountUsers(db.DefaultContext, nil))
|
||||
name := "testuser"
|
||||
|
||||
options := []string{"user", "create", "--username", name, "--password", "password", "--email", name + "@example.com"}
|
||||
options = append(options, testCase.options...)
|
||||
output, err := runMainApp("admin", options...)
|
||||
assert.NoError(t, err)
|
||||
assert.Contains(t, output, "has been successfully created")
|
||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: name})
|
||||
assert.Equal(t, testCase.mustChangePassword, user.MustChangePassword)
|
||||
assert.Equal(t, testCase.isAdmin, user.IsAdmin)
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
Loading…
Reference in a new issue