From 985db3a0608f7132b4afc95501755294ee549eff Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 9 Oct 2023 11:42:29 -0400 Subject: [PATCH] more --- auth.go | 2 +- main.go | 10 +++++----- main_test.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/auth.go b/auth.go index 06326a0..b0014a7 100644 --- a/auth.go +++ b/auth.go @@ -44,7 +44,7 @@ func Login(username, password string) bool { } func (u *UserData) SetPassword(newcrypt []byte) bool { - q := fmt.Sprintf("update %s_auth set password=? where user=?", c.TablePrefix) + q := fmt.Sprintf("update %s_users set password=? where id=?", c.TablePrefix) _, err := c.db.Exec(q, newcrypt, u.UserID) if err != nil { log.Printf("scsusers.SetPassword: update failed for %s: %s\n", u.Username, err.Error()) diff --git a/main.go b/main.go index add951f..34fa406 100644 --- a/main.go +++ b/main.go @@ -64,7 +64,7 @@ func UsernameAvailable(username string) bool { var tmp string username = strings.ToLower(username) - q := fmt.Sprintf("select username from %s_auth where username = ?", c.TablePrefix) + q := fmt.Sprintf("select username from %s_users where username = ?", c.TablePrefix) err := c.db.Get(&tmp, q, username) if err == sql.ErrNoRows { return true @@ -90,7 +90,7 @@ func Register(username, email, ip string) bool { log.Printf("scsusers.Register: Bcrypt GenerateFromPassword failed? Pass is %s and error is %s\n", pass, err.Error()) return false } - _, err = c.db.Query(fmt.Sprintf("insert into %s_auth (username, password) VALUES (?,?)", c.TablePrefix), username, crypt) + _, err = c.db.Query(fmt.Sprintf("insert into %s_users (username, password) VALUES (?,?)", c.TablePrefix), username, crypt) if err != nil { log.Printf("scsusers.Register: insert failed: %s\n", err.Error()) return false @@ -103,7 +103,7 @@ func Register(username, email, ip string) bool { return true } log.Printf("scsusers.Register: Failed to send registration email, deleting user %s\n", username) - q := fmt.Sprintf("delete from %s_auth where username = ? AND password=?", c.TablePrefix) + q := fmt.Sprintf("delete from %s_users where username = ? AND password=?", c.TablePrefix) _, err = c.db.Exec(q, username, string(crypt)) if err != nil { log.Printf("scsusers.Register: Failed to delete new user %s: %s\n", username, err.Error()) @@ -119,7 +119,7 @@ func NewUser() *UserData { func Get(username string) (*UserData, bool) { u := NewUser() - q := fmt.Sprintf("select username, password, id from %s_auth where username=?", c.TablePrefix) + q := fmt.Sprintf("select username, password, id from %s_users where username=?", c.TablePrefix) err := c.db.Get(u, q, username) if err != nil { if err == sql.ErrNoRows { @@ -136,7 +136,7 @@ func GetUserid(username string) int64 { var i int64 username = strings.ToLower(username) - q := fmt.Sprintf("select userid from %s_auth where username = ?", c.TablePrefix) + q := fmt.Sprintf("select userid from %s_users where username = ?", c.TablePrefix) err := c.db.Get(&i, q, username) if err != nil { log.Printf("scsusers.getUserId: Error loading user: %s : %s\n", username, err.Error()) diff --git a/main_test.go b/main_test.go index 791f03f..bf51fbc 100644 --- a/main_test.go +++ b/main_test.go @@ -28,7 +28,7 @@ func TestUsers(t *testing.T) { fmt.Println("Couldn't ping sqlite3 in-memory db:" + err.Error()) os.Exit(1) } - schema := `CREATE TABLE test_auth ( + schema := `CREATE TABLE test_users ( id integer primary key autoincrement, username text NOT NULL unique, password text NOT NULL);`