From 03bab7665048f7818d6ac692562ea6df5342a485 Mon Sep 17 00:00:00 2001
From: Maximilian <max@mpatterson.xyz>
Date: Wed, 21 Dec 2022 21:22:11 -0600
Subject: [PATCH] Fix existing auth_token check and comment fixes

---
 database/models/user.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/database/models/user.go b/database/models/user.go
index accaf96..19f2e0d 100644
--- a/database/models/user.go
+++ b/database/models/user.go
@@ -22,7 +22,7 @@ type User struct {
 	UpdatedAt string
 }
 
-// GetCurrentUser finds the currently logged in user by session cookie
+// GetCurrentUser finds the currently logged-in user by session cookie
 func GetCurrentUser(app *app.App, r *http.Request) (User, error) {
 	cookie, err := r.Cookie("session")
 	if err != nil {
@@ -132,22 +132,22 @@ func createSessionCookie(app *app.App, w http.ResponseWriter, username string) (
 	str := hex.EncodeToString(buff)
 	token := str[:64]
 
-	// Ensure no duplicate tokens exist in database
-	var count int
-	err = app.Db.QueryRow("SELECT COUNT(*) FROM sessions WHERE session = $1", token).Scan(&count)
+	// If the auth_token column for any user matches the token, set existingAuthToken to true
+	var existingAuthToken bool
+	err = app.Db.QueryRow("SELECT EXISTS(SELECT 1 FROM users WHERE auth_token = $1)", token).Scan(&existingAuthToken)
 	if err != nil {
-		log.Println("Error querying sessions table for duplicate token")
+		log.Println("Error checking for existing auth token")
 		log.Println(err)
 		return "", err
 	}
 
 	// If duplicate token found, recursively call function until unique token is generated
-	if count > 0 {
+	if existingAuthToken == true {
 		log.Println("Duplicate token found in sessions table")
 		return createSessionCookie(app, w, username)
 	}
 
-	// Store token in auth_token column of users table
+	// Store token in auth_token column of the users table
 	sqlStatement := "UPDATE users SET auth_token = $1 WHERE username = $2"
 	_, err = app.Db.Exec(sqlStatement, token, username)
 	if err != nil {