From c02badcafc16ed80f7961dddb80eed28cb2b8eb2 Mon Sep 17 00:00:00 2001 From: valitovgaziz Date: Sun, 5 Oct 2025 02:12:58 +0500 Subject: [PATCH] modified: yalarba/serv_golang_rest_api/internal/handlers/oauth_yandex.go change userinfo.DefaultEmail to userinfo.Email into h.findeOrCreateOUuthUser function --- .../internal/handlers/oauth_yandex.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/yalarba/serv_golang_rest_api/internal/handlers/oauth_yandex.go b/yalarba/serv_golang_rest_api/internal/handlers/oauth_yandex.go index 2b673d3..83aa6e3 100644 --- a/yalarba/serv_golang_rest_api/internal/handlers/oauth_yandex.go +++ b/yalarba/serv_golang_rest_api/internal/handlers/oauth_yandex.go @@ -11,15 +11,14 @@ import ( ) type YandexUserInfo struct { - ID string `json:"id"` - Login string `json:"login"` - Email string `json:"default_email"` - DisplayName string `json:"display_name"` - FirstName string `json:"first_name"` - LastName string `json:"last_name"` - RealName string `json:"real_name"` - DefaultEmail string `json:"default_email"` - IsAvatarEmpty bool `json:"is_avatar_empty"` + ID string `json:"id"` + Login string `json:"login"` + Email string `json:"default_email"` + DisplayName string `json:"display_name"` + FirstName string `json:"first_name"` + LastName string `json:"last_name"` + RealName string `json:"real_name"` + IsAvatarEmpty bool `json:"is_avatar_empty"` } // YandexLogin initiates Yandex OAuth flow @@ -64,7 +63,7 @@ func (h *OAuthHandler) YandexCallback(w http.ResponseWriter, r *http.Request) { name := h.getYandexUserName(userInfo) // Создаем или находим пользователя - user, err := h.findOrCreateOAuthUser("yandex", userInfo.ID, userInfo.DefaultEmail, name, token) + user, err := h.findOrCreateOAuthUser("yandex", userInfo.ID, userInfo.Email, name, token) if err != nil { utils.WriteError(w, http.StatusInternalServerError, "Error processing user: "+err.Error()) return