From 5fc5de8d5f499480fc7d36d00c08b8f8939caf7a Mon Sep 17 00:00:00 2001
From: Xiangkun Liu <xiangkun.liu@wiredcraft.com>
Date: Wed, 9 Mar 2022 00:11:51 +0800
Subject: [PATCH] Sync GitHub OAuth user name to Grafana if it's set (#45438)

---
 pkg/login/social/github_oauth.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/login/social/github_oauth.go b/pkg/login/social/github_oauth.go
index af04f158328..3d160e8e783 100644
--- a/pkg/login/social/github_oauth.go
+++ b/pkg/login/social/github_oauth.go
@@ -182,6 +182,7 @@ func (s *SocialGithub) UserInfo(client *http.Client, token *oauth2.Token) (*Basi
 		Id    int    `json:"id"`
 		Login string `json:"login"`
 		Email string `json:"email"`
+		Name  string `json:"name"`
 	}
 
 	response, err := s.httpGet(client, s.apiUrl)
@@ -208,6 +209,9 @@ func (s *SocialGithub) UserInfo(client *http.Client, token *oauth2.Token) (*Basi
 		Email:  data.Email,
 		Groups: teams,
 	}
+	if data.Name != "" {
+		userInfo.Name = data.Name
+	}
 
 	organizationsUrl := fmt.Sprintf(s.apiUrl + "/orgs")