Adding_Typescript

.gitignore

@@ -44,4 +44,5 @@ ICareAPI/.history
 ICareAPI/ICareApi.code-workspace
 TODO.md
 icare.code-workspace
+ICareClient/.vscode/launch.json
 ICareClient/.vscode

ICareAPI/Controllers/AuthController.cs

@@ -8,13 +8,14 @@
 using Microsoft.IdentityModel.Tokens;
 using ICareAPI.Repositories;
 using ICareAPI.Dtos;
-using ICareAPI.Helpers;
 using ICareAPI.Models;
+using Microsoft.AspNetCore.Authorization;
 
 namespace ICareAPI.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
+    [AllowAnonymous]
     public class AuthController : ControllerBase
     {
 
@@ -34,61 +35,34 @@ public AuthController(IAuthRepository repo, IConfiguration config)
         public async Task<IActionResult> Register(UserForRegisterDto userForRegisterDto)
         {
 
-            userForRegisterDto.Email = userForRegisterDto.Email.ToLower();
 
-            if (await _repo.EmailExists(userForRegisterDto.Email))
+            var newUser = new User
             {
-                return BadRequest("User Already Exists");
-            }
-            else
-            {
-                var newUser = new User
-                {
-                    Email = userForRegisterDto.Email,
-                    UserName = userForRegisterDto.UserName
-                };
+                Email = userForRegisterDto.Email,
+                UserName = userForRegisterDto.UserName
+            };
 
 
-                var createdUser = await _repo.Register(newUser, userForRegisterDto.Password);
-                return StatusCode(201);
-            }
+            var reg = await _repo.Register(newUser, userForRegisterDto.Password);
+            return StatusCode(201);
         }
 
 
         [HttpPost("login")]
         public async Task<IActionResult> Login(UserForLoginDto userForLoginDto)
         {
-            var userFromRepo = await _repo.Login(userForLoginDto.Email.ToLower(), userForLoginDto.Password);
+            var user = await _repo.Login(userForLoginDto.Email.ToLower(), userForLoginDto.Password);
 
-            if (userFromRepo == null)
+            if (user is null)
             {
-                return Unauthorized("Email Or Password Is Wrong");
+                return Unauthorized();
             }
             else
             {
 
-                var claims = new[] {
-                    new Claim(ClaimTypes.NameIdentifier, userFromRepo.Id.ToString()),
-                    new Claim(ClaimTypes.Name, userFromRepo.UserName),
-                };
-
-
-                var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_config.GetSection("AppSettings:Token").Value));
-
-                var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha512Signature);
-
-                var tokenDecriptor = new SecurityTokenDescriptor
-                {
-                    Subject = new ClaimsIdentity(claims),
-                    Expires = DateTime.Now.AddDays(1),
-                    SigningCredentials = creds
-                };
-
-                var tokenHandler = new JwtSecurityTokenHandler();
-
-                var token = tokenHandler.CreateToken(tokenDecriptor);
+                var token = _repo.GenerateUserToken(user);
 
-                return Ok(new { token = tokenHandler.WriteToken(token), Expires = DateTime.Now.AddDays(1) });
+                return Ok(token);
             }
         }
 

ICareAPI/Controllers/BaseController.cs

@@ -0,0 +1,15 @@
+using ICareAPI.Helpers;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ICareAPI.Controllers
+{
+    [Authorize]
+    [Route("api/[controller]")]
+    [ApiController]
+    [ServiceFilter(typeof(LogUserActivity))]
+    public class BaseController : ControllerBase
+    {
+
+    }
+}

ICareAPI/Controllers/DoctorController.cs

