Skip to content

Commit e3ef285

Browse files
authored
Merge pull request #6 from cuappdev/deployment-fix
Added logging and error handling to auth
2 parents f7b273f + f919a1b commit e3ef285

3 files changed

Lines changed: 31 additions & 4 deletions

File tree

auth/jwt.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ type JWTService struct {
2727
func NewJWTService() *JWTService {
2828
secret := os.Getenv("JWT_SECRET")
2929
if secret == "" {
30-
secret = "default-secret-key-change-in-production" // Fallback for development
30+
log.Println("[WARN] JWT_SECRET environment variable not set! Using default value.")
31+
secret = "default-secret-key-change-in-production"
3132
}
3233
return &JWTService{
3334
secretKey: []byte(secret),

main.go

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,34 @@ func main() {
2020
log.Println("Starting hustle-backend...")
2121
r := gin.Default()
2222
log.Println("Connecting to database...")
23-
models.ConnectDatabase()
23+
// Connect to DB
24+
if err := models.ConnectDatabase(); err != nil {
25+
log.Printf("[FATAL] Database connection failed: %v", err)
26+
os.Exit(1)
27+
}
28+
29+
func getwdSafe() string {
30+
wd, err := os.Getwd()
31+
if err != nil {
32+
return "unknown"
33+
}
34+
return wd
35+
}
36+
37+
// Initialize Firebase Auth SAFELY
38+
serviceAccountPath := "service-account-key.json"
39+
// Log working dir and check file exists
40+
if _, err := os.Stat(serviceAccountPath); err != nil {
41+
log.Printf("[FATAL] Missing service account file: %s (cwd: %s): %v", serviceAccountPath, getwdSafe(), err)
42+
os.Exit(1)
43+
}
44+
ac, err := auth.NewAuthClient(context.Background(), serviceAccountPath)
45+
if err != nil {
46+
log.Printf("[FATAL] Firebase init failed: %v", err)
47+
os.Exit(1)
48+
}
2449

25-
ac, err := auth.NewAuthClient(context.Background(), "service-account-key.json")
26-
if err != nil { log.Fatalf("firebase init: %v", err) }
50+
2751

2852
log.Println("Setting up routes...")
2953
// Public routes

models/users.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ func FindOrCreateUser(firebaseUID, email, firstName, lastName string) (*User, er
2525
result := DB.Where("firebase_uid = ?", firebaseUID).First(&user)
2626

2727
if result.Error != nil {
28+
log.Printf("[ERROR] User not found by Firebase UID (%s): %v", firebaseUID, result.Error)
2829
// User doesn't exist, create new one
2930
user = User{
3031
Firebase_UID: firebaseUID,
@@ -34,6 +35,7 @@ func FindOrCreateUser(firebaseUID, email, firstName, lastName string) (*User, er
3435
}
3536

3637
if err := DB.Create(&user).Error; err != nil {
38+
log.Printf("[ERROR] Failed to create user (Firebase UID: %s): %v", firebaseUID, err)
3739
return nil, err
3840
}
3941
}

0 commit comments

Comments
 (0)