memartel_loc/GGMM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

react-version #1

Merged
memartel_loc merged 290 commits from react-version into main 2023-11-04 09:48:15 -04:00
Conversation 0 Commits 290 Files Changed 270 +16 -12
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 891d6b015d - Show all commits

25
GrossesMitaines/GrossesMitainesAPI/Controllers/InvoiceController.cs
View File

@ -44,12 +44,15 @@ public class InvoiceController : Controller {
#region API Methods
[HttpGet]
public async Task<ActionResult<List<InvoiceModel>>> Get(bool? all = false) {
public ActionResult<List<InvoiceModel>> Get(bool? all = false) {
IList<string> roles;
string id;
try { // Trouver les rôles de l'utilisateur, assumer non-admin si impossible à trouver.
var user = await _userMan.GetUserAsync(_signInMan.Context.User);
roles = await _userMan.GetRolesAsync(user);
var user = _userMan.GetUserAsync(_signInMan.Context.User);
user.Wait();
var rolecall = _userMan.GetRolesAsync(user.Result);
rolecall.Wait();
roles = rolecall.Result;
} catch (Exception e) {
_logger.LogError(10, e.Message);
roles = new List<string>();
@ -59,17 +62,17 @@ public class InvoiceController : Controller {
id = _signInMan.Context.User.Identity.GetUserId();
if (all is not null && all == true && roles.Contains("Administrateur"))
return Ok(_context.Invoices
.Include("ShippingAddress")
.Include(x => x.ShippingAddress)
.Include(x => x.LinkedAccount)
.Include(x => x.Products)
.ThenInclude(y => y.Product)
.ToList());
else
return Ok(_context.Invoices
.Include("ShippingAddress")
.Include(x => x.Products)
.ThenInclude(y => y.Product)
.Where(x => x.LinkedAccount != null && x.LinkedAccount.Id == id).ToList());
else return Ok(_context.Invoices
.Include(x => x.ShippingAddress)
.Include(x => x.LinkedAccount)
.Include(x => x.Products)
.ThenInclude(y => y.Product)
.Where(x => x.LinkedAccount != null && x.LinkedAccount.Id == id).ToList());
} catch (Exception e) {
_logger.LogError(10, e.Message);
return BadRequest();

3
GrossesMitaines/GrossesMitainesAPI/Controllers/UserController.cs
View File

@ -71,7 +71,8 @@ public class UserController : Controller {
}
try {
usr.PasswordHash = new PasswordHasher<InventoryUser>().HashPassword(usr, sign.Password);
var pas = new PasswordHasher<InventoryUser>().HashPassword(usr, sign.Password);
usr.PasswordHash = pas;
} catch (Exception e){
return BadRequest($"Erreur de mot de passe: {e.Message}");
}