signup fonctionnel

GrossesMitaines/GrossesMitainesAPI/Controllers/InventoryController.cs

@@ -136,38 +136,5 @@ public class InventoryController : Controller {
         }
     }
 
-    // Inventory/Delete => Décrémenter un produit. Va aller chercher directement dans la BD.
-    //[EnableCors("_myAllowSpecificOrigins"), HttpDelete(Name = "Inventory"), AllowAnonymous]
-    //public ActionResult<int> Delete(int? id) {
-    //    int rid = 0;
-    //    if (!id.HasValue) {
-    //        _logger.LogError(8, "Tentative de vente sans Id.");
-    //        return BadRequest();
-    //    }
-    //    try {
-    //        ProductModel prod = _context.Products.First(x => x.Id == id);
-    //        rid = prod.Id;
-    //        if (prod.Quantity > 0) {
-    //            prod.Quantity = prod.Quantity - 1;
-    //            prod.Sales = prod.Sales + 1;
-    //            prod.LastSale = DateTime.Now;
-    //            if (prod.Quantity == 0)
-    //                prod.Status = prod.Status == ProductModel.States.Clearance ?
-    //                                             ProductModel.States.Discontinued :
-    //                                             ProductModel.States.BackOrder;
-    //        } else {
-    //            _logger.LogError(8, $"Vente de produit pas en stock. Id Produit: {prod.Id}");
-    //            return BadRequest();
-    //        }
-    //        _context.Products.Update(prod);
-    //        _context.SaveChanges();
-    //    } catch (Exception e) {
-    //        _logger.LogError(8, e.Message);
-    //        return BadRequest();
-    //    }
-    //    _cache.askForRefresh();
-    //    return rid;
-    //}
-
     #endregion
 }

GrossesMitaines/GrossesMitainesAPI/Controllers/InvoiceController.cs

