From e0642bea9392f5fdab92f70622e671f9fd7ee0c7 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Fri, 11 Dec 2020 21:30:39 +0200
Subject: Renamed custom Roles class to UserRoles, fixing naming ambiguity

---
 API/Controllers/UserController.cs |  4 ++--
 API/Database/DevHiveContext.cs    |  2 +-
 API/Service/UserService.cs        |  2 +-
 API/Startup.cs                    |  2 +-
 Data/Models/Classes/Roles.cs      |  9 ---------
 Data/Models/Classes/UserRoles.cs  | 10 ++++++++++
 6 files changed, 15 insertions(+), 14 deletions(-)
 delete mode 100644 Data/Models/Classes/Roles.cs
 create mode 100644 Data/Models/Classes/UserRoles.cs

diff --git a/API/Controllers/UserController.cs b/API/Controllers/UserController.cs
index 922119e..187b4e9 100644
--- a/API/Controllers/UserController.cs
+++ b/API/Controllers/UserController.cs
@@ -5,7 +5,7 @@ using AutoMapper;
 using Microsoft.AspNetCore.Mvc;
 using Data.Models.DTOs;
 using Microsoft.AspNetCore.Authorization;
-
+using Data.Models.Classes;
 
 namespace API.Controllers
 {
@@ -39,7 +39,7 @@ namespace API.Controllers
 
 		//Read
 		[HttpGet]
-		[Authorize(Roles = Data.Models.Classes.Roles.Admin)]
+		[Authorize(Roles = UserRoles.Admin)]
 		public async Task<IActionResult> GetById(int id)
 		{
 			return await this._service.GetUserById(id);
diff --git a/API/Database/DevHiveContext.cs b/API/Database/DevHiveContext.cs
index f8ddf83..7cb8f16 100644
--- a/API/Database/DevHiveContext.cs
+++ b/API/Database/DevHiveContext.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Identity;
 
 namespace API.Database
 {
-	public class DevHiveContext : IdentityDbContext<User, Roles, int>
+	public class DevHiveContext : IdentityDbContext<User, UserRoles, int>
 	{
 		public DevHiveContext(DbContextOptions options)
 			: base(options) { }
diff --git a/API/Service/UserService.cs b/API/Service/UserService.cs
index 453e5f4..b715f8c 100644
--- a/API/Service/UserService.cs
+++ b/API/Service/UserService.cs
@@ -60,7 +60,7 @@ namespace API.Service
 			User user = this._userMapper.Map<User>(userDTO);
 
 			if (user.Role == null)
-				user.Role = Roles.User;
+				user.Role = UserRoles.User;
 
 			await this._userDbRepository.AddAsync(user);
 
diff --git a/API/Startup.cs b/API/Startup.cs
index f5aeaad..d9388cf 100644
--- a/API/Startup.cs
+++ b/API/Startup.cs
@@ -35,7 +35,7 @@ namespace API
 			services.AddDbContext<DevHiveContext>(options =>
 				options.UseNpgsql(Configuration.GetConnectionString("DEV")));
 
-			services.AddIdentity<User, Roles>()
+			services.AddIdentity<User, UserRoles>()
 				.AddEntityFrameworkStores<DevHiveContext>();
 
 			services.Configure<IdentityOptions>(options =>
diff --git a/Data/Models/Classes/Roles.cs b/Data/Models/Classes/Roles.cs
deleted file mode 100644
index 1f8c9f2..0000000
--- a/Data/Models/Classes/Roles.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Microsoft.AspNetCore.Identity;
-
-namespace Data.Models.Classes
-{
-	public class Roles : IdentityRole<int>
-	{
-		
-	}
-}
\ No newline at end of file
diff --git a/Data/Models/Classes/UserRoles.cs b/Data/Models/Classes/UserRoles.cs
new file mode 100644
index 0000000..32e9bfd
--- /dev/null
+++ b/Data/Models/Classes/UserRoles.cs
@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Identity;
+
+namespace Data.Models.Classes
+{
+	public class UserRoles : IdentityRole<int>
+	{
+		public const string User = "User";
+		public const string Admin = "Admin";
+	}
+}
-- 
cgit v1.2.3