From 9346dc469481c7ec07a36700180c7008a2d9cb45 Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Thu, 17 Dec 2020 11:55:52 +0200
Subject: Preparation for Friends implementation

---
 src/DevHive.Data/Models/User.cs                 | 8 +-------
 src/DevHive.Data/Repositories/UserRepository.cs | 2 --
 src/DevHive.Services/Services/UserService.cs    | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/DevHive.Data/Models/User.cs b/src/DevHive.Data/Models/User.cs
index ecd7af8..fd0ee7b 100644
--- a/src/DevHive.Data/Models/User.cs
+++ b/src/DevHive.Data/Models/User.cs
@@ -8,19 +8,13 @@ namespace DevHive.Data.Models
 	[Table("Users")]
 	public class User : IdentityUser<Guid>, IModel
 	{
-		public override string UserName
-		{
-			get => base.UserName;
-			set => base.UserName = value;
-		}
-
 		public string FirstName { get; set; }
 
 		public string LastName { get; set; }
 
 		public string ProfilePicture { get; set; }
 
-		public virtual List<Role> Roles { get; set; }
+		public virtual IList<Role> Roles { get; set; }
 
 		//public List<User> Friends { get; set; }
 	}
diff --git a/src/DevHive.Data/Repositories/UserRepository.cs b/src/DevHive.Data/Repositories/UserRepository.cs
index 1508947..130f96e 100644
--- a/src/DevHive.Data/Repositories/UserRepository.cs
+++ b/src/DevHive.Data/Repositories/UserRepository.cs
@@ -43,8 +43,6 @@ namespace DevHive.Data.Repositories
 			return await this._context
 				.Set<User>()
 				.Include(x => x.Roles)
-				// To also return the roles, you need to include the roles table, 
-				// but then you loose FindAsync, because there is id of role and id of user
 				.FirstOrDefaultAsync(x => x.Id == id);
 		}
 
diff --git a/src/DevHive.Services/Services/UserService.cs b/src/DevHive.Services/Services/UserService.cs
index 4049b4b..bd9eaa6 100644
--- a/src/DevHive.Services/Services/UserService.cs
+++ b/src/DevHive.Services/Services/UserService.cs
@@ -110,7 +110,7 @@ namespace DevHive.Services.Services
 			return string.Join(string.Empty, SHA512.HashData(Encoding.ASCII.GetBytes(password)));
 		}
 
-		private string WriteJWTSecurityToken(List<Role> roles)
+		private string WriteJWTSecurityToken(IList<Role> roles)
 		{
 			byte[] signingKey = Encoding.ASCII.GetBytes(_jwtOptions.Secret);
 
-- 
cgit v1.2.3