Merge branch 'main' of https://github.com/IgniteUI/NorthwindAPI into dgdimitrov/add-query-builder-package

Author: ddidgdimitrov-infragistics

NorthwindCRUD/Controllers/AuthController.cs

@@ -89,5 +89,71 @@ public ActionResult<string> Register(RegisterDto userModel)
                 return StatusCode(500);
             }
         }
+
+        [AllowAnonymous]
+        [HttpPost("LoginObject")]
+        public ActionResult<AuthDto> LoginObject(LoginDto userModel)
+        {
+            try
+            {
+                if (ModelState.IsValid)
+                {
+                    if (this.authService.IsAuthenticated(userModel.Email, userModel.Password))
+                    {
+                        var token = this.authService.GenerateJwtToken(userModel.Email);
+
+                        return Ok(new AuthDto() { Token = token });
+                    }
+
+                    return BadRequest("Email or password are not correct!");
+                }
+
+                return BadRequest(ModelState);
+            }
+            catch (Exception error)
+            {
+                logger.LogError(error.Message);
+                return StatusCode(500);
+            }
+        }
+
+        [AllowAnonymous]
+        [HttpPost("RegisterObject")]
+        public ActionResult<AuthDto> RegisterObject(RegisterDto userModel)
+        {
+            try
+            {
+                if (ModelState.IsValid)
+                {
+                    if (userModel.Password != userModel.ConfirmedPassword)
+                    {
+                        return BadRequest("Passwords does not match!");
+                    }
+
+                    if (this.authService.DoesUserExists(userModel.Email))
+                    {
+                        return BadRequest("User does not exists!");
+                    }
+
+                    var mappedModel = this.mapper.Map<RegisterDto, UserDb>(userModel);
+                    var user = this.authService.RegisterUser(mappedModel);
+
+                    if (user != null)
+                    {
+                        var token = this.authService.GenerateJwtToken(user.Email);
+                        return Ok(new AuthDto() { Token = token });
+                    }
+
+                    return BadRequest("Email or password are not correct!");
+                }
+
+                return BadRequest(ModelState);
+            }
+            catch (Exception error)
+            {
+                logger.LogError(error.Message);
+                return StatusCode(500);
+            }
+        }
     }
 }

NorthwindCRUD/Models/Contracts/IAddress.cs

@@ -4,15 +4,15 @@ namespace NorthwindCRUD.Models.Contracts
 {
     public interface IAddress
     {
-        string Street { get; set; }
+        string? Street { get; set; }
 
-        string City { get; set; }
+        string? City { get; set; }
 
-        string Region { get; set; }
+        string? Region { get; set; }
 
-        string PostalCode { get; set; }
+        string? PostalCode { get; set; }
 
-        string Country { get; set; }
+        string? Country { get; set; }
 
         string? Phone { get; set; }
     }

NorthwindCRUD/Models/DbModels/AddressDb.cs

@@ -10,15 +10,15 @@ public class AddressDb : IAddress
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
         public string AddressId { get; set; }
 
-        public string Street { get; set; }
+        public string? Street { get; set; }
 
-        public string City { get; set; }
+        public string? City { get; set; }
 
-        public string Region { get; set; }
+        public string? Region { get; set; }
 
-        public string PostalCode { get; set; }
+        public string? PostalCode { get; set; }
 
-        public string Country { get; set; }
+        public string? Country { get; set; }
 
         public string? Phone { get; set; }
 

NorthwindCRUD/Models/Dtos/AddressDto.cs

@@ -6,22 +6,21 @@ namespace NorthwindCRUD.Models.Dtos
     public class AddressDto : IAddress
     {
         [StringLength(100, ErrorMessage = "Street cannot exceed 100 characters.")]
-        public string Street { get; set; }
+        public string? Street { get; set; }
 
         [StringLength(50, ErrorMessage = "City cannot exceed 50 characters.")]
-        public string City { get; set; }
+        public string? City { get; set; }
 
         [StringLength(50, ErrorMessage = "Region cannot exceed 50 characters.")]
-        public string Region { get; set; }
+        public string? Region { get; set; }
 
         [StringLength(20, ErrorMessage = "Postal code cannot exceed 20 characters.")]
-        public string PostalCode { get; set; }
+        public string? PostalCode { get; set; }
 
-        [Required(ErrorMessage = "Country is required.")]
         [StringLength(50, ErrorMessage = "Country cannot exceed 50 characters.")]
-        public string Country { get; set; }
+        public string? Country { get; set; }
 
-        [RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]
+        [RegularExpression(@"^\+?[0-9][0-9\-]{1,14}$", ErrorMessage = "Phone number is not valid.")]
         public string? Phone { get; set; }
     }
 }

NorthwindCRUD/Models/Dtos/AuthDto.cs

@@ -0,0 +1,7 @@
+namespace NorthwindCRUD.Models.Dtos
+{
+    public class AuthDto
+    {
+        public string Token { get; set; }
+    }
+}

NorthwindCRUD/Services/SalesService.cs

@@ -71,7 +71,7 @@ public SalesDto[] RetrieveSalesDataByCountry(string startDate, string endDate, s
             .ToList();
 
             var filteredData = salesData
-            .Where(od => od.Order.ShipAddress?.Country.ToLower(CultureInfo.InvariantCulture) == normalizedCountry && DateTime.Parse(od.Order.OrderDate, CultureInfo.InvariantCulture) >= parsedStartDate && DateTime.Parse(od.Order.RequiredDate, CultureInfo.InvariantCulture) <= parsedEndDate)
+            .Where(od => od.Order.ShipAddress?.Country?.ToLower(CultureInfo.InvariantCulture) == normalizedCountry && DateTime.Parse(od.Order.OrderDate, CultureInfo.InvariantCulture) >= parsedStartDate && DateTime.Parse(od.Order.RequiredDate, CultureInfo.InvariantCulture) <= parsedEndDate)
             .ToList();
 
             var sales = filteredData.Select(od => new SalesDto