Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivatePropertiesAPI

UnivateProperties_API/Controllers/Users/RegisterController.cs

@@ -43,7 +43,6 @@ namespace UnivateProperties_API.Controllers.Users
         {
             var user = _Repo.Authenticate(userDto.Username, userDto.Password);
 
-            //HttpResponseMessage response = Request.CreateResponse(HttpStatusCode.Unauthorized, "value");
 
             if (user == null)
                 return BadRequest(new { message = "Username or password is incorrect" });
@@ -55,7 +54,7 @@ namespace UnivateProperties_API.Controllers.Users
                 Subject = new ClaimsIdentity(new Claim[]
                 {
                     new Claim(ClaimTypes.Name, user.Id.ToString()),
-                    //new Claim(ClaimTypes.Role, user.Role)
+                    new Claim(ClaimTypes.Role, user.Role)
                 }),
                 Expires = DateTime.UtcNow.AddMinutes(15),
                 SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)

UnivateProperties_API/Controllers/Users/UserController.cs

@@ -1,13 +1,14 @@
 using System.Transactions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using UnivateProperties_API.Containers.Users;
 using UnivateProperties_API.Model.Users;
 using UnivateProperties_API.Repository;
 using UnivateProperties_API.Repository.Users;
 
 namespace User_API.Controllers
 {
-    //[Authorize]
+    [Authorize]
     [Route("api/[controller]")]
     [ApiController]
     public class UserController : ControllerBase
@@ -19,6 +20,7 @@ namespace User_API.Controllers
             _Repo = repo;
         }
 
+        [Authorize(Roles = Role.SuperAdmin)]
         [HttpGet]
         public IActionResult Get()
         {
@@ -28,6 +30,11 @@ namespace User_API.Controllers
         [HttpGet("{id}")]
         public IActionResult Get(int id)
         {
+            var currentUserId = int.Parse(User.Identity.Name);
+            if (id != currentUserId && !User.IsInRole(Role.SuperAdmin))
+            {
+                return Forbid();
+            }
             return new OkObjectResult(_Repo.Get(x => x.Id == id));
         }
 

UnivateProperties_API/Repository/Users/AgentRepository.cs

@@ -24,7 +24,7 @@ namespace UnivateProperties_API.Repository.Users
 
         public List<Agent> GetAll()
         {
-            return _dbContext.Agents.ToList();
+            return _dbContext.Agents.Include("User").ToList();
         }
 
         public Agent GetDetailed(Func<Agent, bool> first)

UnivateProperties_API/Repository/Users/IndividualRepository.cs

@@ -18,12 +18,12 @@ namespace UnivateProperties_API.Repository.Users
 
         public List<Individual> Get(Func<Individual, bool> where)
         {
-            return _dbContext.Individuals.Where(where).ToList();
+            return _dbContext.Individuals.Include("User").Where(where).ToList();
         }
 
         public List<Individual> GetAll()
         {
-            return _dbContext.Individuals.ToList();
+            return _dbContext.Individuals.Include("User").ToList();
         }
 
         public Individual GetDetailed(Func<Individual, bool> first)

UnivateProperties_API/Repository/Users/RegisterRepository.cs

@@ -109,7 +109,7 @@ namespace UnivateProperties_API.Repository.Users
 
             User createUser = new User(individual.Username, individual.Password);
 
-            Create(createUser, individual.Password, save);
+            Create(createUser, individual.Password, false);
 
             if (personType == PersonType.Agent)
             {
@@ -144,6 +144,22 @@ namespace UnivateProperties_API.Repository.Users
             }
         }
 
+        //public void InsertPerson(UserDto item)
+        //{
+        //    Individual i = new Individual()
+        //    {
+        //        Name = item.Name,
+        //        Surname = item.Surname,
+        //        User = new User(item.Username, item.Password),
+        //        Email = item.Email,
+        //        CellNumber = item.CellNumber,
+        //        Telephone = item.Telephone
+        //    };
+
+        //    _dbContext.Add(i);
+        //    Save();
+        //}
+
         public void Update(User userParam, string password = null)
         {
             var user = _dbContext.Users.Find(userParam.Id);