Merge develop into ja-117

and resolve conflicts

TutorLizard.BusinessLogic/Data/Repositories/Json/UserJsonRepository.cs

@@ -15,9 +15,9 @@ public UserJsonRepository(IOptions<DataJsonFilePaths> options) : base(options.Va
 
  }
 
- public User CreateUser(string name, UserType type, string email, string passwordHash)
+ public User CreateUser(string name, UserType type, string email, string passwordHash, string googleid)
  {
- User newUser = new(GetNewId(), name, type, email, passwordHash);
+ User newUser = new(GetNewId(), name, type, email, passwordHash, googleid);
  Data.Add(newUser);
  SaveToJson();
 

TutorLizard.BusinessLogic/Interfaces/Data/Repositories/IUserRepository.cs

@@ -5,7 +5,7 @@
 namespace TutorLizard.BusinessLogic.Interfaces.Data.Repositories;
 public interface IUserRepository
 {
- User CreateUser(string name, UserType type, string email, string passwordHash);
+ User CreateUser(string name, UserType type, string email, string passwordHash, string googleId);
  void DeleteUserById(int id);
  List<User> GetAllUsers();
  User? GetUserById(int id);

TutorLizard.BusinessLogic/Interfaces/Services/IUserService.cs

@@ -9,4 +9,7 @@ public interface IUserService
  public Task<LogInResult> LogIn(string username, string password);
  public Task<bool> RegisterUser(string userName, UserType type, string email, string password, string activationCode);
  Task<ActivationResult> ActivateUserAsync(string activationCode);
+ public Task<bool> RegisterUserWithGoogle(string username, string email, string googleId);
+ public Task<bool> IsTheGoogleUserRegistered(string googleId);
+ public Task<UserDto?> LogInWithGoogle(string username, string googleId);
 }

TutorLizard.BusinessLogic/Models/DTOs/UserDto.cs

@@ -23,6 +23,7 @@ public class UserDto
 
  [Display(Name = "Data rejestracji")]
  public DateTime DateCreated { get; set; } = DateTime.Now;
+ public string? GoogleId { get; set; }
 
  public UserDto(User user)
  {
@@ -31,5 +32,6 @@ public UserDto(User user)
  UserType = user.UserType;
  Email = user.Email;
  DateCreated = user.DateCreated;
+ GoogleId = user.GoogleId;
  }
 }

TutorLizard.BusinessLogic/Models/User.cs

@@ -3,7 +3,7 @@
 
 namespace TutorLizard.BusinessLogic.Models;
 
