Merge pull request #19 from barzin144/auth-response

Auth response

Author: barzin144

DataAccess/UserRepository.cs

@@ -65,50 +65,6 @@ public async Task<bool> AddUserTokenByUserIdAsync(string userId, Token token)
 			}
 		}
 
-		public async Task<Token> FindTokenByUserIdAndAccessTokenAsync(string userId, string accessTokenHash)
-		{
-			try
-			{
-				FilterDefinition<User> filter = new FilterDefinitionBuilder<User>().Eq($"{nameof(User.Tokens)}.{nameof(Token.AccessTokenHash)}", accessTokenHash);
-
-				User user = await collection.Find(filter).FirstOrDefaultAsync();
-
-				return user.Tokens.Where(x => x.AccessTokenHash == accessTokenHash).FirstOrDefault();
-			}
-			catch
-			{
-				throw;
-			}
-		}
-
-		public async Task<bool> UpdateUserLastActivityDateAsync(User user)
-		{
-			try
-			{
-				var currentUtc = DateTimeOffset.UtcNow;
-				if (user.LastLoggedIn != null)
-				{
-					var updateLastActivityDate = TimeSpan.FromMinutes(2);
-					var timeElapsed = currentUtc.Subtract(user.LastLoggedIn.Value);
-					if (timeElapsed < updateLastActivityDate)
-					{
-						return true;
-					}
-				}
-
-				FilterDefinition<User> filter = new FilterDefinitionBuilder<User>().Eq(x => x.Id, user.Id);
-				UpdateDefinition<User> update = new UpdateDefinitionBuilder<User>().Set(x => x.LastLoggedIn, currentUtc);
-
-				await collection.UpdateOneAsync(filter, update);
-				return true;
-			}
-			catch
-			{
-
-				throw;
-			}
-		}
-
 		public async Task<bool> DeleteExpiredTokensAsync(string userId)
 		{
 			try

Domain/Entities/User.cs

@@ -17,7 +17,6 @@ public User()
 		public required string ProviderKey { get; set; }
 		public required string Name { get; set; }
 		public bool IsActive { get; set; }
-		public DateTimeOffset? LastLoggedIn { get; set; }
 		public required string SerialNumber { get; set; }
 
 		public ICollection<Role> Roles { get; set; }

Domain/Repositories/IUserRepository.cs

@@ -10,9 +10,7 @@ public interface IUserRepository : IBaseRepository<User>
 		Task<User> FindUserAsync(Expression<Func<User, bool>> filter);
 		Task<bool> DeleteUserTokensByUserIdAsync(string userId);
 		Task<bool> AddUserTokenByUserIdAsync(string userId, Token token);
-		Task<Token> FindTokenByUserIdAndAccessTokenAsync(string userId, string accessTokenHash);
 		Task<(Token token, User user)> FindUserAndTokenByRefreshTokenAsync(string refreshToken);
-		Task<bool> UpdateUserLastActivityDateAsync(User user);
 		Task<bool> DeleteExpiredTokensAsync(string userId);
 		Task<bool> DeleteTokensWithSameRefreshTokenSourceAsync(string refreshTokenIdHashSource, string userId);
 		Task<bool> ChangePassword(string userId, string newPasswordHash, string newSerialNumber);

Service/JwtTokenService.cs

@@ -155,7 +155,7 @@ public string GetRefreshTokenSerial(string refreshTokenValue)
 							RequireExpirationTime = true,
 							ValidateIssuer = false,
 							ValidateAudience = false,
-							IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_jwtOptions.PrivateKey)),
+							IssuerSigningKey = new RsaSecurityKey(_rsa),
 							ValidateIssuerSigningKey = true,
 							ValidateLifetime = true,
 							ClockSkew = TimeSpan.Zero

WebApi/Controllers/AuthController.cs

