Changeset 572 in code for trunk/user.go

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.

File:

• trunk/user.go (modified) (1 diff)

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
 }