From 057f6111942d05b8fe64701c6398f7d75ae87568 Mon Sep 17 00:00:00 2001 From: Vinicyus Macedo <7549205+vinicyusmacedo@users.noreply.github.com> Date: Sat, 17 Nov 2018 00:48:54 -0200 Subject: [PATCH 1/3] Added google oauth account id --- pkg/social/google_oauth.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/social/google_oauth.go b/pkg/social/google_oauth.go index e9ab08305f6..91247bfb56f 100644 --- a/pkg/social/google_oauth.go +++ b/pkg/social/google_oauth.go @@ -32,6 +32,7 @@ func (s *SocialGoogle) IsSignupAllowed() bool { func (s *SocialGoogle) UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) { var data struct { + Id int `json:"id"` Name string `json:"name"` Email string `json:"email"` } From 152261413dd4f3287e3417a4c57a76285c2a7587 Mon Sep 17 00:00:00 2001 From: Vinicyus Macedo <7549205+vinicyusmacedo@users.noreply.github.com> Date: Sat, 17 Nov 2018 12:05:06 -0200 Subject: [PATCH 2/3] Added Id to BasicUserInfo returns --- pkg/social/google_oauth.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/social/google_oauth.go b/pkg/social/google_oauth.go index 91247bfb56f..81f19d95faf 100644 --- a/pkg/social/google_oauth.go +++ b/pkg/social/google_oauth.go @@ -48,6 +48,7 @@ func (s *SocialGoogle) UserInfo(client *http.Client, token *oauth2.Token) (*Basi } return &BasicUserInfo{ + Id: fmt.Sprintf("%d", data.Id), Name: data.Name, Email: data.Email, Login: data.Email, From 60fd8ee9d4fa0a2b65762509e7a6c040aebc55ca Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Mon, 19 Nov 2018 11:11:13 +0100 Subject: [PATCH 3/3] fix id returned from google is a string --- pkg/social/google_oauth.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/social/google_oauth.go b/pkg/social/google_oauth.go index 81f19d95faf..05ae2a481f2 100644 --- a/pkg/social/google_oauth.go +++ b/pkg/social/google_oauth.go @@ -32,7 +32,7 @@ func (s *SocialGoogle) IsSignupAllowed() bool { func (s *SocialGoogle) UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) { var data struct { - Id int `json:"id"` + Id string `json:"id"` Name string `json:"name"` Email string `json:"email"` } @@ -48,7 +48,7 @@ func (s *SocialGoogle) UserInfo(client *http.Client, token *oauth2.Token) (*Basi } return &BasicUserInfo{ - Id: fmt.Sprintf("%d", data.Id), + Id: data.Id, Name: data.Name, Email: data.Email, Login: data.Email,