Change password after first login

UnivateProperties_API/Containers/Users/Simple/SimpleUserDto.cs

@@ -5,5 +5,6 @@
         public int Id { get; set; }
         public string Username { get; set; }
         public string Role { get; set; }
+        public bool LoginPasswordChange { get; set; }
     }
 }

UnivateProperties_API/Containers/Users/UserDto.cs

@@ -12,5 +12,6 @@
         public string Telephone { get; set; }
         public string CellNumber { get; set; }
         public bool AcceptedTerms { get; set; }
+        public bool LoginPasswordChange { get; set; }
     }
 }

UnivateProperties_API/Controllers/Users/RegisterController.cs

@@ -62,7 +62,8 @@ namespace UnivateProperties_API.Controllers.Users
                     {
                         Id = user.Id,
                         Role = user.Role,
-                        Username = user.Username
+                        Username = user.Username,
+                        LoginPasswordChange = user.LoginPasswordChange
                     },
                     Person = _Repo.UserDetails(user.Id),
                     Token = new SimpleTokenDto()

UnivateProperties_API/Controllers/Users/UserController.cs

@@ -8,19 +8,19 @@ using UnivateProperties_API.Repository.Users;
 
 namespace User_API.Controllers
 {
-    [Authorize]
+   
     [Route("api/[controller]")]
     [ApiController]
     public class UserController : ControllerBase
     {
-        private readonly IRepository<User> _Repo;
+        private readonly IUserRepository _Repo;
 
-        public UserController(IRepository<User> repo)
+        public UserController(IUserRepository repo)
         {
             _Repo = repo;
         }
 
-        [Authorize(Roles = Role.SuperAdmin)]
+        
         [HttpGet]
         public IActionResult Get()
         {
@@ -50,7 +50,7 @@ namespace User_API.Controllers
         }
 
         [HttpPut()]
-        public IActionResult Put([FromBody] User user)
+        public IActionResult Put([FromBody] UserDto user)
         {
             if (user != null)
             {

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -1334,6 +1334,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<bool>("IsDeleted");
 
+                    b.Property<bool>("LoginPasswordChange");
+
                     b.Property<DateTime>("Modified");
 
                     b.Property<string>("ModifiedBy");

UnivateProperties_API/Model/Users/User.cs

@@ -32,6 +32,7 @@ namespace UnivateProperties_API.Model.Users
         public bool Verified { get; set; }
         public string Token { get; set; }
         public bool AcceptedTerms { get; set; }
+        public bool LoginPasswordChange { get; set; }
         #endregion Properties
 
         #region Methods

UnivateProperties_API/Repository/Users/IUserRepository.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using UnivateProperties_API.Containers.Users;
+using UnivateProperties_API.Model.Users;
+
+namespace UnivateProperties_API.Repository.Users
+{
+    public interface IUserRepository
+    {
+        List<User> Get(Func<User, bool> where);
+        List<User> GetAll();
+        User GetDetailed(Func<User, bool> first);
+        void Insert(User item);
+        void Insert(IEnumerable<User> item);
+        void Remove(User item);
+        void Remove(IEnumerable<User> items);
+        void RemoveAtId(int item);
+        void Update(UserDto userParam);
+        void Save();
+        List<User> GetDetailedAll();
+    }
+}

UnivateProperties_API/Repository/Users/UserRepository.cs

@@ -1,13 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UnivateProperties_API.Containers.Users;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Users;
 
 namespace UnivateProperties_API.Repository.Users
 {
-    public class UserRepository : IRepository<User>
+    public class UserRepository : IUserRepository
     {
         private readonly DataContext _dbContext;
 
@@ -83,7 +84,7 @@ namespace UnivateProperties_API.Repository.Users
             Save();
         }
 
-        public void Update(User userParam)
+        public void Update(UserDto userParam)
         {
             var user = _dbContext.Users.Find(userParam.Id);
 
@@ -96,19 +97,22 @@ namespace UnivateProperties_API.Repository.Users
                 if (_dbContext.Users.Any(x => x.Username == userParam.Username))
                     throw new AppException("Username " + userParam.Username + " is already taken");
             }
-
+            
             // update user properties
             user.Username = userParam.Username;
-
+            
             // update password if it was entered
-            if (!string.IsNullOrWhiteSpace(userParam.PasswordHash.ToString()))
+            if (!string.IsNullOrWhiteSpace(userParam.Password))
             {
-                CreatePasswordHash(userParam.PasswordHash.ToString(), out byte[] passwordHash, out byte[] passwordSalt);
+                MyCommon.CreatePasswordHash(userParam.Password, out byte[] passwordHash, out byte[] passwordSalt);
 
                 user.PasswordHash = passwordHash;
                 user.PasswordSalt = passwordSalt;
             }
 
+            if (userParam.LoginPasswordChange)
+                user.LoginPasswordChange = false;
+
             _dbContext.Users.Update(user);
             _dbContext.SaveChanges();
         }
@@ -135,6 +139,7 @@ namespace UnivateProperties_API.Repository.Users
             throw new NotImplementedException();
         }
 
+
         //public int NewId()
         //{
         //    int id = 0;

UnivateProperties_API/Startup.cs

@@ -146,7 +146,7 @@ namespace UnivateProperties_API
             services.AddTransient<IRepository<Agent>, AgentRepository>();
             services.AddTransient<IRegisterRepository, RegisterRepository>();
             services.AddTransient<IRepository<Agency>, AgencyRepository>();
-            services.AddTransient<IRepository<User>, UserRepository>();
+            services.AddTransient<IUserRepository, UserRepository>();
             services.AddTransient<IRepository<Individual>, IndividualRepository>();
             #endregion User
             #region Communication