Changeset 572 in code

Timestamp:

Jun 28, 2021, 4:05:03 PM (4 years ago)

Author:

contact

Message:

Introduce user.updateUser

Unify updatePassword and updateRealname into a single function. This
allows "user update" to be atomic.

Location:

trunk

Files:

• service.go (modified) (2 diffs)
• user.go (modified) (1 diff)

trunk/service.go

@@ -776 +776 @@
         }
 
+        // copy the user record because we'll mutate it
+        record := dc.user.User
+
         if password != nil {
                 hashed, err := bcrypt.GenerateFromPassword([]byte(*password), bcrypt.DefaultCost)
@@ -781 +784 @@
                         return fmt.Errorf("failed to hash password: %v", err)
                 }
-                if err := dc.user.updatePassword(string(hashed)); err != nil {
-                        return err
-                }
+                record.Password = string(hashed)
         }
         if realname != nil {
-                if err := dc.user.updateRealname(*realname); err != nil {
-                        return err
-                }
+                record.Realname = *realname
+        }
+
+        if err := dc.user.updateUser(&record); err != nil {
+                return err
         }
 

trunk/user.go

@@ -857 +857 @@
 }
 
-func (u *user) updatePassword(hashed string) error {
-        u.User.Password = hashed
-        return u.srv.db.StoreUser(&u.User)
-}
-
-func (u *user) updateRealname(realname string) error {
-        u.User.Realname = realname
-        if err := u.srv.db.StoreUser(&u.User); err != nil {
+func (u *user) updateUser(record *User) error {
+        if u.ID != record.ID {
+                panic("ID mismatch when updating user")
+        }
+
+        realnameUpdated := u.Realname != record.Realname
+        if err := u.srv.db.StoreUser(record); err != nil {
                 return fmt.Errorf("failed to update user %q: %v", u.Username, err)
         }
-
-        // Re-connect to networks which use the default realname
-        var needUpdate []Network
-        u.forEachNetwork(func(net *network) {
-                if net.Realname == "" {
-                        needUpdate = append(needUpdate, net.Network)
-                }
-        })
-
-        var netErr error
-        for _, net := range needUpdate {
-                if _, err := u.updateNetwork(&net); err != nil {
-                        netErr = err
-                }
-        }
-
-        return netErr
+        u.User = *record
+
+        if realnameUpdated {
+                // Re-connect to networks which use the default realname
+                var needUpdate []Network
+                u.forEachNetwork(func(net *network) {
+                        if net.Realname == "" {
+                                needUpdate = append(needUpdate, net.Network)
+                        }
+                })
+
+                var netErr error
+                for _, net := range needUpdate {
+                        if _, err := u.updateNetwork(&net); err != nil {
+                                netErr = err
+                        }
+                }
+                if netErr != nil {
+                        return netErr
+                }
+        }
+
+        return nil
 }