mirror of
https://github.com/lordmathis/lemma.git
synced 2025-11-05 23:44:22 +00:00
Add logging to app package
This commit is contained in:
@@ -4,13 +4,13 @@ package app
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"log"
|
||||
"time"
|
||||
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
|
||||
"novamd/internal/auth"
|
||||
"novamd/internal/db"
|
||||
"novamd/internal/logging"
|
||||
"novamd/internal/models"
|
||||
"novamd/internal/secrets"
|
||||
"novamd/internal/storage"
|
||||
@@ -18,39 +18,53 @@ import (
|
||||
|
||||
// initSecretsService initializes the secrets service
|
||||
func initSecretsService(cfg *Config) (secrets.Service, error) {
|
||||
logging.Debug("Initializing secrets service")
|
||||
secretsService, err := secrets.NewService(cfg.EncryptionKey)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to initialize secrets service: %w", err)
|
||||
}
|
||||
logging.Debug("Secrets service initialized")
|
||||
return secretsService, nil
|
||||
}
|
||||
|
||||
// initDatabase initializes and migrates the database
|
||||
func initDatabase(cfg *Config, secretsService secrets.Service) (db.Database, error) {
|
||||
logging.Debug("Initializing database", "path", cfg.DBPath)
|
||||
|
||||
database, err := db.Init(cfg.DBPath, secretsService)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to initialize database: %w", err)
|
||||
}
|
||||
|
||||
logging.Debug("Running database migrations")
|
||||
if err := database.Migrate(); err != nil {
|
||||
return nil, fmt.Errorf("failed to apply database migrations: %w", err)
|
||||
}
|
||||
|
||||
logging.Debug("Database initialization complete")
|
||||
return database, nil
|
||||
}
|
||||
|
||||
// initAuth initializes JWT and session services
|
||||
func initAuth(cfg *Config, database db.Database) (auth.JWTManager, auth.SessionManager, auth.CookieManager, error) {
|
||||
logging.Debug("Initializing authentication services")
|
||||
|
||||
// Get or generate JWT signing key
|
||||
signingKey := cfg.JWTSigningKey
|
||||
if signingKey == "" {
|
||||
logging.Debug("No JWT signing key provided, generating new key")
|
||||
var err error
|
||||
signingKey, err = database.EnsureJWTSecret()
|
||||
if err != nil {
|
||||
return nil, nil, nil, fmt.Errorf("failed to ensure JWT secret: %w", err)
|
||||
}
|
||||
logging.Debug("JWT signing key generated")
|
||||
}
|
||||
|
||||
logging.Debug("Initializing JWT service",
|
||||
"accessTokenExpiry", "15m",
|
||||
"refreshTokenExpiry", "168h")
|
||||
|
||||
// Initialize JWT service
|
||||
jwtManager, err := auth.NewJWTService(auth.JWTConfig{
|
||||
SigningKey: signingKey,
|
||||
@@ -62,36 +76,45 @@ func initAuth(cfg *Config, database db.Database) (auth.JWTManager, auth.SessionM
|
||||
}
|
||||
|
||||
// Initialize session service
|
||||
logging.Debug("Initializing session service")
|
||||
sessionManager := auth.NewSessionService(database, jwtManager)
|
||||
|
||||
// Cookie service
|
||||
// Initialize cookie service
|
||||
logging.Debug("Initializing cookie service",
|
||||
"isDevelopment", cfg.IsDevelopment,
|
||||
"domain", cfg.Domain)
|
||||
cookieService := auth.NewCookieService(cfg.IsDevelopment, cfg.Domain)
|
||||
|
||||
logging.Debug("Authentication services initialized")
|
||||
return jwtManager, sessionManager, cookieService, nil
|
||||
}
|
||||
|
||||
// setupAdminUser creates the admin user if it doesn't exist
|
||||
func setupAdminUser(database db.Database, storageManager storage.Manager, cfg *Config) error {
|
||||
adminEmail := cfg.AdminEmail
|
||||
adminPassword := cfg.AdminPassword
|
||||
logging.Debug("Checking for existing admin user", "email", cfg.AdminEmail)
|
||||
|
||||
// Check if admin user exists
|
||||
adminUser, err := database.GetUserByEmail(adminEmail)
|
||||
if adminUser != nil {
|
||||
return nil // Admin user already exists
|
||||
} else if err != sql.ErrNoRows {
|
||||
return err
|
||||
adminUser, err := database.GetUserByEmail(cfg.AdminEmail)
|
||||
if err != nil && err != sql.ErrNoRows {
|
||||
return fmt.Errorf("failed to check for existing admin user: %w", err)
|
||||
}
|
||||
|
||||
if adminUser != nil {
|
||||
logging.Debug("Admin user already exists", "userId", adminUser.ID)
|
||||
return nil
|
||||
}
|
||||
|
||||
logging.Debug("Creating new admin user")
|
||||
|
||||
// Hash the password
|
||||
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(adminPassword), bcrypt.DefaultCost)
|
||||
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(cfg.AdminPassword), bcrypt.DefaultCost)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to hash password: %w", err)
|
||||
return fmt.Errorf("failed to hash admin password: %w", err)
|
||||
}
|
||||
|
||||
// Create admin user
|
||||
adminUser = &models.User{
|
||||
Email: adminEmail,
|
||||
Email: cfg.AdminEmail,
|
||||
DisplayName: "Admin",
|
||||
PasswordHash: string(hashedPassword),
|
||||
Role: models.RoleAdmin,
|
||||
@@ -102,13 +125,23 @@ func setupAdminUser(database db.Database, storageManager storage.Manager, cfg *C
|
||||
return fmt.Errorf("failed to create admin user: %w", err)
|
||||
}
|
||||
|
||||
logging.Debug("Admin user created",
|
||||
"userId", createdUser.ID,
|
||||
"workspaceId", createdUser.LastWorkspaceID)
|
||||
|
||||
// Initialize workspace directory
|
||||
logging.Debug("Initializing admin workspace directory",
|
||||
"userId", createdUser.ID,
|
||||
"workspaceId", createdUser.LastWorkspaceID)
|
||||
|
||||
err = storageManager.InitializeUserWorkspace(createdUser.ID, createdUser.LastWorkspaceID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to initialize admin workspace: %w", err)
|
||||
}
|
||||
|
||||
log.Printf("Created admin user with ID: %d and default workspace with ID: %d", createdUser.ID, createdUser.LastWorkspaceID)
|
||||
logging.Info("Admin user setup completed",
|
||||
"userId", createdUser.ID,
|
||||
"workspaceId", createdUser.LastWorkspaceID)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user