UserManager&RoleManager logic moved to Repo; Password hashing and validation moved to Repo and using ASPNET Core hashing methods; Added Migrations; Fixed Roles not added to user

3 files changed, 11 insertions, 11 deletions

diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs
index 84108ae..687e83f 100644
--- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs
+++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs
@@ -60,7 +60,7 @@ namespace DevHive.Web.Configurations.Extensions
 			});
 		}
 
-		public static async Task UseDatabaseConfiguration(this IApplicationBuilder app)
+		public static void UseDatabaseConfiguration(this IApplicationBuilder app)
 		{
 			app.UseHttpsRedirection();
 			app.UseRouting();
@@ -75,21 +75,21 @@ namespace DevHive.Web.Configurations.Extensions
 
 			var roleManager = (RoleManager<Role>)serviceScope.ServiceProvider.GetService(typeof(RoleManager<Role>));
 
-			if (!await dbContext.Roles.AnyAsync(x => x.Name == Role.DefaultRole))
+			if (!dbContext.Roles.Any(x => x.Name == Role.DefaultRole))
 			{
 				Role defaultRole = new() { Name = Role.DefaultRole };
 
-				await roleManager.CreateAsync(defaultRole);
+				roleManager.CreateAsync(defaultRole).Wait();
 			}
 
-			if (!await dbContext.Roles.AnyAsync(x => x.Name == Role.AdminRole))
+			if (!dbContext.Roles.Any(x => x.Name == Role.AdminRole))
 			{
 				Role adminRole = new() { Name = Role.AdminRole };
 
-				await roleManager.CreateAsync(adminRole);
+				roleManager.CreateAsync(adminRole).Wait();
 			}
 
-			await dbContext.SaveChangesAsync();
+			dbContext.SaveChanges();
 		}
 	}
 }
diff --git a/src/Web/DevHive.Web/Controllers/UserController.cs b/src/Web/DevHive.Web/Controllers/UserController.cs
index 25faa8a..214fba7 100644
--- a/src/Web/DevHive.Web/Controllers/UserController.cs
+++ b/src/Web/DevHive.Web/Controllers/UserController.cs
@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using DevHive.Common.Models.Identity;
 using DevHive.Services.Interfaces;
-using Microsoft.Extensions.Hosting;
 
 namespace DevHive.Web.Controllers
 {
@@ -32,8 +31,8 @@ namespace DevHive.Web.Controllers
 		{
 			LoginServiceModel loginServiceModel = this._userMapper.Map<LoginServiceModel>(loginModel);
 
-			TokenModel TokenModel = await this._userService.LoginUser(loginServiceModel);
-			TokenWebModel tokenWebModel = this._userMapper.Map<TokenWebModel>(TokenModel);
+			TokenModel tokenModel = await this._userService.LoginUser(loginServiceModel);
+			TokenWebModel tokenWebModel = this._userMapper.Map<TokenWebModel>(tokenModel);
 
 			return new OkObjectResult(tokenWebModel);
 		}
@@ -45,8 +44,8 @@ namespace DevHive.Web.Controllers
 		{
 			RegisterServiceModel registerServiceModel = this._userMapper.Map<RegisterServiceModel>(registerModel);
 
-			TokenModel TokenModel = await this._userService.RegisterUser(registerServiceModel);
-			TokenWebModel tokenWebModel = this._userMapper.Map<TokenWebModel>(TokenModel);
+			TokenModel tokenModel = await this._userService.RegisterUser(registerServiceModel);
+			TokenWebModel tokenWebModel = this._userMapper.Map<TokenWebModel>(tokenModel);
 
 			return new CreatedResult("Register", tokenWebModel);
 		}
diff --git a/src/Web/DevHive.Web/Startup.cs b/src/Web/DevHive.Web/Startup.cs
index 46521cf..dbcf131 100644
--- a/src/Web/DevHive.Web/Startup.cs
+++ b/src/Web/DevHive.Web/Startup.cs
@@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using DevHive.Web.Configurations.Extensions;
 using Newtonsoft.Json;
+using System.Threading.Tasks;
 
 namespace DevHive.Web
 {