Changeset 570 in code for trunk

Timestamp:

Jun 28, 2021, 2:55:44 PM (4 years ago)

Author:

contact

Message:

Merge "change-password" into "user update"

Add a -password flag to the "user update" command.

Location:

trunk

Files:

• doc/soju.1.scd (modified) (1 diff)
• service.go (modified) (5 diffs)

trunk/doc/soju.1.scd

@@ -310 +310 @@
                 realname set for a network.
 
-*user update* [-realname <realname>]
+*user update* [-password <password>] [-realname <realname>]
         Update the current user.
 
 *user delete* <username>
         Delete a soju user. Only admins can delete accounts.
-
-*change-password* <new password>
-        Change current user password.
 
 # AUTHORS

trunk/service.go

@@ -261 +261 @@
                                 },
                                 "update": {
-                                        usage:  "[-realname <realname>]",
+                                        usage:  "[-password <password>] [-realname <realname>]",
                                         desc:   "update the current user",
                                         handle: handleUserUpdate,
@@ -272 +272 @@
                                 },
                         },
-                },
-                "change-password": {
-                        usage:  "<new password>",
-                        desc:   "change your password",
-                        handle: handlePasswordChange,
                 },
                 "channel": {
@@ -735 +730 @@
 }
 
-func handlePasswordChange(dc *downstreamConn, params []string) error {
-        if len(params) != 1 {
-                return fmt.Errorf("expected exactly one argument")
-        }
-
-        hashed, err := bcrypt.GenerateFromPassword([]byte(params[0]), bcrypt.DefaultCost)
-        if err != nil {
-                return fmt.Errorf("failed to hash password: %v", err)
-        }
-        if err := dc.user.updatePassword(string(hashed)); err != nil {
-                return err
-        }
-
-        sendServicePRIVMSG(dc, "password updated")
-        return nil
-}
-
 func handleUserCreate(dc *downstreamConn, params []string) error {
         fs := newFlagSet()
@@ -789 +767 @@
 
 func handleUserUpdate(dc *downstreamConn, params []string) error {
-        var realname *string
+        var password, realname *string
         fs := newFlagSet()
+        fs.Var(stringPtrFlag{&password}, "password", "")
         fs.Var(stringPtrFlag{&realname}, "realname", "")
 
@@ -797 +776 @@
         }
 
+        if password != nil {
+                hashed, err := bcrypt.GenerateFromPassword([]byte(*password), bcrypt.DefaultCost)
+                if err != nil {
+                        return fmt.Errorf("failed to hash password: %v", err)
+                }
+                if err := dc.user.updatePassword(string(hashed)); err != nil {
+                        return err
+                }
+        }
         if realname != nil {
                 if err := dc.user.updateRealname(*realname); err != nil {