@@ -10,12 +10,8 @@
 
 namespace ICareAPI.Controllers
 {
-    [Route("api/doctors")]
-    [ApiController]
-    [Authorize]
-    [ServiceFilter(typeof(LogUserActivity))]
 
-    public class DoctorsController : ControllerBase
+    public class DoctorsController : BaseController
     {
         private readonly IDoctorRepository _repo;
         private readonly IPatientDoctorRepository _patientDoctorRepo;
@@ -41,7 +37,7 @@ IPatientRepository patientRepository
         public async Task<IActionResult> GetDoctors([FromQuery] PaginationParams paginationParams)
         {
 
-            var doctors = await _repo.GetDoctorsList(paginationParams);
+            var doctors = await _repo.GetDoctorsListAsync(paginationParams);
 
             HttpContext.Response.AddPagination(doctors.CurrnetPage, doctors.PageSize, doctors.TotalCount, doctors.TotalPages);
 
@@ -51,10 +47,10 @@ public async Task<IActionResult> GetDoctors([FromQuery] PaginationParams paginat
 
         // GET api/doctor/5
         [HttpGet("{id}")]
-        public async Task<IActionResult> GetDoctorById(int id, bool withAssignedPatients = false)
+        public async Task<IActionResult> GetDoctorById(int id)
         {
 
-            var doctor = await _repo.GetDoctor(id);
+            var doctor = await _repo.GetDoctorAsync(id);
 
             return Ok(doctor);
 
@@ -69,7 +65,7 @@ public async Task<IActionResult> AddDoctor(DoctorForAddDto doctor)
             if (ModelState.IsValid)
             {
 
-                var addedDoctor = await _repo.AddDoctor(_mapper.Map<Doctor>(doctor));
+                var addedDoctor = await _repo.AddDoctorAsync(_mapper.Map<Doctor>(doctor));
                 return Ok(addedDoctor);
             }
             else
@@ -93,7 +89,7 @@ public async Task<IActionResult> AddDoctor(DoctorForAddDto doctor)
         public async Task<ActionResult> DeleteDoctor(int id)
         {
 
-            var deleted = await _repo.DeleteDoctor(id);
+            var deleted = await _repo.DeleteDoctorAsync(id);
 
             return Ok(deleted);
         }
@@ -116,7 +112,7 @@ public async Task<ActionResult> GetAssignedPatients(int id, [FromQuery] Paginati
         public async Task<ActionResult> GetUnAssignedPatients(int doctorId, [FromQuery] PaginationParams paginationParams)
         {
 
-            var unAssignedPatients = await _patientRepository.GetUnAssignedPatientsToDoctor(doctorId, paginationParams);
+            var unAssignedPatients = await _patientRepository.GetUnAssignedPatientsToDoctorAsync(doctorId, paginationParams);
 
             HttpContext.Response.AddPagination(unAssignedPatients.CurrnetPage, unAssignedPatients.PageSize, unAssignedPatients.TotalCount, unAssignedPatients.TotalPages);
 
@@ -153,11 +149,11 @@ public async Task<IActionResult> RemovePatientDoctor(int doctorId, int patientId
         public async Task<ActionResult> EditDoctor(DoctorForEditDto doctorForEdit)
         {
 
-            var doctor = await _repo.GetDoctor(doctorForEdit.Id);
+            var doctor = await _repo.GetDoctorAsync(doctorForEdit.Id);
 
             var mappedDoctor = _mapper.Map<DoctorForEditDto, Doctor>(doctorForEdit, doctor);
 
-            return Ok(await _repo.EditDoctor(mappedDoctor));
+            return Ok(await _repo.EditDoctorAsync(mappedDoctor));
 
         }
 

ICareAPI/Controllers/PatientsController.cs

@@ -13,11 +13,7 @@
 namespace ICareAPI.Controllers
 
 {
-    [ServiceFilter(typeof(LogUserActivity))]
-    [Authorize]
-    [Route("api/patients")]
-    [ApiController]
-    public class PatientsController : ControllerBase
+    public class PatientsController : BaseController
     {
         private readonly IPatientRepository _repo;
         private readonly IMapper _mapper;
@@ -33,7 +29,7 @@ public PatientsController(IPatientRepository repo, IMapper mapper, IPatientDocto
         [HttpGet]
         public async Task<IActionResult> Patients(bool? withRecords, [FromQuery] PaginationParams paginationParams)
         {
-            var pations = await _repo.GetPatients(true, paginationParams);
+            var pations = await _repo.GetPatientsAsync(true, paginationParams);
 
             if (pations != null && withRecords == true)
             {
@@ -56,7 +52,7 @@ public async Task<IActionResult> Patients(bool? withRecords, [FromQuery] Paginat
         [HttpGet("{id}")]
         public async Task<IActionResult> GetPatientById(int id, bool? withRecords)
         {
-            var pation = await _repo.GetPatient(id, withRecords);
+            var pation = await _repo.GetPatientAsync(id, withRecords);
 
             var patientToReturn = _mapper.Map<PatientForDetailsDto>(pation);
             return Ok(patientToReturn);
@@ -67,7 +63,7 @@ public async Task<IActionResult> GetPatientById(int id, bool? withRecords)
 
         public async Task<IActionResult> GetPatientsStatistics(int id)
         {
-            var patient = await _repo.GetPatient(id, true);
+            var patient = await _repo.GetPatientAsync(id, true);
 
             var mappedPatient = _mapper.Map<PatientForDetailsDto>(patient);
 
@@ -98,9 +94,9 @@ public async Task<IActionResult> EditPatient(PatientForEditDto patient)
             if (ModelState.IsValid)
             {
 
-                var patientToEdit = await _repo.GetPatient(patient.Id);
+                var patientToEdit = await _repo.GetPatientAsync(patient.Id);
                 var mappedPatient = _mapper.Map<PatientForEditDto, Patient>(patient, patientToEdit);
-                var newPation = await _repo.EditPatient(mappedPatient);
+                var newPation = await _repo.EditPatientAsync(mappedPatient);
 
                 return Ok(patientToEdit);
             }
@@ -113,10 +109,10 @@ public async Task<IActionResult> EditPatient(PatientForEditDto patient)
         [HttpDelete("{id}")]
         public async Task<IActionResult> DeletePatient(int id)
         {
-            var patientForDelete = await _repo.GetPatient(id, false);
+            var patientForDelete = await _repo.GetPatientAsync(id, false);
 
 
-            var deletedPatient = await _repo.DeletePatient(patientForDelete);
+            var deletedPatient = await _repo.DeletePatientAsync(patientForDelete);
 
             return Ok(deletedPatient);
 
@@ -127,7 +123,7 @@ public async Task<IActionResult> DeletePatient(int id)
         public async Task<IActionResult> PatchPatient(int id, JsonPatchDocument<PatientForEditDto> patient)
         {
 
-            var patientToPatch = _repo.GetPatient(id, false).Result;
+            var patientToPatch = _repo.GetPatientAsync(id, false).Result;
 
             if (patientToPatch != null)
             {
@@ -147,7 +143,7 @@ public async Task<IActionResult> PatchPatient(int id, JsonPatchDocument<PatientF
 
                 var patientForRepo = _mapper.Map<JsonPatchDocument<Patient>>(patient);
 
-                var x = await _repo.PatchPatient(id, patientForRepo);
+                var x = await _repo.PatchPatientAsync(id, patientForRepo);
 
                 if (x == 0)
                 {