Changed model for google login call

Diligent.WebAPI.Business/Services/Interfaces/IUserService.cs

@@ -3,7 +3,7 @@
     public interface IUserService
     {
         Task<ServiceResponseDTO<AuthenticateResponseDto>> Authenticate(AuthenticateRequestDto model);
-        Task<ServiceResponseDTO<AuthenticateResponseDto>> Authenticate(GoogleApiTokenInfo email);
+        Task<ServiceResponseDTO<AuthenticateResponseDto>> Authenticate(GoogleApiModel model);
 
         Task<RefreshTokenResultDto> RefreshTokenAsync(RefreshTokenRequestDto model);
 

Diligent.WebAPI.Business/Services/UserService.cs

@@ -106,9 +106,10 @@ namespace Diligent.WebAPI.Business.Services
             return await GenerateToken(user);
         }
         
-        public async Task<ServiceResponseDTO<AuthenticateResponseDto>> Authenticate(GoogleApiTokenInfo model)
+        public async Task<ServiceResponseDTO<AuthenticateResponseDto>> Authenticate(GoogleApiModel model)
         {
-            if (!IsTokenValid(JsonConvert.SerializeObject(model)))
+            
+            if (!IsTokenValid(model.Token))
             {
                 return new ServiceResponseDTO<AuthenticateResponseDto>
                 {
@@ -116,7 +117,7 @@ namespace Diligent.WebAPI.Business.Services
                     ErrorMessage = "Invalid Google Api Token"
                 };
             }
-            var user = await _userManager.FindByEmailAsync(model.email);
+            var user = await _userManager.FindByEmailAsync(model.User.email);
 
             // return null if user not found
             if (user == null)
@@ -124,7 +125,7 @@ namespace Diligent.WebAPI.Business.Services
                 return new ServiceResponseDTO<AuthenticateResponseDto>
                 {
                     IsError = true,
-                    ErrorMessage = $"User with email {model.email} does not exist in database"
+                    ErrorMessage = $"User with email {model.User.email} does not exist in database"
                 };
             }
 

Diligent.WebAPI.Contracts/Models/GoogleApiModel.cs

@@ -0,0 +1,8 @@
+namespace Diligent.WebAPI.Contracts.Models
+{
+    public class GoogleApiModel
+    {
+        public GoogleApiTokenInfo User { get; set; }
+        public string Token { get; set; }
+    }
+}

Diligent.WebAPI.Contracts/Models/GoogleApiTokenInfo.cs

@@ -5,51 +5,51 @@
         /// <summary>
         /// The Issuer Identifier for the Issuer of the response. Always https://accounts.google.com or accounts.google.com for Google ID tokens.
         /// </summary>
-        public string iss { get; set; }
+        public string? iss { get; set; }
 
         /// <summary>
         /// Access token hash. Provides validation that the access token is tied to the identity token. If the ID token is issued with an access token in the server flow, this is always
         /// included. This can be used as an alternate mechanism to protect against cross-site request forgery attacks, but if you follow Step 1 and Step 3 it is not necessary to verify the 
         /// access token.
         /// </summary>
-        public string at_hash { get; set; }
+        public string? at_hash { get; set; }
 
         /// <summary>
         /// Identifies the audience that this ID token is intended for. It must be one of the OAuth 2.0 client IDs of your application.
         /// </summary>
-        public string aud { get; set; }
+        public string? aud { get; set; }
 
         /// <summary>
         /// An identifier for the user, unique among all Google accounts and never reused. A Google account can have multiple emails at different points in time, but the sub value is never
         /// changed. Use sub within your application as the unique-identifier key for the user.
         /// </summary>
-        public string sub { get; set; }
+        public string? sub { get; set; }
 
         /// <summary>
         /// True if the user's e-mail address has been verified; otherwise false.
         /// </summary>
-        public string email_verified { get; set; }
+        public bool? email_verified { get; set; }
 
         /// <summary>
         /// The client_id of the authorized presenter. This claim is only needed when the party requesting the ID token is not the same as the audience of the ID token. This may be the
         /// case at Google for hybrid apps where a web application and Android app have a different client_id but share the same project.
         /// </summary>
-        public string azp { get; set; }
+        public string? azp { get; set; }
 
         /// <summary>
         /// The user's email address. This may not be unique and is not suitable for use as a primary key. Provided only if your scope included the string "email".
         /// </summary>
-        public string email { get; set; }
+        public string? email { get; set; }
 
         /// <summary>
         /// The time the ID token was issued, represented in Unix time (integer seconds).
         /// </summary>
-        public string iat { get; set; }
+        public int? iat { get; set; }
 
         /// <summary>
         /// The time the ID token expires, represented in Unix time (integer seconds).
         /// </summary>
-        public string exp { get; set; }
+        public int? exp { get; set; }
 
         /// <summary>
         /// The user's full name, in a displayable form. Might be provided when:
@@ -57,7 +57,7 @@
         /// The ID token is returned from a token refresh
         /// When name claims are present, you can use them to update your app's user records. Note that this claim is never guaranteed to be present.
         /// </summary>
-        public string name { get; set; }
+        public string? name { get; set; }
 
         /// <summary>
         /// The URL of the user's profile picture. Might be provided when:
@@ -65,16 +65,16 @@
         /// The ID token is returned from a token refresh
         /// When picture claims are present, you can use them to update your app's user records. Note that this claim is never guaranteed to be present.
         /// </summary>
-        public string picture { get; set; }
+        public string? picture { get; set; }
 
-        public string given_name { get; set; }
+        public string? given_name { get; set; }
 
-        public string family_name { get; set; }
+        public string? family_name { get; set; }
 
-        public string locale { get; set; }
+        public string? locale { get; set; }
 
-        public string alg { get; set; }
+        public string? alg { get; set; }
 
-        public string kid { get; set; }
+        public string? kid { get; set; }
     }
 }

Diligent.WebAPI.Host/Controllers/V1/UsersController.cs

@@ -52,7 +52,7 @@
         }
 
         [HttpPost("authenticateGoogle")]
-        public async Task<IActionResult> GoogleLogin([FromBody] GoogleApiTokenInfo model)
+        public async Task<IActionResult> GoogleLogin(GoogleApiModel model)
         {
             var response = await _userService.Authenticate(model);