mirror of
https://github.com/binwiederhier/ntfy.git
synced 2024-12-15 17:50:55 +00:00
Changes user add to use a NTFY_PASSWORD env var rather than NTFY_USER.
This commit is contained in:
parent
3dec7efadb
commit
1265e69eee
1 changed files with 14 additions and 26 deletions
24
cmd/user.go
24
cmd/user.go
|
@ -41,7 +41,7 @@ var cmdUser = &cli.Command{
|
|||
Action: execUserAdd,
|
||||
Flags: []cli.Flag{
|
||||
&cli.StringFlag{Name: "role", Aliases: []string{"r"}, Value: string(auth.RoleUser), Usage: "user role"},
|
||||
&cli.StringFlag{Name: "user", Aliases: []string{"u"}, EnvVars: []string{"NTFY_USER"}, Usage: "username[:password] used to auth against the server"},
|
||||
&cli.StringFlag{Name: "password", Aliases: []string{"p"}, EnvVars: []string{"NTFY_PASSWORD"}, Usage: "user password"},
|
||||
},
|
||||
Description: `Add a new user to the ntfy user database.
|
||||
|
||||
|
@ -137,24 +137,8 @@ Examples:
|
|||
}
|
||||
|
||||
func execUserAdd(c *cli.Context) error {
|
||||
var username string
|
||||
var password string
|
||||
userAndPass := c.String("user")
|
||||
password := c.String("user")
|
||||
role := auth.Role(c.String("role"))
|
||||
if userAndPass != "" {
|
||||
parts := strings.SplitN(userAndPass, ":", 2)
|
||||
if len(parts) == 2 {
|
||||
username = parts[0]
|
||||
password = parts[1]
|
||||
} else {
|
||||
p, err := readPasswordAndConfirm(c)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
username = userAndPass
|
||||
password = p
|
||||
}
|
||||
} else {
|
||||
username = c.Args().Get(0)
|
||||
if username == "" {
|
||||
return errors.New("username expected, type 'ntfy user add --help' for help")
|
||||
|
@ -164,12 +148,16 @@ func execUserAdd(c *cli.Context) error {
|
|||
return errors.New("role must be either 'user' or 'admin'")
|
||||
}
|
||||
|
||||
// If the password env var was not set, read it from stdin
|
||||
if password == "" {
|
||||
p, err := readPasswordAndConfirm(c)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
password = p
|
||||
}
|
||||
|
||||
manager, err := createAuthManager(c)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
Loading…
Reference in a new issue