Switched from using Google+ APIs to using OAuth userinfo (#224)

Fixes #223
SimpleAuthentication · Dec 27, 2018 · 8494a55 · 8494a55
1 parent 43f5011
commit 8494a55
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/Code/SimpleAuthentication.Core/Providers/Google/UserInfoResult.cs b/Code/SimpleAuthentication.Core/Providers/Google/UserInfoResult.cs
@@ -4,13 +4,15 @@ namespace SimpleAuthentication.Core.Providers.Google
 {
     public class UserInfoResult
     {
-        public string Id { get; set; }
-        public List<Email> Emails { get; set; }
-        public string DisplayName { get; set; }
-        public Name Name  { get; set; }
-        public string Url { get; set; }
-        public Image Image { get; set; }
+        public string Sub { get; set; }
+        public string Name { get; set; }
+        public string GivenName { get; set; }
+        public string FamilyName { get; set; }
+        public string Profile { get; set; }
+        public string Picture { get; set; }
+        public string Email { get; set; }
+        public string EmailVerified { get; set; }
         public string Gender { get; set; }
-        public string Language { get; set; }
+        public string Locale { get; set; }
     }
 }
diff --git a/Code/SimpleAuthentication.Core/Providers/GoogleProvider.cs b/Code/SimpleAuthentication.Core/Providers/GoogleProvider.cs
@@ -98,7 +98,7 @@ protected override UserInformation RetrieveUserInformation(AccessToken accessTok
 
             try
             {
-                var restRequest = new RestRequest("/plus/v1/people/me", Method.GET);
+                var restRequest = new RestRequest("/oauth2/v3/userinfo", Method.GET);
                 restRequest.AddParameter(AccessTokenKey, accessToken.PublicToken);
 
                 var restClient = RestClientFactory.CreateRestClient("https://www.googleapis.com");
@@ -135,7 +135,7 @@ protected override UserInformation RetrieveUserInformation(AccessToken accessTok
             }
 
             // Lets check to make sure we have some bare minimum data.
-            if (string.IsNullOrEmpty(response.Data.Id))
+            if (string.IsNullOrEmpty(response.Data.Sub))
             {
                 const string errorMessage =
                     "We were unable to retrieve the User Id from Google API, the user may have denied the authorization.";
@@ -145,20 +145,15 @@ protected override UserInformation RetrieveUserInformation(AccessToken accessTok
 
             return new UserInformation
             {
-                Id = response.Data.Id,
+                Id = response.Data.Sub,
                 Gender = string.IsNullOrEmpty(response.Data.Gender)
                     ? GenderType.Unknown
                     : GenderTypeHelpers.ToGenderType(response.Data.Gender),
                 Name = response.Data.Name.ToString(),
-                Email = response.Data.Emails != null &&
-                        response.Data.Emails.Any()
-                    ? response.Data.Emails.First().Value
-                    : null,
-                Locale = response.Data.Language,
-                Picture = response.Data.Image != null
-                    ? response.Data.Image.Url
-                    : null,
-                UserName = response.Data.DisplayName
+                Email = response.Data.Email,
+                Locale = response.Data.Locale,
+                Picture = response.Data.Picture,
+                UserName = response.Data.Name
             };
         }