@@ -31,11 +31,13 @@ public class InvoiceController : Controller {
     public InvoiceController(ILogger<InvoiceController> logger, 
                              InventoryContext context, 
                              DatabaseCacheService cache,
+                             SignInManager<InventoryUser> signInMan,
                              Microsoft.AspNetCore.Identity.UserManager<InventoryUser> userMan) { 
         _logger = logger;
         _context = context;
         _cache = cache;
         _userMan = userMan;
+        _signInMan = signInMan;
     }
 
     #endregion
@@ -46,18 +48,19 @@ public class InvoiceController : Controller {
         IList<string> roles;
         string id;
         try { // Trouver les rôles de l'utilisateur, assumer non-admin si impossible à trouver.
-            roles = await _userMan.GetRolesAsync(await _userMan.GetUserAsync(_signInMan.Context.User));
+            var user = await _userMan.GetUserAsync(_signInMan.Context.User);
+            roles = await _userMan.GetRolesAsync(user);
         } catch (Exception e) {
             _logger.LogError(10, e.Message);
             roles = new List<string>();
         }
 
-        try {
+        try { // TODO: Débugger ça.
             id = _signInMan.Context.User.Identity.GetUserId();
             if (all is not null && all == true && roles.Contains("Administrateur"))
-                return _context.Invoices.Include("LinkedAccount, ShippingAddress").ToList();
+                return Ok(_context.Invoices.Include("LinkedAccount, ShippingAddress").ToList());
-            else return _context.Invoices.Include("ShippingAddress").Where(x => x.LinkedAccount != null &&
+            else return Ok(_context.Invoices.Include("ShippingAddress").Where(x => x.LinkedAccount != null &&
-                                                x.LinkedAccount.Id == id).ToList();
+                                                x.LinkedAccount.Id == id).ToList());
         } catch (Exception e) {
             _logger.LogError(10, e.Message);
             return BadRequest();
@@ -93,14 +96,14 @@ public class InvoiceController : Controller {
     [HttpPost, AllowAnonymous]
     public async Task<ActionResult<InvoiceModel>> Post(InvoiceModel inv) {
         var user = await _userMan.GetUserAsync(_signInMan.Context.User);
+        var prodcom = inv.Products.ToList();
+        Dictionary<int, uint> badprods = new(); 
         List<ProductModel> prods;
 
         if (user is not null)
             inv.LinkedAccount = user;
         inv.PurchaseDate = DateTime.Now; // Pour forcer la date.
 
-        var prodcom = inv.Products.ToList();
-
         try {
             prods = _context.Products.Where(x => inv.Products.Select(x => x.Product).Contains(x)).ToList();
         } catch (Exception e) {
@@ -108,18 +111,26 @@ public class InvoiceController : Controller {
             return BadRequest();
         }
 
+        if (prods.Count == 0)
+            return BadRequest("Vous devez inclure au moins un produit à votre commande.");
+
         foreach (var prod in prodcom) { // Update de quantités dans l'inventaire.
             ProductModel inventProd = prods.Where(x => x.Id == prod.Product.Id).First();
             if (inventProd.Quantity > prod.Quantity)
-                return BadRequest(); // TODO: retourner le produit qui ne peut pas être vendu.
+                badprods.Add(prod.Id, prod.Quantity);
             if (inventProd.Quantity == prod.Quantity) {
                 inventProd.Quantity = 0;
                 inventProd.Status = inventProd.Status == ProductModel.States.Clearance ?
                                                          ProductModel.States.Discontinued :
                                                          ProductModel.States.BackOrder;
             } else inventProd.Quantity -= prod.Quantity;
+            inventProd.LastSale = DateTime.Now;
+            inventProd.Sales += prod.Quantity;
         }
 
+        if (badprods.Count > 0) // Retour des produits non-achetable avec l'inventaire restant.
+            return BadRequest(badprods.ToArray());
+
         try { // Faire les updates dans la BD.
             _context.Invoices.Add(inv);
             _context.Products.UpdateRange(prods);
@@ -133,7 +144,7 @@ public class InvoiceController : Controller {
         return Ok(inv);
     }
 
-    [HttpPost, Authorize(Roles = "Client, Administrateur")]
+    [HttpPost, Route("CancelInvoice"), Authorize(Roles = "Client, Administrateur")]
     public async  Task<ActionResult<InvoiceModel>> Cancel(int id) {
         InvoiceModel inv;
         IList<string> roles;
@@ -159,10 +170,23 @@ public class InvoiceController : Controller {
              roles.Contains("Administrateur")))
             return Unauthorized();
 
+        if (inv.Status == InvoiceModel.InStates.Cancelled ||
+            inv.Status == InvoiceModel.InStates.Returned)
+            return BadRequest("La commande à déjà été annulée.");
+
+        if (inv.Status == InvoiceModel.InStates.Shipped)
+            return BadRequest("Il est trop tard pour annuler votre commande, veuillez contacter le service à la clientèle pour retourner la commande.");
+
         inv.Status = InvoiceModel.InStates.Cancelled;
 
-        foreach (var prod in inv.Products) // Revert l'inventaire.
+        foreach (var prod in inv.Products) { // Revert l'inventaire.
+            if (prod.Product.Quantity == 0)
+                if (prod.Product.Status == ProductModel.States.Discontinued)
+                    prod.Product.Status = ProductModel.States.Clearance;
+                else prod.Product.Status = ProductModel.States.Available;
             prod.Product.Quantity = prod.Product.Quantity + prod.Quantity;
+            prod.Product.Sales -= prod.Quantity;
+        } 
 
         try {
             _context.Update(inv);
@@ -173,7 +197,6 @@ public class InvoiceController : Controller {
         }
 
         _cache.askForRefresh();
-
         return Ok(inv);
     }
 

GrossesMitaines/GrossesMitainesAPI/Controllers/LoginController.cs

@@ -43,9 +43,12 @@ public class LoginController : Controller {
     }
 
     [HttpPost, Route("Login"), AllowAnonymous]
-    public async Task<SignInResult> Login(LoginModel user, bool rememberMe = false) {
+    public SignInResult Login(LoginModel user, bool rememberMe = false) {
-        var User = await _userMan.FindByEmailAsync(user.email);
+        var User = _userMan.FindByEmailAsync(user.email.ToUpper());
-        return await _signInMan.PasswordSignInAsync(User, user.password, rememberMe, false);
+        User.Wait();
+        var res = _signInMan.PasswordSignInAsync(User.Result, user.password, rememberMe, false);
+        res.Wait();
+        return res.Result;
     }
 
     [HttpPost, Route("Logout")]

GrossesMitaines/GrossesMitainesAPI/Controllers/ProductController.cs

@@ -107,7 +107,7 @@ public class ProductController : ControllerBase {
 
     #endregion
 
-    #region Utility Methods
+    #region Internal Methods
     private async Task<string> SaveImage(IFormFile imageFile) {
         string imageName = new String(Path.GetFileNameWithoutExtension(imageFile.FileName).Take(10).ToArray()).Replace(' ', '-');
         imageName = imageName + DateTime.Now.ToString("yymmssfff") + Path.GetExtension(imageFile.FileName);

GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs

@@ -52,7 +52,7 @@ public class SearchController : Controller {
 
     #endregion
 
-    #region Private Methods
+    #region Internal Methods
     private List<ProductViewModel> Search(string query, string? filterPrice, string? filterState, string? order) {
         List<ProductViewModel> products = new();
         query = query.Trim();

GrossesMitaines/GrossesMitainesAPI/Controllers/UserController.cs

@@ -1,44 +1,92 @@
-using GrossesMitainesAPI.Data;
+namespace GrossesMitainesAPI.Controllers;
+
+#region Dependencies
+using GrossesMitainesAPI.Data;
 using GrossesMitainesAPI.Models;
+using Microsoft.AspNet.Identity;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System.Net.Mime;
+
+#endregion
 
-namespace GrossesMitainesAPI.Controllers;
 [EnableCors("_myAllowSpecificOrigins"), ApiController, Route("api/[controller]"),
  Authorize(AuthenticationSchemes = "Identity.Application", Roles = "Administrateur")]
 public class UserController : Controller {
-    private readonly UserManager<InventoryUser> _userMan;
+    #region DI Fields
+    private readonly Microsoft.AspNetCore.Identity.UserManager<InventoryUser> _userMan;
     private readonly SignInManager<InventoryUser> _signInMan;
+    private readonly InventoryContext _context;
     private readonly ILogger<UserController> _logger;
 
-    public UserController(ILogger<UserController> logger, SignInManager<InventoryUser> signin, UserManager<InventoryUser> userman) {
+    #endregion
+
+    #region Ctor
+    public UserController(ILogger<UserController> logger, 
+                          SignInManager<InventoryUser> signin,
+                          Microsoft.AspNetCore.Identity.UserManager<InventoryUser> userman,
+                          InventoryContext context) {
         _logger = logger;
         _signInMan = signin;
         _userMan = userman;
+        _context = context;
     }
 
+    #endregion
+
+    #region API Methods
     [HttpPost, AllowAnonymous]
-    public async Task<ActionResult<ReturnUserViewModel>> Post(SignUpUserModel sign) {
+    public ActionResult<ReturnUserViewModel> Post(SignUpUserModel sign) {
         InventoryUser usr;
         try {
             usr = new(sign);
-        } catch { 
+        } catch (Exception e){ 
-            return BadRequest("Erreur utilisateur");
+            return BadRequest($"Erreur utilisateur: {e.Message}");
         }
+
         try {
             usr.PasswordHash = new PasswordHasher<InventoryUser>().HashPassword(usr, sign.Password);
-        } catch {
+        } catch (Exception e){
-            return BadRequest("Erreur de mot de passe.");
+            return BadRequest($"Erreur de mot de passe: {e.Message}");
         }
         try {
-            await _userMan.CreateAsync(usr);
+            var t1 = _userMan.CreateAsync(usr);
-            await _userMan.AddToRoleAsync(usr, "Client");
+            t1.Wait();
+            var t2 = _userMan.AddToRoleAsync(usr, "Client");
+            t2.Wait();
+
         } catch (Exception e) {
             return BadRequest(e.Message);
         }
+
         return new ReturnUserViewModel(usr, "Client");
     }
+
+    [HttpGet, Route("Adresses")]
+    public async Task<ActionResult<AddressModel>> GetAddresses(bool? all) {
+        IList<string> roles;
+        string id;
+        try { // Trouver les rôles de l'utilisateur, assumer non-admin si impossible à trouver.
+            roles = await _userMan.GetRolesAsync(await _userMan.GetUserAsync(_signInMan.Context.User));
+        } catch (Exception e) {
+            _logger.LogError(10, e.Message);
+            roles = new List<string>();
+        }
+
+        try {
+            id = _signInMan.Context.User.Identity.GetUserId();
+            if (all is not null && all == true && roles.Contains("Administrateur"))
+                return Ok(_context.Addresses.Include("AspNetUser").ToList());
+            else return Ok(_context.Users.Include("Adresses").Where(x => x.Id == id).ToList());
+        } catch (Exception e) {
+            _logger.LogError(10, e.Message);
+            return BadRequest(e.Message);
+        }
+    }
+
+    #endregion
 }
 

GrossesMitaines/GrossesMitainesAPI/Data/InventoryUser.cs

@@ -10,12 +10,13 @@ public class InventoryUser : IdentityUser {
     public string LastName { get; set; }
     public List<AddressModel> Adresses { get; set; }
 
+    public InventoryUser() { }
     public InventoryUser(SignUpUserModel sign) {
         FirstName = sign.FirstName;
         LastName = sign.LastName;
-        UserName = sign.FirstName + " " + sign.LastName;
+        UserName = sign.FirstName + sign.LastName;
-        NormalizedUserName = UserName.ToUpper();
+        NormalizedUserName = (sign.FirstName + sign.LastName).ToUpper();
-        NormalizedEmail = Email.ToUpper();
+        NormalizedEmail = sign.Email.ToUpper();
         Email = sign.Email;
         PhoneNumber = sign.Phone;
         Adresses = sign.Adresses;

GrossesMitaines/GrossesMitainesAPI/Models/AddressModel.cs

@@ -16,7 +16,7 @@ public class AddressModel {
     [Required, MinLength(4), MaxLength(30)]
     public string Country { get; set; }
     // Source pour regex: https://stackoverflow.com/questions/15774555/efficient-regex-for-canadian-postal-code-function
-    [Required, RegularExpression(@"/^[ABCEGHJ-NPRSTVXY]\d[ABCEGHJ-NPRSTV-Z][ -]?\d[ABCEGHJ-NPRSTV-Z]\d$/i")]
+    //[Required, RegularExpression(@"/^[ABCEGHJ-NPRSTVXY]\d[ABCEGHJ-NPRSTV-Z][ -]?\d[ABCEGHJ-NPRSTV-Z]\d$/i")]
     public string PostalCode { get; set; }
 }
 

GrossesMitaines/GrossesMitainesAPI/Program.cs

@@ -31,6 +31,10 @@ builder.Services.AddIdentityCore<InventoryUser>()
 builder.Services.AddAuthorization();
 builder.Services.AddAuthentication().AddIdentityCookies();
 
+builder.Services.Configure<IdentityOptions>(options => { 
+    options.User.RequireUniqueEmail = true;
+});
+
 // Source: https://github.com/dotnet/aspnetcore/issues/9039
 builder.Services.ConfigureApplicationCookie(o => {
     o.Events = new CookieAuthenticationEvents() {

GrossesMitaines/GrossesMitainesAPI/Services/DatabaseCacheService.cs

@@ -90,7 +90,7 @@ public class DatabaseCacheService {
 
     #endregion
 
-    #region Public Methods
+    #region Service Methods
     public bool isOk() { return _ok; }
     public void askForRefresh() => _needUpd = true; 
     public void addHit(uint id) {