-public class User
+public class User 
 {
  public int Id { get; set; }
  public bool IsActive { get; set; }
@@ -20,21 +20,23 @@ public class User
  [MaxLength(100)]
  public string Email { get; set; }
 
- [Required]
  [DataType(DataType.Password)]
  [MinLength(8)]
  [MaxLength(100)]
- public string PasswordHash { get; set; }
+ public string? PasswordHash { get; set; }
 
  public DateTime DateCreated { get; set; } = DateTime.Now;
 
- public User(int id, string name, UserType userType, string email, string passwordHash)
+ public string? GoogleId { get; set; }
+
+ public User(int id, string name, UserType userType, string email, string passwordHash, string? googleId)
  {
  Id = id;
  Name = name;
  UserType = userType;
  Email = email;
  PasswordHash = passwordHash;
+ GoogleId = googleId;
  }
  public User()
  {

TutorLizard.BusinessLogic/Services/UserService.cs

@@ -18,6 +18,7 @@ public UserService(IDbRepository<User> userRepository)
  {
  _userRepository = userRepository;
  }
+
  public async Task<LogInResult> LogIn(string username, string password)
  {
  var user = await _userRepository.GetAll()
@@ -54,8 +55,25 @@ public async Task<LogInResult> LogIn(string username, string password)
  {
  ResultCode = LogInResultCode.InvalidPassword
  };
+ } 
+
+ public async Task<UserDto?> LogInWithGoogle(string username, string googleId)
+ {
+ var user = await _userRepository.GetAll()
+ .FirstOrDefaultAsync(user => user.GoogleId == googleId);
+
+ if (user == null)
+ {
+ return null;
+ }
+
+ if (user.GoogleId == googleId)
+ return user.ToDto();
+
+ return null;
  }
 
+
  public async Task<bool> RegisterUser(string userName, UserType type, string email, string password, string activationCode)
  {
  if (await _userRepository.GetAll().AnyAsync(user => user.Name == userName))
@@ -78,6 +96,32 @@ public async Task<bool> RegisterUser(string userName, UserType type, string emai
  return true;
  }
 
+ public async Task<bool> RegisterUserWithGoogle(string username, string email, string googleId)
+ {
+ if (await _userRepository.GetAll().AnyAsync(user => user.Name == username))
+ return false;
+
+ User user = new()
+ {
+ Name = username,
+ UserType = UserType.Regular,
+ Email = email,
+ GoogleId = googleId
+ };
+
+ await _userRepository.Create(user);
+
+ return true;
+ }
+
+ public async Task<bool> IsTheGoogleUserRegistered(string googleId)
+ {
+ if (await _userRepository.GetAll().AnyAsync(user => user.GoogleId == googleId)) 
+ return true;
+
+ return false;
+ }
+
  public async Task<ActivationResult> ActivateUserAsync(string activationCode)
  {
 

TutorLizard.Web/Controllers/AccountController.cs

@@ -1,5 +1,10 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Authentication.Google;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using System.Security.Authentication;
+using System.Security.Claims;
 using System.ComponentModel;
 using System.Net;
 using System.Net.Mail;
@@ -11,6 +16,7 @@
 
 
 namespace TutorLizard.Web.Controllers;
+
 public class AccountController : Controller
 {
  private readonly IUserAuthenticationService _userAuthenticationService;
@@ -31,15 +37,76 @@ public IActionResult Index()
  return View();
  }
 
- public IActionResult Login([FromQuery] string? returnUrl)
+ public async Task<IActionResult> Login([FromQuery] string? returnUrl)
  {
  if (returnUrl is not null)
  {
  TempData["returnUrl"] = returnUrl;
  }
+
  return View();
  }
 
+ public async Task GoogleLogin()
+ {
+ await HttpContext.ChallengeAsync(GoogleDefaults.AuthenticationScheme,
+ new AuthenticationProperties
+ {
+ RedirectUri = Url.Action("GoogleResponse"),
+ Items =
+ {
+ { "prompt", "select_account" }
+ }
+ });
+ }
+
+ public async Task<IActionResult> GoogleResponse()
+ {
+ try
+ {
+ var result = await HttpContext.AuthenticateAsync(GoogleDefaults.AuthenticationScheme);
+
+ if (result?.Succeeded != true)
+ {
+ return RedirectToAction("Login");
+ }
+
+ var claims = result.Principal.Identities.FirstOrDefault()?.Claims.ToList();
+
+ var claimNameIdentifier = claims?.FirstOrDefault(x => x.Type == ClaimTypes.NameIdentifier)?.Value;
+ var claimName = claims?.FirstOrDefault(x => x.Type == ClaimTypes.Name)?.Value;
+ var claimEmail = claims?.FirstOrDefault(x => x.Type == ClaimTypes.Email)?.Value;
+
+ if(!(await _userAuthenticationService.IsGoogleUserRegistered(claimNameIdentifier)))
+ {
+ try
+ {
+ await _userAuthenticationService.RegisterUserWithGoogle(claimName, claimEmail, claimNameIdentifier);
+ }
+ catch (Exception ex)
+ {
+ _uiMessagesService.ShowFailureMessage("Rejestracja użytkownika za pomocą konta google się nie powiodła");
+ return RedirectToAction("Login");
+ }
+ }
+
+ var loggedIn = await _userAuthenticationService.LogInWithGoogleAsync(claimName,claimNameIdentifier);
+
+ if (!loggedIn)
+ {
+ _uiMessagesService.ShowFailureMessage("Logowanie nieudane.");
+ return RedirectToAction("Login");
+ }
+
+ return RedirectToAction("Index", "Home");
+ }
+ catch (Exception ex)
+ {
+ _uiMessagesService.ShowFailureMessage("Logowanie nieudane.");
+ return RedirectToAction("Login");
+ }
+ }
+
  [HttpPost]
  [ValidateAntiForgeryToken]
  public async Task<IActionResult> Login(LoginModel model)
@@ -98,6 +165,7 @@ public async Task<IActionResult> Login(LoginModel model)
  public async Task<IActionResult> Logout()
  {
  await _userAuthenticationService.LogOutAsync();
+
  return RedirectToAction("Index", "Home");
  }
  public IActionResult Register()

TutorLizard.Web/Interfaces/Services/IUserAuthenticationService.cs

@@ -8,6 +8,9 @@ public interface IUserAuthenticationService
  int? GetLoggedInUserId();
  Task<Models.DTOs.LogInResult> LogInAsync(string username, string password);
  public Task LogOutAsync();
+ public Task<bool> IsGoogleUserRegistered(string googleid);
+ public Task<bool> RegisterUserWithGoogle(string username, string email, string googleId);
+ public Task<bool> LogInWithGoogleAsync(string username, string googleId);
  Task<(bool, string)> RegisterUser(string username, UserType type, string email, string password);
  void SendActivationEmail(string email, string activationCode);
 }