From 1265e69eee40818e96a89fe4d5011ffb442cb089 Mon Sep 17 00:00:00 2001
From: Kenix <kenixwhisperwind@gmail.com>
Date: Mon, 20 Jun 2022 13:19:54 -0400
Subject: [PATCH] Changes user add to use a NTFY_PASSWORD env var rather than
 NTFY_USER.

---
 cmd/user.go | 40 ++++++++++++++--------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/cmd/user.go b/cmd/user.go
index 5a5b1f9..0860519 100644
--- a/cmd/user.go
+++ b/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,39 +137,27 @@ 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")
-		} else if username == userEveryone {
-			return errors.New("username not allowed")
-		} else if !auth.AllowedRole(role) {
-			return errors.New("role must be either 'user' or 'admin'")
-		}
+	username = c.Args().Get(0)
+	if username == "" {
+		return errors.New("username expected, type 'ntfy user add --help' for help")
+	} else if username == userEveryone {
+		return errors.New("username not allowed")
+	} else if !auth.AllowedRole(role) {
+		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