diff --git a/src/assets/css/aesthetic.css b/src/assets/css/aesthetic.css
index fc9fcbe..ac039b2 100644
--- a/src/assets/css/aesthetic.css
+++ b/src/assets/css/aesthetic.css
@@ -36,13 +36,13 @@
opacity: 0.9;
}
60% {
- opacity: 1.1;
+ opacity: 0.9;
}
80% {
- opacity: 1;
+ opacity: 0.9;
}
100% {
- opacity: 0.9;
+ opacity: 1;
}
}
@keyframes beam {
diff --git a/src/assets/htmx/personalData.html b/src/assets/htmx/personalData.html
index a31d791..4bd5247 100644
--- a/src/assets/htmx/personalData.html
+++ b/src/assets/htmx/personalData.html
@@ -1 +1,7 @@
-Personal Data Alright
\ No newline at end of file
+
+
+ ID: {{ .id }}
+ Name: {{ .name }}
+ Role: {{ .role }}
+ Plafond: {{ .plafond }}
+
\ No newline at end of file
diff --git a/src/controllers/authentication.go b/src/controllers/authentication.go
index 77fa8a9..0f260c9 100644
--- a/src/controllers/authentication.go
+++ b/src/controllers/authentication.go
@@ -14,7 +14,7 @@ import (
)
var (
- SESSION_INTERVAL = 2 * time.Minute
+ SESSION_INTERVAL = 7 * 24 * time.Hour
)
func getToken(r *http.Request, tokenName string) *http.Cookie {
@@ -38,11 +38,11 @@ func isAuthenticated(r *http.Request) (bool, string) {
return expirationTime.Unix() >= token.Expires.Unix(), token.Value
}
-func createAuthCookie(loginForm models.LoginForm) (*http.Cookie, error) {
+func createAuthCookie(u *models.User) (*http.Cookie, error) {
expirationTime := time.Now().Add(SESSION_INTERVAL)
claims := models.Claims{
RegisteredClaims: jwt.RegisteredClaims{
- Subject: loginForm.Username,
+ Subject: u.Name,
ExpiresAt: jwt.NewNumericDate(expirationTime),
},
}
@@ -72,8 +72,8 @@ func createSessionCookie(token string) *http.Cookie {
return &sessionCookie
}
-func createNewSession(w http.ResponseWriter, loginForm models.LoginForm) {
- authCookie, err := createAuthCookie(loginForm)
+func createNewSession(w http.ResponseWriter, u *models.User) {
+ authCookie, err := createAuthCookie(u)
if err != nil {
log.Printf("Error: %s", err)
return
@@ -84,7 +84,7 @@ func createNewSession(w http.ResponseWriter, loginForm models.LoginForm) {
http.SetCookie(w, sessionCookie)
// Store the auth token in the database
- err = models.StoreAuthToken(authCookie.Value, loginForm.Username, authCookie.Expires.Unix())
+ err = models.StoreAuthToken(authCookie.Value, u.Id, authCookie.Expires.Unix())
if err != nil {
log.Println("Failed to store auth token: ", err)
return
@@ -97,17 +97,16 @@ func createNewSession(w http.ResponseWriter, loginForm models.LoginForm) {
return
}
- log.Printf(`| {"user": %s, "time": %d}`, loginForm.Username, time.Now().Unix())
+ log.Printf(`| {"user": %s, "time": %d}`, u.Name, time.Now().Unix())
w.Header().Add("HX-Redirect", "/editor")
}
-func updateSession(w http.ResponseWriter, loginForm models.LoginForm,
- sessionCookie *http.Cookie) {
+func updateSession(w http.ResponseWriter, u *models.User, sessionCookie *http.Cookie) {
localUserSession := models.GetSession(sessionCookie.Value)
if localUserSession == nil {
// Just create a new session in this case
- createNewSession(w, loginForm)
+ createNewSession(w, u)
return
}
@@ -119,6 +118,8 @@ func updateSession(w http.ResponseWriter, loginForm models.LoginForm,
}
http.SetCookie(w, &cookie)
+ models.UpdateAuthToken(sessionCookie.Value, sessionCookie.Value, expirationTime.Unix())
+
w.Header().Set("HX-Redirect", localUserSession.Wants)
}
@@ -138,6 +139,8 @@ func Authenticate(w http.ResponseWriter, r *http.Request) {
return
}
+ user := models.GetUserDataByName(loginForm.Username)
+
// First check if there is an active session
sessionCookie := getToken(r, "fax-session")
userReqSession := false
@@ -148,10 +151,10 @@ func Authenticate(w http.ResponseWriter, r *http.Request) {
// If there is an active session we update the current session
if userReqSession {
// Update current session
- updateSession(w, loginForm, sessionCookie)
+ updateSession(w, user, sessionCookie)
} else {
// Create a new session
- createNewSession(w, loginForm)
+ createNewSession(w, user)
}
}
diff --git a/src/controllers/personalData.go b/src/controllers/personalData.go
index 4fed63c..bf97453 100644
--- a/src/controllers/personalData.go
+++ b/src/controllers/personalData.go
@@ -1,7 +1,9 @@
package controllers
import (
+ "log"
"net/http"
+ "thermalFax/models"
"thermalFax/views"
)
@@ -12,7 +14,28 @@ func PersonalData(w http.ResponseWriter, r *http.Request) {
return
}
- views.PersonalDataPage(w, r)
+ // COPY
+ authToken := getToken(r, "token")
+ if authToken == nil {
+ log.Fatalln("| controllers | PersonalData | authToken is nil. Shouldn't be")
+ }
+
+ sessionData, err := models.GetAuth(authToken.Value)
+ if err != nil {
+ log.Fatalln("| controllers | PersonalData | failed to retrieve session data: ", err)
+ }
+ if sessionData == nil {
+ log.Fatalln("| controllers | PersonalData | sessionData cannot be nil")
+ }
+
+ user := models.GetUserData(sessionData.User)
+ if user == nil {
+ log.Fatalln("| controllers | PersonalData | user cannot be nil")
+ }
+ log.Println(user)
+ // COPY
+
+ views.PersonalDataPage(w, r, user)
}
func PersonalDataPOST(w http.ResponseWriter, r *http.Request) {
@@ -22,5 +45,26 @@ func PersonalDataPOST(w http.ResponseWriter, r *http.Request) {
return
}
- views.PersonalDataPagePOST(w, r)
+ // COPY
+ authToken := getToken(r, "token")
+ if authToken == nil {
+ log.Fatalln("| controllers | PersonalData | authToken is nil. Shouldn't be")
+ }
+
+ sessionData, err := models.GetAuth(authToken.Value)
+ if err != nil {
+ log.Fatalln("| controllers | PersonalData | failed to retrieve session data: ", err)
+ }
+ if sessionData == nil {
+ log.Fatalln("| controllers | PersonalData | sessionData cannot be nil")
+ }
+
+ user := models.GetUserData(sessionData.User)
+ if user == nil {
+ log.Fatalln("| controllers | PersonalData | user cannot be nil")
+ }
+ log.Println(user)
+ // COPY
+
+ views.PersonalDataPagePOST(w, r, user)
}
diff --git a/src/controllers/sendFax.go b/src/controllers/sendFax.go
index 610deda..6f11b27 100644
--- a/src/controllers/sendFax.go
+++ b/src/controllers/sendFax.go
@@ -81,7 +81,8 @@ func SendFax(w http.ResponseWriter, r *http.Request) {
time.Sleep(3 * time.Second)
session, _ := models.GetAuth(token)
- log.Printf("| User %s requested a fax", session.User)
+ user := models.GetUserData(session.User)
+ log.Printf("| User %s requested a fax", user.Name)
// Parse the data that comes from the "form"
r.ParseForm()
@@ -89,7 +90,7 @@ func SendFax(w http.ResponseWriter, r *http.Request) {
Message: r.FormValue("fax-message"),
}
- msg := signMessage(formData.Message, session.User, time.Now().Format("2006-01-02 15:04:05"))
+ msg := signMessage(formData.Message, user.Name, time.Now().Format("2006-01-02 15:04:05"))
_, err := sendRequestToPrinter(msg)
if err != nil {
log.Println("| Printer failed to process fax:", err)
diff --git a/src/go.mod b/src/go.mod
index bb1ac5f..72cf6ef 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -3,14 +3,19 @@ module thermalFax
go 1.22.2
require (
+ github.com/DATA-DOG/go-sqlmock v1.5.2
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/mattn/go-sqlite3 v1.14.22
github.com/spf13/cobra v1.8.0
+ github.com/stretchr/testify v1.9.0
golang.org/x/crypto v0.22.0
gopkg.in/yaml.v2 v2.4.0
)
require (
+ github.com/davecgh/go-spew v1.1.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/src/go.sum b/src/go.sum
index 625f04f..1ed9513 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,19 +1,29 @@
+github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
+github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/src/main.go b/src/main.go
index 9801fb9..a5ced1d 100644
--- a/src/main.go
+++ b/src/main.go
@@ -9,6 +9,10 @@ This works by calling the root command of cobra-cli.
That will handle the command-line flags we might want to pass.
On that root command we will do the initial setups and then launch the server.
*/
+
+// TODO
+// The GetAuth calls should be optimized to return the user instead of having
+// to perform an extra DB call
func main() {
cmd.Execute()
}
diff --git a/src/models/authentication.go b/src/models/authentication.go
index 25b0379..8d91408 100644
--- a/src/models/authentication.go
+++ b/src/models/authentication.go
@@ -4,7 +4,6 @@ import (
"log"
"net/http"
"strconv"
- "thermalFax/config"
"thermalFax/scache"
"github.com/golang-jwt/jwt/v4"
@@ -27,64 +26,21 @@ type Claims struct {
}
type SessionData struct {
- User string
+ User int
Token string
ExpirationTime int64
}
// Private functions
-
-func openDB() *Database {
- cfg := config.GetInstance("", nil)
-
- var d Database
- err := d.Initialize(cfg.DBPath)
- if err != nil {
- log.Fatal("Failed to get into DB: ", err)
- }
-
- return &d
-}
-
-// getUserPass will return the password (encrypted) of the user that is trying to log in
-func getUserPass(user string) (string, error) {
- d := openDB()
-
- query := `
- SELECT password FROM users WHERE name='` + user + `';
- `
-
- rows, err := d.DB.Query(query)
- if err != nil {
- log.Fatal("Failed to get user data: ", err)
- return "", err
- }
- defer rows.Close()
-
- var p string
- for rows.Next() {
- if err := rows.Scan(&p); err != nil {
- log.Fatal("Failed to read row.", err)
- }
- }
-
- // No password found (user doesn't exist?)
- if len(p) == 0 {
- return "", nil
- }
-
- return p, nil
-}
-
// insertToken will insert the token generated by a successful authentication
-func insertToken(token string, user string, expirationDate int64) error {
- d := openDB()
+func insertToken(token string, user int, expirationDate int64) error {
+ d := OpenDB()
query := `
INSERT INTO
sessions(user, token, expires)
values(
- '` + user + `',
+ '` + strconv.Itoa(user) + `',
'` + token + `',
` + strconv.Itoa(int(expirationDate)) + `
);
@@ -99,9 +55,30 @@ func insertToken(token string, user string, expirationDate int64) error {
return nil
}
+// updateAuthToken will update an old auth token
+func updateAuthToken(old string, new string, expirationDate int64) error {
+ d := OpenDB()
+
+ query := `
+ UPDATE sessions
+ SET
+ token='` + new + `',
+ expires='` + strconv.Itoa(int(expirationDate)) + `'
+ WHERE
+ token='` + old + `';`
+
+ _, err := d.DB.Exec(query)
+ if err != nil {
+ log.Fatal("Failed to insert data: ", err)
+ return err
+ }
+
+ return nil
+}
+
// getSessionData returns the data of a session for a given token
func getSessionData(token string) (*SessionData, error) {
- d := openDB()
+ d := OpenDB()
query := `
SELECT user, token, expires FROM sessions WHERE token='` + token + `';
@@ -109,7 +86,7 @@ func getSessionData(token string) (*SessionData, error) {
rows, err := d.DB.Query(query)
if err != nil {
- log.Fatal("Failed to get user data: ", err)
+ log.Fatal("| getSessionData | Failed to get user data: ", err)
return nil, err
}
defer rows.Close()
@@ -117,10 +94,12 @@ func getSessionData(token string) (*SessionData, error) {
var p SessionData
for rows.Next() {
if err := rows.Scan(&p.User, &p.Token, &p.ExpirationTime); err != nil {
- log.Fatal("Failed to read row.", err)
+ log.Fatal("| getSessionData | Failed to read row.", err)
}
}
+ log.Println("| getSessionData | ", p)
+
// No password found (user doesn't exist?)
if len(p.Token) == 0 {
return nil, nil
@@ -130,7 +109,6 @@ func getSessionData(token string) (*SessionData, error) {
}
// Public functions
-
func ValidateCredentials(lf *LoginForm) bool {
passwd, err := getUserPass(lf.Username)
if err != nil {
@@ -142,12 +120,11 @@ func ValidateCredentials(lf *LoginForm) bool {
return err == nil
}
-func StoreAuthToken(token string, user string, expirationDate int64) error {
- err := insertToken(token, user, expirationDate)
+func StoreAuthToken(token string, u int, expirationDate int64) error {
+ err := insertToken(token, u, expirationDate)
if err != nil {
log.Fatal("Unable to insert token into DB: ", err)
}
-
return nil
}
@@ -166,6 +143,14 @@ func StoreSessionToken(token string) error {
return nil
}
+func UpdateAuthToken(oldToken string, newToken string, expirationDate int64) error {
+ err := updateAuthToken(oldToken, newToken, expirationDate)
+ if err != nil {
+ log.Fatal("Unable to update auth token: ", err)
+ }
+ return nil
+}
+
func GetSession(token string) *scache.Session {
cache := scache.GetInstance()
if session, ok := cache.Data[token]; ok {
diff --git a/src/models/dbAccess.go b/src/models/dbAccess.go
index f21904f..f497336 100644
--- a/src/models/dbAccess.go
+++ b/src/models/dbAccess.go
@@ -2,6 +2,8 @@ package models
import (
"database/sql"
+ "log"
+ "thermalFax/config"
_ "github.com/mattn/go-sqlite3"
)
@@ -11,6 +13,18 @@ type Database struct {
Path string
}
+func OpenDB() *Database {
+ cfg := config.GetInstance("", nil)
+
+ var d Database
+ err := d.Initialize(cfg.DBPath)
+ if err != nil {
+ log.Fatal("Failed to get into DB: ", err)
+ }
+
+ return &d
+}
+
func (s *Database) Initialize(path string) error {
db, err := sql.Open("sqlite3", path)
if err != nil {
diff --git a/src/models/users.go b/src/models/users.go
new file mode 100644
index 0000000..bd51853
--- /dev/null
+++ b/src/models/users.go
@@ -0,0 +1,103 @@
+package models
+
+import (
+ "database/sql"
+ "log"
+ "strconv"
+)
+
+type User struct {
+ Id int
+ Name string
+ Email string
+ Role string
+ Plafond float32
+}
+
+// private
+// getUserPass will return the password (encrypted) of the user that is trying to log in
+func getUserPass(user string) (string, error) {
+ d := OpenDB()
+
+ query := `
+ SELECT password FROM users WHERE name='` + user + `';
+ `
+
+ rows, err := d.DB.Query(query)
+ if err != nil {
+ log.Fatal("Failed to get user data: ", err)
+ return "", err
+ }
+ defer rows.Close()
+
+ var p string
+ for rows.Next() {
+ if err := rows.Scan(&p); err != nil {
+ log.Fatal(" | getUserPass | Failed to read row ->", err)
+ }
+ }
+
+ // No password found (user doesn't exist?)
+ if len(p) == 0 {
+ return "", nil
+ }
+
+ return p, nil
+}
+
+func getUserDataById(db *sql.DB, id int) (*User, error) {
+ query := `
+ SELECT id,name,email,role,plafond FROM users WHERE id='` + strconv.Itoa(id) + `';
+ `
+
+ rows, err := db.Query(query)
+ if err != nil {
+ log.Fatal("| models | getUserDataById | Failed to get user data: ", err)
+ return nil, err
+ }
+ defer rows.Close()
+
+ var user User
+ for rows.Next() {
+ if err := rows.Scan(&user.Id, &user.Name, &user.Email, &user.Role, &user.Plafond); err != nil {
+ log.Fatal("| getUserDataById | Failed to read row.", err)
+ }
+ }
+
+ return &user, nil
+}
+
+func getUserDataByName(db *sql.DB, name string) (*User, error) {
+ query := `
+ SELECT id,name,email,role,plafond FROM users WHERE name='` + name + `';
+ `
+
+ rows, err := db.Query(query)
+ if err != nil {
+ log.Fatal("Failed to get user data: ", err)
+ return nil, err
+ }
+ defer rows.Close()
+
+ var user User
+ for rows.Next() {
+ if err := rows.Scan(&user.Id, &user.Name, &user.Email, &user.Role, &user.Plafond); err != nil {
+ log.Fatal("| getUserDataByName | Failed to read row.", err)
+ }
+ }
+
+ return &user, nil
+}
+
+// public
+func GetUserData(id int) *User {
+ db := OpenDB()
+ data, _ := getUserDataById(db.DB, id)
+ return data
+}
+
+func GetUserDataByName(name string) *User {
+ db := OpenDB()
+ data, _ := getUserDataByName(db.DB, name)
+ return data
+}
diff --git a/src/models/users_test.go b/src/models/users_test.go
new file mode 100644
index 0000000..69e98d7
--- /dev/null
+++ b/src/models/users_test.go
@@ -0,0 +1,45 @@
+package models
+
+import (
+ "strconv"
+ "testing"
+
+ "github.com/DATA-DOG/go-sqlmock"
+ "github.com/stretchr/testify/assert"
+)
+
+func TestGetUser(t *testing.T) {
+ // Create a new sqlmock database connection and mock
+ db, mock, err := sqlmock.New()
+ assert.NoError(t, err)
+ defer db.Close()
+
+ // Define the expected query and result set
+ userID := 3
+ query := `SELECT id,name,email,role,plafond FROM users WHERE id='` + strconv.Itoa(userID) + `';`
+
+ rows := sqlmock.NewRows([]string{"id", "name", "email", "role", "plafond"}).
+ AddRow(userID, "John Doe", "john@example.com", "admin", 1000.0)
+
+ mock.ExpectQuery(query).WillReturnRows(rows)
+
+ // Call the function
+ user, err := getUserDataById(db, userID)
+ assert.NoError(t, err)
+ assert.NotNil(t, user)
+
+ // Assert the returned user
+ expectedUser := &User{
+ Id: userID,
+ Name: "John Doe",
+ Email: "john@example.com",
+ Role: "admin",
+ Plafond: 1000.0,
+ }
+
+ assert.Equal(t, expectedUser, user)
+
+ // Ensure all expectations were met
+ err = mock.ExpectationsWereMet()
+ assert.NoError(t, err)
+}
diff --git a/src/usefulQueries.sql b/src/usefulQueries.sql
index 63d9f87..56c033b 100644
--- a/src/usefulQueries.sql
+++ b/src/usefulQueries.sql
@@ -4,19 +4,24 @@
CREATE TABLE IF NOT EXISTS users(
id INTEGER PRIMARY KEY AUTOINCREMENT,
name TEXT NOT NULL UNIQUE,
+ email TEXT UNIQUE DEFAULT "",
+ role TEXT DEFAULT "USER",
+ plafond REAL DEFAULT 0.0,
password TEXT NOT NULL
);
CREATE TABLE IF NOT EXISTS sessions(
id INTEGER PRIMARY KEY AUTOINCREMENT,
- user TEXT NOT NULL,
+ user INTEGER NOT NULL,
token TEXT NOT NULL,
- expires INTEGER
+ expires INTEGER,
+ FOREIGN KEY (user) REFERENCES users (id)
);
+-- user/pass
INSERT INTO
users(name, password)
values(
'user',
- '$2y$10$E9TqLeXWU85ZVTz7TCyTbu1S.ZaNV6v6DOmrbxqfMm/ADMkBKLP.O'
- );
\ No newline at end of file
+ '$2y$10$.OuBsE7YX0YjZrJuJoSswe1aAa4twXnXeUGtPhPqLBpeh2aCwQejC'
+ );
diff --git a/src/views/personalDataPage.go b/src/views/personalDataPage.go
index c67a13d..3f23d54 100644
--- a/src/views/personalDataPage.go
+++ b/src/views/personalDataPage.go
@@ -1,22 +1,39 @@
package views
-import "net/http"
+import (
+ "net/http"
+ "thermalFax/models"
+)
-func PersonalDataPagePOST(w http.ResponseWriter, r *http.Request) {
+func PersonalDataPagePOST(w http.ResponseWriter, r *http.Request, u *models.User) {
w.WriteHeader(http.StatusOK)
- _, err := w.Write([]byte(HtmlTemplate("./assets/htmx/personalData.html", nil)))
+ userData := map[string]interface{}{
+ "id": u.Id,
+ "name": u.Name,
+ "role": u.Role,
+ "plafond": u.Plafond,
+ }
+
+ _, err := w.Write([]byte(HtmlTemplate("./assets/htmx/personalData.html", userData)))
if err != nil {
http.Error(w, "Internal error", http.StatusInternalServerError)
return
}
}
-func PersonalDataPage(w http.ResponseWriter, r *http.Request) {
+func PersonalDataPage(w http.ResponseWriter, r *http.Request, u *models.User) {
w.WriteHeader(http.StatusOK)
+ userData := map[string]interface{}{
+ "id": u.Id,
+ "name": u.Name,
+ "role": u.Role,
+ "plafond": u.Plafond,
+ }
+
mainPage := HtmlTemplate("./assets/htmx/terminal.html", map[string]interface{}{
- "content": HtmlTemplate("./assets/htmx/personalData.html", nil),
+ "content": HtmlTemplate("./assets/htmx/personalData.html", userData),
"renderNavBar": true,
"page": "personalData",
})
diff --git a/src/views/templating.go b/src/views/templating.go
index 4d0dd77..6a4db8c 100644
--- a/src/views/templating.go
+++ b/src/views/templating.go
@@ -7,25 +7,16 @@ import (
"path"
)
-// func loadFile(path string) []byte {
-// file, err := os.ReadFile(path)
-// if err != nil {
-// log.Printf("Unable to open file: %s\n", path)
-// }
-// return file
-// }
-
func HtmlTemplate(file string, data map[string]interface{}) template.HTML {
+ // Process the given path
templateName := path.Base(file)
tmpl, err := template.New(templateName).ParseFiles(file)
if err != nil {
panic(err)
}
- // Use a bytes.Buffer to store the rendered output
- var renderedOutput bytes.Buffer
-
// Render the template
+ var renderedOutput bytes.Buffer
err = tmpl.ExecuteTemplate(&renderedOutput, templateName, data)
if err != nil {
log.Fatalf("Template execution: %v", err)