Revize 897851f8

Added UserService impl., service registration

Backend/Backend/Controllers/WeatherForecastController.cs

@@ -2 +2 @@
 using Microsoft.AspNetCore.Mvc;
 using Core.Entities;
 using Core.Enums;
+using Core.Services;
 
 namespace Backend.Controllers
 {
@@ -10 +11 @@
     [Route("[controller]")]
     public class WeatherForecastController : ControllerBase
     {
-        private readonly DatabaseContext _databaseContext;
+        private readonly IUserService _userService;
 
         private static readonly string[] Summaries = new[]
         {
@@ -19 +20 @@
 
         private readonly ILogger<WeatherForecastController> _logger;
 
-        public WeatherForecastController(ILogger<WeatherForecastController> logger, DatabaseContext databaseContext)
+        public WeatherForecastController(ILogger<WeatherForecastController> logger, IUserService userService)
         {
             _logger = logger;
-            _databaseContext = databaseContext;
+            _userService = userService;
         }
 
         [HttpGet(Name = "GetWeatherForecast")]
         public IEnumerable<WeatherForecast> Get()
-        {     
+        {
+            /*User? u = _userService.CreateUser("username2", "name", "surname", "password", ERole.ANNOTATOR);
+            u = _userService.UpdateUser(u, "username3");
+            u = _userService.ChangePassword(u, "password2");*/
+            User u = _userService.CheckUsernamePassword("asdfghjkl", "password2");
+
             return Enumerable.Range(1, 5).Select(index => new WeatherForecast
             {
                 Date = DateTime.Now.AddDays(index),

Backend/Backend/Program.cs

@@ -1 +1 @@
 using Core.Contexts;
 using Core.Seeding;
+using Core.Services;
 using Serilog;
 
 
@@ -10 +11 @@
 
 builder.Services.AddControllers();
 
+// Register our services
+Registration.RegisterServices(builder);
+
 // Swagger
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
@@ -40 +44 @@
 // Database seeding
 using (var scope = app.Services.CreateScope())
 {
-    var services = scope.ServiceProvider;
     var context = scope.ServiceProvider.GetService<DatabaseContext>();
 
     // In development we seed dummy data

Backend/Core/Core.csproj

@@ -7 +7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.3">
@@ -14 +15 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Services\" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
   </ItemGroup>
 
 </Project>

Backend/Core/Services/Registration.cs

@@ +1 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Core.Services
+{
+    public class Registration
+    {
+        public static void RegisterServices(WebApplicationBuilder builder)
+        {
+            builder.Services.AddScoped<IUserService, UserServiceEF>();
+        }
+    }
+}

Backend/Core/Services/UserService/IUserService.cs

@@ +1 @@
+using Core.Entities;
+using Core.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Core.Services
+{
+    public interface IUserService
+    {
+        public User? CreateUser(string username, string name, string surname, string password, ERole role);
+        public User? GetUserByUsername(string username);
+        public User? GetUserByGuid(Guid id);
+        public User UpdateUser(User user, string? username = null, string? name = null, string? surname = null, ERole? role = null);
+        public User ChangePassword(User user, string newPassword);
+        public User? CheckUsernamePassword(string username, string password);
+    }
+}

Backend/Core/Services/UserService/UserServiceEF.cs

@@ +1 @@
+using Core.Contexts;
+using Core.Entities;
+using Core.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Serilog;
+using BCrypt.Net;
+
+namespace Core.Services
+{
+    public class UserServiceEF : IUserService
+    {
+        private readonly DatabaseContext _databaseContext;
+        private readonly ILogger _logger;
+
+        public UserServiceEF(DatabaseContext context, ILogger logger)
+        {
+            _databaseContext = context;
+            _logger = logger;
+        }
+
+        public User ChangePassword(User user, string newPassword)
+        {
+            // Check if the user is tracked by EF
+            if (!_databaseContext.Users.Local.Any(u => u.Id == user.Id))
+            {
+                _logger.Information($"User {user.Username} with Guid {user.Id} is untracked by EF and password change cannot be done.");
+                throw new InvalidOperationException("User is untracked by EF.");
+            }
+
+            user.Password = BCrypt.Net.BCrypt.HashPassword(newPassword);
+            _databaseContext.SaveChanges();
+            return user;
+        }
+
+        public User? CheckUsernamePassword(string username, string password)
+        {
+            try
+            {
+                // Throws exception if user does not exist
+                User u = _databaseContext.Users.First(u => u.Username == username);
+                if (!BCrypt.Net.BCrypt.Verify(password, u.Password))
+                {
+                    _logger.Information($"Password for user {username} don't match.");
+                    return null;
+                }
+                return u;
+            }
+            catch (Exception ex)
+            {
+                _logger.Information($"No user with username {username} found.");
+                return null;
+            }
+        }
+
+        public User? CreateUser(string username, string name, string surname, string password, ERole role)
+        {
+            // Check if username already used
+            if (_databaseContext.Users.Any(u => u.Username == username))
+            {
+                _logger.Information($"Username {username} is already used. Cannot create new user");
+                return null;
+            }
+
+            User user = new User() { Username = username, Name = name, Surname = surname, Password = BCrypt.Net.BCrypt.HashPassword(password), Role = role };
+            _databaseContext.Users.Add(user);
+            _databaseContext.SaveChanges();
+            return user;
+        }
+
+        public User? GetUserByUsername(string username)
+        {
+            try
+            {
+                // Throws exception on no user found
+                User user = _databaseContext.Users.First(u => u.Username == username);
+                return user;
+            }
+            catch (InvalidOperationException ex)
+            {
+                _logger.Warning($"No user with the username {username} found.");
+                return null;
+            }
+        }
+
+        public User? GetUserByGuid(Guid id)
+        {
+            try
+            {
+                // Throws exception on no user found
+                User user = _databaseContext.Users.First(u => u.Id == id);
+                return user;
+            }
+            catch (InvalidOperationException ex)
+            {
+                _logger.Warning($"No user with the GUID {id} found.");
+                return null;
+            }
+        }
+
+        public User UpdateUser(User user, string? username = null, string? name = null, string? surname = null, ERole? role = null)
+        {
+            // Check if the user is tracked by EF
+            if (!_databaseContext.Users.Local.Any(u => u.Id == user.Id))
+            {
+                _logger.Information($"User {user.Username} with Guid {user.Id} is untracked by EF and update cannot be done.");
+                throw new InvalidOperationException("User is untracked by EF.");
+            }
+
+            if (username is not null)
+            {
+                user.Username = username;
+            }
+
+            if (name is not null)
+            {
+                user.Name = name;
+            }
+
+            if (surname is not null)
+            {
+                user.Surname = surname;
+            }
+
+            if (role is not null)
+            {
+                // We know it is not null
+                user.Role = (ERole)role;
+            }
+
+            _databaseContext.SaveChanges();
+            return user;
+        }
+    }
+}