Add username flag in create-user command (#6534)

* Add username flag in create-user command

* Fix the error message

* Change name to username on flag of create-user command

* Include create-user flags of both versions

* delete deprecated example of create-user command
This commit is contained in:
ngourdon 2019-04-09 17:21:55 +02:00 committed by techknowlogick
parent 8e949db3b5
commit 2b9b3310f6
2 changed files with 25 additions and 5 deletions

View File

@ -42,6 +42,10 @@ var (
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
Name: "name", Name: "name",
Usage: "Username. DEPRECATED: use username instead",
},
cli.StringFlag{
Name: "username",
Usage: "Username", Usage: "Username",
}, },
cli.StringFlag{ cli.StringFlag{
@ -288,14 +292,29 @@ func runChangePassword(c *cli.Context) error {
} }
func runCreateUser(c *cli.Context) error { func runCreateUser(c *cli.Context) error {
if err := argsSet(c, "name", "email"); err != nil { if err := argsSet(c, "email"); err != nil {
return err return err
} }
if c.IsSet("name") && c.IsSet("username") {
return errors.New("Cannot set both --name and --username flags")
}
if !c.IsSet("name") && !c.IsSet("username") {
return errors.New("One of --name or --username flags must be set")
}
if c.IsSet("password") && c.IsSet("random-password") { if c.IsSet("password") && c.IsSet("random-password") {
return errors.New("cannot set both -random-password and -password flags") return errors.New("cannot set both -random-password and -password flags")
} }
var username string
if c.IsSet("username") {
username = c.String("username")
} else {
username = c.String("name")
fmt.Fprintf(os.Stderr, "--name flag is deprecated. Use --username instead.\n")
}
var password string var password string
if c.IsSet("password") { if c.IsSet("password") {
@ -334,7 +353,7 @@ func runCreateUser(c *cli.Context) error {
} }
if err := models.CreateUser(&models.User{ if err := models.CreateUser(&models.User{
Name: c.String("name"), Name: username,
Email: c.String("email"), Email: c.String("email"),
Passwd: password, Passwd: password,
IsActive: true, IsActive: true,
@ -345,7 +364,7 @@ func runCreateUser(c *cli.Context) error {
return fmt.Errorf("CreateUser: %v", err) return fmt.Errorf("CreateUser: %v", err)
} }
fmt.Printf("New user '%s' has been successfully created!\n", c.String("name")) fmt.Printf("New user '%s' has been successfully created!\n", username)
return nil return nil
} }

View File

@ -51,7 +51,8 @@ Admin operations:
- Commands: - Commands:
- `create-user` - `create-user`
- Options: - Options:
- `--name value`: Username. Required. - `--name value`: Username. Required. As of gitea 1.9.0, use the `--username` flag instead.
- `--username value`: Username. Required. New in gitea 1.9.0.
- `--password value`: Password. Required. - `--password value`: Password. Required.
- `--email value`: Email. Required. - `--email value`: Email. Required.
- `--admin`: If provided, this makes the user an admin. Optional. - `--admin`: If provided, this makes the user an admin. Optional.
@ -63,7 +64,7 @@ Admin operations:
- `--random-password-length`: If provided, it will be used to configure the length of the randomly - `--random-password-length`: If provided, it will be used to configure the length of the randomly
generated password. Optional. (default: 12) generated password. Optional. (default: 12)
- Examples: - Examples:
- `gitea admin create-user --name myname --password asecurepassword --email me@example.com` - `gitea admin create-user --username myname --password asecurepassword --email me@example.com`
- `change-password` - `change-password`
- Options: - Options:
- `--username value`, `-u value`: Username. Required. - `--username value`, `-u value`: Username. Required.