mirror of
https://github.com/go-gitea/gitea.git
synced 2025-04-28 11:45:15 +00:00
Add "--fullname" arg to gitea admin user create (#34241)
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
parent
c9aa9068b3
commit
166ec1b4c3
@ -81,6 +81,10 @@ var microcmdUserCreate = &cli.Command{
|
|||||||
Name: "restricted",
|
Name: "restricted",
|
||||||
Usage: "Make a restricted user account",
|
Usage: "Make a restricted user account",
|
||||||
},
|
},
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "fullname",
|
||||||
|
Usage: `The full, human-readable name of the user`,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -191,6 +195,7 @@ func runCreateUser(c *cli.Context) error {
|
|||||||
Passwd: password,
|
Passwd: password,
|
||||||
MustChangePassword: mustChangePassword,
|
MustChangePassword: mustChangePassword,
|
||||||
Visibility: visibility,
|
Visibility: visibility,
|
||||||
|
FullName: c.String("fullname"),
|
||||||
}
|
}
|
||||||
|
|
||||||
overwriteDefault := &user_model.CreateUserOverwriteOptions{
|
overwriteDefault := &user_model.CreateUserOverwriteOptions{
|
||||||
|
@ -50,17 +50,17 @@ func TestAdminUserCreate(t *testing.T) {
|
|||||||
assert.Equal(t, check{IsAdmin: false, MustChangePassword: false}, createCheck("u5", "--must-change-password=false"))
|
assert.Equal(t, check{IsAdmin: false, MustChangePassword: false}, createCheck("u5", "--must-change-password=false"))
|
||||||
})
|
})
|
||||||
|
|
||||||
createUser := func(name, args string) error {
|
createUser := func(name string, args ...string) error {
|
||||||
return app.Run(strings.Fields(fmt.Sprintf("./gitea admin user create --username %s --email %s@gitea.local %s", name, name, args)))
|
return app.Run(append([]string{"./gitea", "admin", "user", "create", "--username", name, "--email", name + "@gitea.local"}, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Run("UserType", func(t *testing.T) {
|
t.Run("UserType", func(t *testing.T) {
|
||||||
reset()
|
reset()
|
||||||
assert.ErrorContains(t, createUser("u", "--user-type invalid"), "invalid user type")
|
assert.ErrorContains(t, createUser("u", "--user-type", "invalid"), "invalid user type")
|
||||||
assert.ErrorContains(t, createUser("u", "--user-type bot --password 123"), "can only be set for individual users")
|
assert.ErrorContains(t, createUser("u", "--user-type", "bot", "--password", "123"), "can only be set for individual users")
|
||||||
assert.ErrorContains(t, createUser("u", "--user-type bot --must-change-password"), "can only be set for individual users")
|
assert.ErrorContains(t, createUser("u", "--user-type", "bot", "--must-change-password"), "can only be set for individual users")
|
||||||
|
|
||||||
assert.NoError(t, createUser("u", "--user-type bot"))
|
assert.NoError(t, createUser("u", "--user-type", "bot"))
|
||||||
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)
|
||||||
@ -75,7 +75,7 @@ func TestAdminUserCreate(t *testing.T) {
|
|||||||
|
|
||||||
// using "--access-token" only means "all" access
|
// using "--access-token" only means "all" access
|
||||||
reset()
|
reset()
|
||||||
assert.NoError(t, createUser("u", "--random-password --access-token"))
|
assert.NoError(t, createUser("u", "--random-password", "--access-token"))
|
||||||
assert.Equal(t, 1, unittest.GetCount(t, &user_model.User{}))
|
assert.Equal(t, 1, unittest.GetCount(t, &user_model.User{}))
|
||||||
assert.Equal(t, 1, unittest.GetCount(t, &auth_model.AccessToken{}))
|
assert.Equal(t, 1, unittest.GetCount(t, &auth_model.AccessToken{}))
|
||||||
accessToken := unittest.AssertExistsAndLoadBean(t, &auth_model.AccessToken{Name: "gitea-admin"})
|
accessToken := unittest.AssertExistsAndLoadBean(t, &auth_model.AccessToken{Name: "gitea-admin"})
|
||||||
@ -85,7 +85,7 @@ func TestAdminUserCreate(t *testing.T) {
|
|||||||
|
|
||||||
// using "--access-token" with name & scopes
|
// using "--access-token" with name & scopes
|
||||||
reset()
|
reset()
|
||||||
assert.NoError(t, createUser("u", "--random-password --access-token --access-token-name new-token-name --access-token-scopes read:issue,read:user"))
|
assert.NoError(t, createUser("u", "--random-password", "--access-token", "--access-token-name", "new-token-name", "--access-token-scopes", "read:issue,read:user"))
|
||||||
assert.Equal(t, 1, unittest.GetCount(t, &user_model.User{}))
|
assert.Equal(t, 1, unittest.GetCount(t, &user_model.User{}))
|
||||||
assert.Equal(t, 1, unittest.GetCount(t, &auth_model.AccessToken{}))
|
assert.Equal(t, 1, unittest.GetCount(t, &auth_model.AccessToken{}))
|
||||||
accessToken = unittest.AssertExistsAndLoadBean(t, &auth_model.AccessToken{Name: "new-token-name"})
|
accessToken = unittest.AssertExistsAndLoadBean(t, &auth_model.AccessToken{Name: "new-token-name"})
|
||||||
@ -98,23 +98,38 @@ func TestAdminUserCreate(t *testing.T) {
|
|||||||
|
|
||||||
// using "--access-token-name" without "--access-token"
|
// using "--access-token-name" without "--access-token"
|
||||||
reset()
|
reset()
|
||||||
err = createUser("u", "--random-password --access-token-name new-token-name")
|
err = createUser("u", "--random-password", "--access-token-name", "new-token-name")
|
||||||
assert.Equal(t, 0, unittest.GetCount(t, &user_model.User{}))
|
assert.Equal(t, 0, unittest.GetCount(t, &user_model.User{}))
|
||||||
assert.Equal(t, 0, unittest.GetCount(t, &auth_model.AccessToken{}))
|
assert.Equal(t, 0, unittest.GetCount(t, &auth_model.AccessToken{}))
|
||||||
assert.ErrorContains(t, err, "access-token-name and access-token-scopes flags are only valid when access-token flag is set")
|
assert.ErrorContains(t, err, "access-token-name and access-token-scopes flags are only valid when access-token flag is set")
|
||||||
|
|
||||||
// using "--access-token-scopes" without "--access-token"
|
// using "--access-token-scopes" without "--access-token"
|
||||||
reset()
|
reset()
|
||||||
err = createUser("u", "--random-password --access-token-scopes read:issue")
|
err = createUser("u", "--random-password", "--access-token-scopes", "read:issue")
|
||||||
assert.Equal(t, 0, unittest.GetCount(t, &user_model.User{}))
|
assert.Equal(t, 0, unittest.GetCount(t, &user_model.User{}))
|
||||||
assert.Equal(t, 0, unittest.GetCount(t, &auth_model.AccessToken{}))
|
assert.Equal(t, 0, unittest.GetCount(t, &auth_model.AccessToken{}))
|
||||||
assert.ErrorContains(t, err, "access-token-name and access-token-scopes flags are only valid when access-token flag is set")
|
assert.ErrorContains(t, err, "access-token-name and access-token-scopes flags are only valid when access-token flag is set")
|
||||||
|
|
||||||
// empty permission
|
// empty permission
|
||||||
reset()
|
reset()
|
||||||
err = createUser("u", "--random-password --access-token --access-token-scopes public-only")
|
err = createUser("u", "--random-password", "--access-token", "--access-token-scopes", "public-only")
|
||||||
assert.Equal(t, 0, unittest.GetCount(t, &user_model.User{}))
|
assert.Equal(t, 0, unittest.GetCount(t, &user_model.User{}))
|
||||||
assert.Equal(t, 0, unittest.GetCount(t, &auth_model.AccessToken{}))
|
assert.Equal(t, 0, unittest.GetCount(t, &auth_model.AccessToken{}))
|
||||||
assert.ErrorContains(t, err, "access token does not have any permission")
|
assert.ErrorContains(t, err, "access token does not have any permission")
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("UserFields", func(t *testing.T) {
|
||||||
|
reset()
|
||||||
|
assert.NoError(t, createUser("u-FullNameWithSpace", "--random-password", "--fullname", "First O'Middle Last"))
|
||||||
|
unittest.AssertExistsAndLoadBean(t, &user_model.User{
|
||||||
|
Name: "u-FullNameWithSpace",
|
||||||
|
LowerName: "u-fullnamewithspace",
|
||||||
|
FullName: "First O'Middle Last",
|
||||||
|
Email: "u-FullNameWithSpace@gitea.local",
|
||||||
|
})
|
||||||
|
|
||||||
|
assert.NoError(t, createUser("u-FullNameEmpty", "--random-password", "--fullname", ""))
|
||||||
|
u := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: "u-fullnameempty"})
|
||||||
|
assert.Empty(t, u.FullName)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user