From de2a35905eb3a56df060c424b348177ea1e12ab6 Mon Sep 17 00:00:00 2001 From: Vomitblood Date: Tue, 14 Jan 2025 04:15:32 +0800 Subject: [PATCH] tidy server code --- server/go.mod | 3 ++- server/go.sum | 13 +++++++------ server/internal/db/db.go | 22 +++++----------------- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/server/go.mod b/server/go.mod index 8c95d1c..fcda1ec 100644 --- a/server/go.mod +++ b/server/go.mod @@ -2,10 +2,11 @@ module github.com/Vomitblood/cspj-application/server go 1.23.2 +require github.com/jackc/pgx/v5 v5.7.1 + require ( github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect - github.com/jackc/pgx/v5 v5.7.1 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect golang.org/x/crypto v0.32.0 // indirect golang.org/x/sync v0.10.0 // indirect diff --git a/server/go.sum b/server/go.sum index b293ba4..cb429a5 100644 --- a/server/go.sum +++ b/server/go.sum @@ -1,4 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= @@ -7,21 +9,20 @@ github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs= github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA= github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +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/server/internal/db/db.go b/server/internal/db/db.go index 7847787..88d1369 100644 --- a/server/internal/db/db.go +++ b/server/internal/db/db.go @@ -8,7 +8,6 @@ import ( "net/http" "github.com/jackc/pgx/v5/pgxpool" - "golang.org/x/crypto/bcrypt" ) // db connection info @@ -76,17 +75,6 @@ func DbHealthCheck(w http.ResponseWriter, r *http.Request) { // setup demo db func SetupDemoDb(w http.ResponseWriter, r *http.Request) { - // default password for demo users - defaultPassword := "Password!23" - - // Hash the default password - hashedPassword, err := bcrypt.GenerateFromPassword([]byte(defaultPassword), bcrypt.DefaultCost) - if err != nil { - http.Error(w, "Error hashing password", http.StatusInternalServerError) - log.Printf("Error hashing password: %v", err) - return - } - // create table and insert demo data createTableSQL := ` CREATE TABLE IF NOT EXISTS users ( @@ -99,13 +87,13 @@ func SetupDemoDb(w http.ResponseWriter, r *http.Request) { // avoid duplicate entries and specify roles insertDataSQL := ` INSERT INTO users (email, password, role) VALUES - ('alice@example.com', $1, 'user'), - ('bob@example.com', $2, 'user'), - ('charlie@example.com', $3, 'admin') + ('alice@example.com', 'asdfalicepassword', 'user'), + ('bob@example.com', 'asdfbobpassword', 'user'), + ('charlie@example.com', 'asdfcharliepassword', 'admin') ` // execute create table - _, err = DbPool.Exec(context.Background(), createTableSQL) + _, err := DbPool.Exec(context.Background(), createTableSQL) if err != nil { http.Error(w, "Failed to create table", http.StatusInternalServerError) log.Printf("Error creating table: %v", err) @@ -113,7 +101,7 @@ func SetupDemoDb(w http.ResponseWriter, r *http.Request) { } // execute insert demo data - _, err = DbPool.Exec(context.Background(), insertDataSQL, hashedPassword, hashedPassword, hashedPassword) + _, err = DbPool.Exec(context.Background(), insertDataSQL) if err != nil { http.Error(w, "Failed to insert demo data", http.StatusInternalServerError) log.Printf("Error inserting demo data: %v", err)