Changeset 324 in code for trunk

Timestamp:

Jun 8, 2020, 9:59:03 AM (5 years ago)

Author:

contact

Message:

Introduce User.Created

For Network and Channel, the database only needed to define one Store
operation to create/update a record. However since User is missing an ID
we couldn't have a single StoreUser function like other types. We had
CreateUser and UpdatePassword. As new User fields get added (e.g. the
upcoming Admin flag) this isn't sustainable.

We could have CreateUser and UpdateUser, but this wouldn't be consistent
with other types. Instead, introduce User.Created which indicates
whether the record is already stored in the DB. This can be used in a
new StoreUser function to decide whether we need to UPDATE or INSERT
without relying on SQL constraints and INSERT OR UPDATE.

The ListUsers and GetUser functions set User.Created to true.

Location:

trunk

Files:

• cmd/sojuctl/main.go (modified) (2 diffs)
• db.go (modified) (4 diffs)
• user.go (modified) (1 diff)

trunk/cmd/sojuctl/main.go

@@ -70 +70 @@
                         Password: string(hashed),
                 }
-                if err := db.CreateUser(&user); err != nil {
+                if err := db.StoreUser(&user); err != nil {
                         log.Fatalf("failed to create user: %v", err)
                 }
@@ -91 +91 @@
 
                 user := soju.User{
+                        Created:  true,
                         Username: username,
                         Password: string(hashed),
                 }
-                if err := db.UpdatePassword(&user); err != nil {
+                if err := db.StoreUser(&user); err != nil {
                         log.Fatalf("failed to update password: %v", err)
                 }
-
         default:
                 flag.Usage()

trunk/db.go

@@ -11 +11 @@
 
 type User struct {
+        Created  bool
         Username string
         Password string // hashed
@@ -200 +201 @@
                         return nil, err
                 }
+                user.Created = true
                 user.Password = fromStringPtr(password)
                 users = append(users, user)
@@ -214 +216 @@
         defer db.lock.RUnlock()
 
-        user := &User{Username: username}
+        user := &User{Created: true, Username: username}
 
         var password *string
@@ -225 +227 @@
 }
 
-func (db *DB) CreateUser(user *User) error {
+func (db *DB) StoreUser(user *User) error {
         db.lock.Lock()
         defer db.lock.Unlock()
 
         password := toStringPtr(user.Password)
-        _, err := db.db.Exec("INSERT INTO User(username, password) VALUES (?, ?)", user.Username, password)
-        return err
-}
-
-func (db *DB) UpdatePassword(user *User) error {
-        db.lock.Lock()
-        defer db.lock.Unlock()
-
-        password := toStringPtr(user.Password)
-        _, err := db.db.Exec(`UPDATE User
-        SET password = ?
-        WHERE username = ?`,
-                password, user.Username)
+
+        var err error
+        if user.Created {
+                _, err = db.db.Exec("UPDATE User SET password = ? WHERE username = ?",
+                        password, user.Username)
+        } else {
+                _, err = db.db.Exec("INSERT INTO User(username, password) VALUES (?, ?)",
+                        user.Username, password)
+                if err == nil {
+                        user.Created = true
+                }
+        }
+
         return err
 }

trunk/user.go

@@ -548 +548 @@
 func (u *user) updatePassword(hashed string) error {
         u.User.Password = hashed
-        return u.srv.db.UpdatePassword(&u.User)
-}
+        return u.srv.db.StoreUser(&u.User)
+}