Changeset 572 in code for trunk/service.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/service.go (modified) (2 diffs)

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
         }