@@ -54,7 +54,14 @@ public async Task<IActionResult> Login(LoginUserViewModel loginUser)
 
 			await _jwtTokenService.AddUserTokenAsync(user, jwtToken.RefreshTokenSerial, jwtToken.AccessToken, null);
 
-			return Ok(new { accessToken = jwtToken.AccessToken, refreshToken = jwtToken.RefreshToken });
+			return Ok(new AuthResponseViewModel
+			{
+				AccessToken = jwtToken.AccessToken,
+				RefreshToken = jwtToken.RefreshToken,
+				Email = user.Email,
+				Name = user.Name,
+				Provider = user.Provider.ToString()
+			});
 		}
 
 		[HttpPost("register")]
@@ -83,7 +90,14 @@ public async Task<IActionResult> Register(RegisterUserViewModel registerUser)
 
 				await _jwtTokenService.AddUserTokenAsync(newUser, jwtToken.RefreshTokenSerial, jwtToken.AccessToken, null);
 
-				return Ok(new { accessToken = jwtToken.AccessToken, refreshToken = jwtToken.RefreshToken });
+				return Ok(new AuthResponseViewModel
+				{
+					AccessToken = jwtToken.AccessToken,
+					RefreshToken = jwtToken.RefreshToken,
+					Email = newUser.Email,
+					Name = newUser.Name,
+					Provider = newUser.Provider.ToString()
+				});
 			}
 			else
 			{
@@ -169,7 +183,14 @@ public async Task<IActionResult> GoogleCallbackAsync()
 
 				await _jwtTokenService.AddUserTokenAsync(newUser, jwtToken.RefreshTokenSerial, jwtToken.AccessToken, null);
 
-				return Ok(new { accessToken = jwtToken.AccessToken, refreshToken = jwtToken.RefreshToken });
+				return Ok(new AuthResponseViewModel
+				{
+					AccessToken = jwtToken.AccessToken,
+					RefreshToken = jwtToken.RefreshToken,
+					Email = newUser.Email,
+					Name = newUser.Name,
+					Provider = newUser.Provider.ToString()
+				});
 
 			}
 			else
@@ -183,8 +204,14 @@ public async Task<IActionResult> GoogleCallbackAsync()
 
 				await _jwtTokenService.AddUserTokenAsync(user, jwtToken.RefreshTokenSerial, jwtToken.AccessToken, null);
 
-				return Ok(new { accessToken = jwtToken.AccessToken, refreshToken = jwtToken.RefreshToken });
-
+				return Ok(new AuthResponseViewModel
+				{
+					AccessToken = jwtToken.AccessToken,
+					RefreshToken = jwtToken.RefreshToken,
+					Email = user.Email,
+					Name = user.Name,
+					Provider = user.Provider.ToString()
+				});
 			}
 		}
 
@@ -206,7 +233,14 @@ public async Task<IActionResult> RefreshToken([FromBody] RefreshTokenViewModel m
 			var result = _jwtTokenService.CreateJwtTokens(user);
 			await _jwtTokenService.AddUserTokenAsync(user, result.RefreshTokenSerial, result.AccessToken, _jwtTokenService.GetRefreshTokenSerial(refreshToken));
 
-			return Ok(new { access_token = result.AccessToken, refresh_token = result.RefreshToken });
+			return Ok(new AuthResponseViewModel
+			{
+				AccessToken = result.AccessToken,
+				RefreshToken = result.RefreshToken,
+				Email = user.Email,
+				Name = user.Name,
+				Provider = user.Provider.ToString()
+			});
 		}
 
 		[HttpPost("logout")]

WebApi/ViewModels/AuthResponseViewModel.cs

@@ -0,0 +1,10 @@
+namespace WebApi.ViewModels;
+
+public class AuthResponseViewModel
+{
+	public string Name { get; set; }
+	public string Email { get; set; }
+	public string Provider { get; set; }
+	public string AccessToken { get; set; }
+	public string RefreshToken { get; set; }
+}