From 4e715ab1e1053698c3eb02c13cc726ce9bd26667 Mon Sep 17 00:00:00 2001
From: Steven Le Rouzic <steven.lerouzic@gmail.com>
Date: Tue, 16 Apr 2024 22:48:07 +0200
Subject: [PATCH] DB migration & timer token

---
 model/timer.go            |   1 +
 static/style.css          |   1 +
 timer.db                  | Bin 0 -> 28672 bytes
 timer.go                  | 104 ++++++++++++++++++++++++++++----------
 view/login.templ          |   2 +-
 view/login_templ.go       |   4 +-
 view/timers_list.templ    |   8 +--
 view/timers_list_templ.go |  16 +++---
 8 files changed, 97 insertions(+), 39 deletions(-)
 create mode 100644 timer.db

diff --git a/model/timer.go b/model/timer.go
index 1420be5..27e46da 100644
--- a/model/timer.go
+++ b/model/timer.go
@@ -6,6 +6,7 @@ type Timer struct {
 	StartTime Time
 	EndTime   Time
 	Owner     UUID
+	Token     string
 }
 
 func (self Timer) IsFinished() bool {
diff --git a/static/style.css b/static/style.css
index 17df2b0..f153f6e 100644
--- a/static/style.css
+++ b/static/style.css
@@ -9,3 +9,4 @@ body {
 .error {
     color: red;
 }
+
diff --git a/timer.db b/timer.db
new file mode 100644
index 0000000000000000000000000000000000000000..bbcc582d33cd8fdc0d28feffb3f276b508f188ee
GIT binary patch
literal 28672
zcmeI)y=&uU90zd8Nu2l~QK1bQdV>mq#<ef8?D(ZA2elHNB1e|(L=LuT2@+Crj%CM@
z<u}ox?r}qhb}5C9Z3Bga&V{36yBxIhLAP!l?hhz*sia)evq|ZYd!gYgcq~27BRzV4
zp9c?;e|Wbf)op`0IJTOq%_NA|2$Ce;XBdJYX52FCmh)}OJ(xbPxO>tqfoJNM9nKId
zy-(+<KZ)S{7sSF3)UVXH^S>{A=2oyl00Izz00bZa0SG_<0uX?J6b#Z4nl$Py-54nK
zreP_^4WlJqRA)DK_^iS+qP)phn29r(f_&Dr>|Yfgg{Nof#YOUyq^)YEQSKO)S7x4$
zp=3FUXS^0>`9>%d5_R{3lL}l&E+~v#mL#Sui={Fj^?GHsX@o)wUr{c){q|kev@dHf
zs+~^%*wV*G^e-vyi23YJmD%R2%yL~1yTgayo(a<LEs}&EdFRA*pG^1Fu6^v+_q|E(
zv)*TLR3~R?nkMhDeo$uwo>X8gEWiCqaoMV6d!t+uGvCtvo=dt4{gz=(F#19JOELlV
ztnV0#c!m<53evafe?##@+>iUa>2Tn`Pi6g6y=VD3@2fWN7LpPON?7>Ht7C%z1Rwwb
z2tWV=5P$##AOHafyi9>nG%y!kOeUkF+vMkee0O@&Nq_k!8+>&0^cThG*zs6=?N)5<
z7MoJyvGujYdLmQ1tj)dl>-(|ZM;|}>`JD$3zke%bIuX78?w!Vwtyj3F#<mSjkJa1B
z_HK^V((RleJNebFXxfQxGQBB8I@{G=x4}pHdv>JQFLGv;i>)4?#5a2V{Gnu5t!(X3
zE**_h<Xkj-KHYDATOZIrK6v=k{lD(9yY4##-RLuWs%aX-@ku5!>+$5p#N%!-tQ(2f
zHaT%8(bj5-+D3!xI?X|{*>||gV3;_`IC+gL4h6P1)MTl;Wo6Z^SVPFjhq>OJ?&|O$
zd!QAn5m~n6jwy(V!dgMu84T65R+9R6W$uQ%s3i4-pq@~VU*`JaUJ!r)1Rwwb2tWV=
z5P$##AOHafTv_0asVF)5-X!q)R5au^j=h~Yd;UKqs8j0n%6G*85P$##AOHafKmY;|
zfB*y_0D<c)@Zq$ZrSPIs3j!awqlaG9@Be4{{|-Sp*Li^u8w4N#0SG_<0uX=z1Rwwb
z2teRf35=%5V3amS)03(Gs@|-(Qg;u#Ictz?4Ea{MCTi_HwK2%)8~RWjsA8q69u2p4
z(^@BW;N+I#>QZcNNi|FIMo!{tE0uINUrPx>HlcSj@fAzR>~&jarX!}6Vysci4_Ifo
zX*vb2x&2T6|EqGqeIWn=2tWV=5P$##AOHafKmY;|c%A}J^Z&>G5CQrB&r=v<K>z{}
YfB*y_009U<00Izzz_k|mALsx74SfXu8vp<R

literal 0
HcmV?d00001

diff --git a/timer.go b/timer.go
index ef65b8b..5209e73 100644
--- a/timer.go
+++ b/timer.go
@@ -20,16 +20,34 @@ import (
 	"stevenlr.com/timer/view"
 )
 
+func generateRandomString(len int) (string, error) {
+	bin := make([]byte, len)
+	_, err := rand.Read(bin)
+	if err != nil {
+		return "", err
+	}
+	return base64.StdEncoding.EncodeToString(bin), nil
+}
+
+func generateSessionId() (string, error) {
+	return generateRandomString(66)
+}
+
+func generateTimerToken() (string, error) {
+	return generateRandomString(66)
+}
+
 func insertTimer(tx *sql.Tx, name string, seconds int, ownerId model.UUID) error {
 	now := model.MakeTimeNow()
 	end := model.Time(time.Time(now).Add(time.Duration(seconds) * time.Second))
 	id := model.MakeUUID()
+	token, _ := generateTimerToken()
 	_, err := tx.Exec(`
-		INSERT INTO Timer VALUES ($1, $2, $3, $4, $5)`, id, name, now, end, ownerId)
+		INSERT INTO Timer VALUES ($1, $2, $3, $4, $5, $6)`, id, name, now, end, ownerId, token)
 	return err
 }
 
