From 04b2290d73139db80ac40ef804aed2d8882ea8c7 Mon Sep 17 00:00:00 2001
From: Stavros <steveiliop56@gmail.com>
Date: Tue, 5 May 2026 18:56:35 +0300
Subject: [PATCH] fix: review comments batch 3

---
 internal/service/oauth_extractors.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/internal/service/oauth_extractors.go b/internal/service/oauth_extractors.go
index 09515e20..96e2a034 100644
--- a/internal/service/oauth_extractors.go
+++ b/internal/service/oauth_extractors.go
@@ -12,8 +12,9 @@ import (
 )
 
 type GithubEmailResponse []struct {
-	Email   string `json:"email"`
-	Primary bool   `json:"primary"`
+	Email    string `json:"email"`
+	Primary  bool   `json:"primary"`
+	Verified bool   `json:"verified"`
 }
 
 type GithubUserInfoResponse struct {
@@ -56,7 +57,16 @@ func githubExtractor(client *http.Client, url string) (*model.Claims, error) {
 
 	// Use first available email if no primary email was found
 	if user.Email == "" {
-		user.Email = (*userEmails)[0].Email
+		for _, email := range *userEmails {
+			if email.Verified {
+				user.Email = email.Email
+				break
+			}
+		}
+	}
+
+	if user.Email == "" {
+		return nil, errors.New("no verified email found")
 	}
 
 	user.PreferredUsername = userInfo.Login