Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Migrate auth to zerolog

Browse source
This commit is contained in:
Eli Ribble 2025-11-24 19:49:19 +00:00
parent fa43c58607
commit 683c5134df
No known key found for this signature in database
1 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
auth.go
View file

@ -4,7 +4,6 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"log/slog"
"net/http" "net/http"
"strconv" "strconv"
@ -13,6 +12,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/Gleipnir-Technology/nidus-sync/db/models"
"github.com/Gleipnir-Technology/nidus-sync/db/sql" "github.com/Gleipnir-Technology/nidus-sync/db/sql"
"github.com/aarondl/opt/omit" "github.com/aarondl/opt/omit"
"github.com/rs/zerolog/log"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )
@ -79,9 +79,7 @@ func addUserSession(r *http.Request, user *models.User) {
id := strconv.Itoa(int(user.ID)) id := strconv.Itoa(int(user.ID))
sessionManager.Put(r.Context(), "user_id", id) sessionManager.Put(r.Context(), "user_id", id)
sessionManager.Put(r.Context(), "username", user.Username) sessionManager.Put(r.Context(), "username", user.Username)
slog.Info("Created new user session", log.Info().Str("username", user.Username).Str("user_id", id).Msg("Created new user session")
slog.String("username", user.Username),
slog.String("user_id", id))
} }
// Helper function to translate strings into solid error types for operating on // Helper function to translate strings into solid error types for operating on
@ -92,7 +90,7 @@ func findUser(ctx context.Context, user_id int) (*models.User, error) {
return nil, &NoUserError{} return nil, &NoUserError{}
} else { } else {
LogErrorTypeInfo(err) LogErrorTypeInfo(err)
slog.Error("Unrecognized error. This should be updated in the findUser code", slog.String("err", err.Error())) log.Error().Err(err).Msg("Unrecognized error. This should be updated in the findUser code")
return nil, err return nil, err
} }
} }
@ -108,9 +106,7 @@ func getAuthenticatedUser(r *http.Request) (*models.User, error) {
return nil, fmt.Errorf("Failed to convert user_id to int: %w", err) return nil, fmt.Errorf("Failed to convert user_id to int: %w", err)
} }
username := sessionManager.GetString(r.Context(), "username") username := sessionManager.GetString(r.Context(), "username")
slog.Info("Current session info", log.Info().Int("user_id", user_id).Str("username", username).Msg("Current session info")
slog.Int("user_id", user_id),
slog.String("username", username))
if user_id > 0 && username != "" { if user_id > 0 && username != "" {
return findUser(r.Context(), user_id) return findUser(r.Context(), user_id)
} }
@ -160,9 +156,7 @@ func signupUser(username string, name string, password string) (*models.User, er
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to create user: %w", err) return nil, fmt.Errorf("Failed to create user: %w", err)
} }
slog.Info("Created user", log.Info().Int("ID", int(u.ID)).Str("username", u.Username).Msg("Created user")
slog.Int("ID", int(u.ID)),
slog.String("username", u.Username))
return u, nil return u, nil
} }
@ -177,10 +171,7 @@ func validateUser(ctx context.Context, username string, password string) (*model
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to hash password: %w", err) return nil, fmt.Errorf("Failed to hash password: %w", err)
} }
slog.Info("Validating user", log.Info().Str("username", username).Str("password", password).Str("hash", passwordHash).Msg("Validating user")
slog.String("username", username),
slog.String("password", password),
slog.String("hash", passwordHash))
result, err := sql.UserByUsername(username).All(ctx, db.PGInstance.BobDB) result, err := sql.UserByUsername(username).All(ctx, db.PGInstance.BobDB)
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to query for user: %w", err) return nil, fmt.Errorf("Failed to query for user: %w", err)