-func initializeDatabase(db *sql.DB) error {
+func initializeDatabaseV1(db *sql.DB) error {
 	tx, err := db.Begin()
 	if err != nil {
 		return err
@@ -48,19 +66,13 @@ func initializeDatabase(db *sql.DB) error {
 			StartTime	TEXT	NOT NULL,
 			EndTime		TEXT	NOT NULL,
 			Owner		BLOB	NOT NULL,
-			PRIMARY KEY (id)
+			Token		TEXT	NOT NULL UNIQUE,
+			PRIMARY KEY (Id)
 		)`)
 	if err != nil {
 		return err
 	}
 
-	userUuidStr := "7015cee7-89a5-4057-b7c9-7e0128ad5086"
-	var userId model.UUID
-	err = userId.Scan(userUuidStr)
-	if err != nil {
-		return err
-	}
-
 	_, err = tx.Exec(`
 		CREATE TABLE User (
 			Id			BLOB	NOT NULL UNIQUE,
@@ -73,14 +85,19 @@ func initializeDatabase(db *sql.DB) error {
 		return err
 	}
 
-	userPasswordClear := "steven"
-
-	password, err := bcrypt.GenerateFromPassword([]byte(userUuidStr+userPasswordClear), bcrypt.MinCost)
+	userName := "admin"
+	userPassword := "admin"
+	salt, err := generateRandomString(33)
 	if err != nil {
 		return err
 	}
 
-	_, err = tx.Exec(`INSERT INTO User VALUES ($1, $2, $3, $4)`, userId, "steven", userUuidStr, password)
+	password, err := bcrypt.GenerateFromPassword([]byte(salt+userPassword), bcrypt.MinCost)
+	if err != nil {
+		return err
+	}
+
+	_, err = tx.Exec(`INSERT INTO User VALUES ($1, $2, $3, $4)`, model.MakeUUID(), userName, salt, password)
 	if err != nil {
 		return err
 	}
@@ -88,6 +105,50 @@ func initializeDatabase(db *sql.DB) error {
 	return tx.Commit()
 }
 
+func migrateDatabaseV2(db *sql.DB) error {
+	tx, err := db.Begin()
+	if err != nil {
+		return err
+	}
+	defer tx.Rollback()
+
+	_, err = tx.Exec(`PRAGMA user_version = 2`)
+	if err != nil {
+		return err
+	}
+
+	_, err = tx.Exec("CREATE INDEX TimerTokenIndex ON Timer(Token)")
+	if err != nil {
+		return err
+	}
+
+	return tx.Commit()
+}
+
+func initializeDatabase(db *sql.DB) error {
+	initialVersion := 0
+	row := db.QueryRow("PRAGMA user_version")
+	row.Scan(&initialVersion)
+
+	if initialVersion < 1 {
+		log.Println("Initializing DB V1")
+		err := initializeDatabaseV1(db)
+		if err != nil {
+			return err
+		}
+	}
+
+	if initialVersion < 2 {
+		log.Println("Migrating DB to V2")
+		err := migrateDatabaseV2(db)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func queryAllTimers(db *sql.DB, owner model.UUID) []model.Timer {
 	rows, err := db.Query("SELECT Id, Name FROM Timer WHERE Owner=$1", owner)
 	if err != nil {
@@ -135,10 +196,10 @@ func queryTimer(db *sql.DB, idStr string, userId model.UUID) *model.Timer {
 		return nil
 	}
 
-	row := db.QueryRow("SELECT Id, Name, StartTime, EndTime, Owner FROM Timer WHERE Id=$1 AND Owner=$2", id, userId)
+	row := db.QueryRow("SELECT Id, Name, StartTime, EndTime, Owner, Token FROM Timer WHERE Id=$1 AND Owner=$2", id, userId)
 
 	var t model.Timer
-	if err := row.Scan(&t.Id, &t.Name, &t.StartTime, &t.EndTime, &t.Owner); err == nil {
+	if err := row.Scan(&t.Id, &t.Name, &t.StartTime, &t.EndTime, &t.Owner, &t.Token); err == nil {
 		return &t
 	}
 
@@ -372,15 +433,6 @@ func (server *MyServer) handlePutTimer(w http.ResponseWriter, r *http.Request) {
 	view.TimersList(timers, user != nil).Render(context.Background(), w)
 }
 
-func generateSessionId() (string, error) {
-	bin := make([]byte, 64)
-	_, err := rand.Read(bin)
-	if err != nil {
-		return "", err
-	}
-	return base64.StdEncoding.EncodeToString(bin), nil
-}
-
 func (server *MyServer) handlePostLogin(w http.ResponseWriter, r *http.Request) {
 	if server.findCurrentUser(w, r) != nil {
 		w.Header().Add("HX-Redirect", "/")
@@ -433,7 +485,7 @@ func (server *MyServer) handlePostLogout(w http.ResponseWriter, r *http.Request)
 func main() {
 	log.Println("Starting...")
 
-	db, err := sql.Open("sqlite3", ":memory:")
+	db, err := sql.Open("sqlite3", "file:timer.db")
 	if err != nil {
 		log.Fatalln(err)
 	}
diff --git a/view/login.templ b/view/login.templ
index f8ea6e3..3450e01 100644
--- a/view/login.templ
+++ b/view/login.templ
@@ -13,7 +13,7 @@ templ LoginFormError(currentUser *model.User, err string) {
                 <input type="password" name="password" placeholder="Password" />
                 <button type="submit">Sign in</button>
                 if err != "" {
-                    <span style="color:red;">{ err }</span>
+                    <span class="error">{ err }</span>
                 }
             </p>
         </form>
diff --git a/view/login_templ.go b/view/login_templ.go
index db3d53e..0a5c79b 100644
--- a/view/login_templ.go
+++ b/view/login_templ.go
@@ -37,14 +37,14 @@ func LoginFormError(currentUser *model.User, err string) templ.Component {
 				return templ_7745c5c3_Err
 			}
 			if err != "" {
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<span style=\"color:red;\">")
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<span class=\"error\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var2 string
 				templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(err)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\login.templ`, Line: 16, Col: 50}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\login.templ`, Line: 16, Col: 45}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 				if templ_7745c5c3_Err != nil {
diff --git a/view/timers_list.templ b/view/timers_list.templ
index c68979c..3deb7e3 100644
--- a/view/timers_list.templ
+++ b/view/timers_list.templ
@@ -37,11 +37,11 @@ templ TimerCreateForm(timerName string, err string) {
 
 templ TimersList(timers []model.Timer, isSignedIn bool) {
     <div class="timers-list">
-        <h1>Timers</h1>
-        for _, t := range timers {
-            @timer(t)
-        }
         if isSignedIn {
+			<h1>Timers</h1>
+			for _, t := range timers {
+				@timer(t)
+			}
             <h4>Create timer</h4>
             @TimerCreateForm("", "")
         }
diff --git a/view/timers_list_templ.go b/view/timers_list_templ.go
index 007febe..60ce8ac 100644
--- a/view/timers_list_templ.go
+++ b/view/timers_list_templ.go
@@ -147,18 +147,22 @@ func TimersList(timers []model.Timer, isSignedIn bool) templ.Component {
 			templ_7745c5c3_Var8 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"timers-list\"><h1>Timers</h1>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"timers-list\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		for _, t := range timers {
-			templ_7745c5c3_Err = timer(t).Render(ctx, templ_7745c5c3_Buffer)
+		if isSignedIn {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<h1>Timers</h1>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-		}
-		if isSignedIn {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<h4>Create timer</h4>")
+			for _, t := range timers {
+				templ_7745c5c3_Err = timer(t).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" <h4>Create timer</h4>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}