admin/go-socket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add fixes for db and http

Browse Source
This commit is contained in:
Sisi
2026-04-11 13:56:59 +02:00
parent 47c0bcbb0a
commit 1c7d0a691d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database.go
+3 -3
View File
@@ -19,7 +19,7 @@ func DbInit(ctx context.Context) {
panic(err) panic(err)
} }
_, err = dbConn.Exec(ctx, `CREATE EXTENSION IF NOT EXISTS "gen_random_uuid";`) _, err = dbConn.Exec(ctx, `CREATE EXTENSION IF NOT EXISTS "pgcrypto";`)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@@ -116,14 +116,14 @@ func DbUserDelete(ctx context.Context, id uint32) error {
func DbUserGetStandardInfoByName(ctx context.Context, user *User) error { func DbUserGetStandardInfoByName(ctx context.Context, user *User) error {
err := dbConn.QueryRow(ctx, ` err := dbConn.QueryRow(ctx, `
SELECT id, name, pass_hash, pronouns, color_red, color_green, color_blue, created_at FROM users WHERE name = $1 SELECT id, name, pass_hash, COALESCE(pronouns, ''), color_red, color_green, color_blue, created_at FROM users WHERE name = $1
`, user.Name).Scan(&user.Id, &user.Name, &user.PasswordHash, &user.Pronouns, &user.Color[0], &user.Color[1], &user.Color[2], &user.CreatedAt) `, user.Name).Scan(&user.Id, &user.Name, &user.PasswordHash, &user.Pronouns, &user.Color[0], &user.Color[1], &user.Color[2], &user.CreatedAt)
return err return err
} }
func DbUserGetById(ctx context.Context, user *User) error { func DbUserGetById(ctx context.Context, user *User) error {
err := dbConn.QueryRow(ctx, ` err := dbConn.QueryRow(ctx, `
SELECT name, pass_hash, pronouns, color_red, color_green, color_blue, created_at FROM users WHERE id = $1 SELECT name, pass_hash, COALESCE(pronouns, ''), color_red, color_green, color_blue, created_at FROM users WHERE id = $1
`, user.Id).Scan(&user.Name, &user.PasswordHash, &user.Pronouns, &user.Color[0], &user.Color[1], &user.Color[2], &user.CreatedAt) `, user.Id).Scan(&user.Name, &user.PasswordHash, &user.Pronouns, &user.Color[0], &user.Color[1], &user.Color[2], &user.CreatedAt)
return err return err
} }
go-socket
BIN
View File
Binary file not shown.
http.go
+3 -3
View File
@@ -514,7 +514,7 @@ func HttpHandleTokenNew(response http.ResponseWriter, request *http.Request) {
return return
} }
if err = getWholeUserFromDb(ctx, user); err != nil { if err = getWholeUserFromDb(ctx, user); err != nil {
http.Error(response, "internal server error", http.StatusInternalServerError) http.Error(response, err.Error(), http.StatusInternalServerError)
return return
} }
} }
@@ -527,13 +527,13 @@ func HttpHandleTokenNew(response http.ResponseWriter, request *http.Request) {
token, err := TokenCreate(user.Id) token, err := TokenCreate(user.Id)
if err != nil { if err != nil {
http.Error(response, "internal server error", http.StatusInternalServerError) http.Error(response, "internal server error2", http.StatusInternalServerError)
return return
} }
json, err := json2.Marshal(LoginReturn{Token: token, UserId: user.Id}) json, err := json2.Marshal(LoginReturn{Token: token, UserId: user.Id})
if err != nil { if err != nil {
http.Error(response, "internal server error", http.StatusInternalServerError) http.Error(response, "internal server error3", http.StatusInternalServerError)
return return
} }