From 0ffa974bd337f78ed06ac02f2143b15da7321476 Mon Sep 17 00:00:00 2001
From: MarcEricMartel <74071476+MarcEricMartel@users.noreply.github.com>
Date: Sat, 5 Nov 2022 09:01:05 -0700
Subject: [PATCH] argh.

---
 .../Controllers/AddressController.cs          | 10 ++--
 .../Controllers/InvoiceController.cs          |  6 +--
 .../Controllers/ProductController.cs          | 11 ++--
 .../GrossesMitainesAPI.csproj                 |  1 +
 .../grosses-mitaines-ui/src/components/App.js | 53 +++++++++++++------
 5 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/GrossesMitaines/GrossesMitainesAPI/Controllers/AddressController.cs b/GrossesMitaines/GrossesMitainesAPI/Controllers/AddressController.cs
index f42c5b9..d7bd047 100644
--- a/GrossesMitaines/GrossesMitainesAPI/Controllers/AddressController.cs
+++ b/GrossesMitaines/GrossesMitainesAPI/Controllers/AddressController.cs
@@ -38,7 +38,7 @@ public class AddressController : Controller {
     #endregion
 
     #region API Methods
-    [EnableCors("_myAllowSpecificOrigins"), HttpGet(Name = "Addresses"), Route("ListAddresses")]
+    [EnableCors("_myAllowSpecificOrigins"), HttpGet]
     public async Task<ActionResult<List<AddressModel>>> GetList(bool? all) {
         IList<string> roles;
         InventoryUser user;
@@ -69,7 +69,7 @@ public class AddressController : Controller {
         }
     }
 
-    [EnableCors("_myAllowSpecificOrigins"), HttpGet(Name = "Address")]
+    [EnableCors("_myAllowSpecificOrigins"), HttpGet("{id}")]
     public async Task<ActionResult<AddressModel>> Get(int id) {
         IList<string> roles;
         string userId;
@@ -103,7 +103,7 @@ public class AddressController : Controller {
         else return Unauthorized();
     }
 
-    [EnableCors("_myAllowSpecificOrigins"), HttpPost(Name = "Address")]
+    [EnableCors("_myAllowSpecificOrigins"), HttpPost]
     public async Task<ActionResult<AddressModel>> Post(AddressModel ad) {
         try {
             var user = await _userMan.GetUserAsync(_signInMan.Context.User);
@@ -117,7 +117,7 @@ public class AddressController : Controller {
         return ad;
     }
 
-    [EnableCors("_myAllowSpecificOrigins"), HttpPatch(Name = "Address")]
+    [EnableCors("_myAllowSpecificOrigins"), HttpPatch]
     public async Task<ActionResult<AddressModel>> Patch(AddressModel ad) {
         IList<string> roles;
         InventoryUser user;
@@ -149,7 +149,7 @@ public class AddressController : Controller {
         return ad;
     }
 
-    [EnableCors("_myAllowSpecificOrigins"), HttpDelete(Name = "Address")]
+    [EnableCors("_myAllowSpecificOrigins"), HttpDelete]
     public async Task<ActionResult<int>> Delete(int id) {
         IList<string> roles;
         AddressModel ad;
diff --git a/GrossesMitaines/GrossesMitainesAPI/Controllers/InvoiceController.cs b/GrossesMitaines/GrossesMitainesAPI/Controllers/InvoiceController.cs
index 03ed435..4a999c8 100644
--- a/GrossesMitaines/GrossesMitainesAPI/Controllers/InvoiceController.cs
+++ b/GrossesMitaines/GrossesMitainesAPI/Controllers/InvoiceController.cs
@@ -43,7 +43,7 @@ public class InvoiceController : Controller {
     #endregion
 
     #region API Methods
-    [HttpGet, Route("GetList"), Authorize(Roles = "Client, Administrateur")]
+    [HttpGet, Authorize(Roles = "Client, Administrateur")]
     public async Task<ActionResult<List<InvoiceModel>>> Get(bool? all = false) {
         IList<string> roles;
         string id;
@@ -67,7 +67,7 @@ public class InvoiceController : Controller {
         }
     }
 
-    [HttpGet, Route("Get"), Authorize(Roles = "Client, Administrateur")]
+    [HttpGet("{id}"), Authorize(Roles = "Client, Administrateur")]
     public async Task<ActionResult<InvoiceModel>> Get(int id) {
         IList<string> roles;
         InvoiceModel inv;
@@ -166,7 +166,7 @@ public class InvoiceController : Controller {
         return Ok(inv);
     }
 
-    [HttpPost, Route("CancelInvoice"), Authorize(Roles = "Client, Administrateur")]
+    [HttpPost("Cancel/{id}"), Authorize(Roles = "Client, Administrateur")]
     public async  Task<ActionResult<InvoiceModel>> Cancel(int id) {
         InvoiceModel inv;
         IList<string> roles;
diff --git a/GrossesMitaines/GrossesMitainesAPI/Controllers/ProductController.cs b/GrossesMitaines/GrossesMitainesAPI/Controllers/ProductController.cs
index 2fa4bcd..9917983 100644
--- a/GrossesMitaines/GrossesMitainesAPI/Controllers/ProductController.cs
+++ b/GrossesMitaines/GrossesMitainesAPI/Controllers/ProductController.cs
@@ -13,6 +13,7 @@ using GrossesMitainesAPI.Services;
 using System.Drawing;
 using System.IO;
 using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.AspNetCore.Routing;
 #endregion
 
 /// <summary>
@@ -44,12 +45,12 @@ public class ProductController : ControllerBase {
     #endregion
 
     #region API Methods
-    [EnableCors("_myAllowSpecificOrigins"), Route("Quantity"), HttpGet(Name = "Product"), AllowAnonymous]
+    [EnableCors("_myAllowSpecificOrigins"), HttpGet("Quantity"), AllowAnonymous]
     public ActionResult<uint> ProdCount(int id) {
         return _context.Products.FirstOrDefault(x => x.Id == id).Quantity;
     }
 
-    [EnableCors("_myAllowSpecificOrigins"), HttpGet(Name = "Product"), AllowAnonymous]
+    [EnableCors("_myAllowSpecificOrigins"), HttpGet(), AllowAnonymous]
     public ActionResult<ProductViewModel> Get(int id) {
         ProductModel prod;
         try {
@@ -63,7 +64,7 @@ public class ProductController : ControllerBase {
         return new ProductViewModel(prod);
     }
 
-    [EnableCors("_myAllowSpecificOrigins"), HttpPost(Name = "Product")]
+    [EnableCors("_myAllowSpecificOrigins"), HttpPost()]
     public async Task<ActionResult<ProductModel>> Post([FromForm] ProductModel prod) {
         if (prod.Price <= prod.PromoPrice)
             prod.PromoPrice = prod.Price - 0.01M;
@@ -82,7 +83,7 @@ public class ProductController : ControllerBase {
         return prod;
     }
 
-    [EnableCors("_myAllowSpecificOrigins"), HttpPatch(Name = "Product")]
+    [EnableCors("_myAllowSpecificOrigins"), HttpPatch()]
     public async Task<ActionResult<ProductModel>> Patch([FromForm] ProductModel prod) {
         string? oldImage = "";
         try {
@@ -106,7 +107,7 @@ public class ProductController : ControllerBase {
         return prod;
     }
 
-    [EnableCors("_myAllowSpecificOrigins"), HttpDelete(Name = "Product")]
+    [EnableCors("_myAllowSpecificOrigins"), HttpDelete()]
     public ActionResult<int> Delete(int id) {
         try {
             var prod = _context.Products.Where(x => x.Id == id).First();
diff --git a/GrossesMitaines/GrossesMitainesAPI/GrossesMitainesAPI.csproj b/GrossesMitaines/GrossesMitainesAPI/GrossesMitainesAPI.csproj
index 5ac200e..b913230 100644
--- a/GrossesMitaines/GrossesMitainesAPI/GrossesMitainesAPI.csproj
+++ b/GrossesMitaines/GrossesMitainesAPI/GrossesMitainesAPI.csproj
@@ -11,6 +11,7 @@
     <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.9" />
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.10">
       <PrivateAssets>all</PrivateAssets>
diff --git a/GrossesMitaines/grosses-mitaines-ui/src/components/App.js b/GrossesMitaines/grosses-mitaines-ui/src/components/App.js
index 4bc62bd..14de554 100644
--- a/GrossesMitaines/grosses-mitaines-ui/src/components/App.js
+++ b/GrossesMitaines/grosses-mitaines-ui/src/components/App.js
@@ -11,24 +11,47 @@ import Login from "../pages/Login";
 import Logout from "../pages/Logout";
 import Register from "../pages/Register";
 import Formulaire from "../pages/Formulaire";
+import { useState, useEffect } from "react";
+import React from 'react';
+
+const UserContext = React.createContext();
+
 const App = () => {
+  const [user, setUser] = useState(null);
+
+  useEffect(() => {
+    async function FetchUser() {
+        const response = await fetch(`https://localhost:7292/api/WhoAmI`, { credentials: 'include'});
+        if (response.status === 200) {
+          setUser(await response.json());
+        }
+        else setUser({hasCookie: false})
+        console.log(user)
+    }
+    if (user === null) {
+      FetchUser();
+    }
+});
+
   return (
     <BrowserRouter>
-      <Routes>
-        <Route path="/" element={<Layout />}>
-          <Route index element={<Home />} />
-          <Route path="morceaux" element={<Morceaux/>} />
-          <Route path="aboutUs" element={<AboutUs/>} />
-          <Route path="contactUs" element={<ContactUs/>}/>
-          <Route path="privacy" element={<Privacy/>}/>
-          <Route path="morceaux/:id" element={<MorceauDetail/>}/>
-          <Route path="inventaire" element={<Inventaire/>}/>
-          <Route path="login" element={<Login/>}/>
-          <Route path="logout" element={<Logout/>}/>
-          <Route path="register" element={<Register/>}/>
-          <Route path="formulaire" element={<Formulaire/>}/>
-        </Route>
-      </Routes>
+      <UserContext.Provider value={user}>
+        <Routes>
+          <Route path="/" element={<Layout />}>
+            <Route index element={<Home />} />
+            <Route path="morceaux" element={<Morceaux/>} />
+            <Route path="aboutUs" element={<AboutUs/>} />
+            <Route path="contactUs" element={<ContactUs/>}/>
+            <Route path="privacy" element={<Privacy/>}/>
+            <Route path="morceaux/:id" element={<MorceauDetail/>}/>
+            <Route path="inventaire" element={<Inventaire/>}/>
+            <Route path="login" element={<Login/>}/>
+            <Route path="logout" element={<Logout/>}/>
+            <Route path="register" element={<Register/>}/>
+            <Route path="formulaire" element={<Formulaire/>}/>
+          </Route>
+        </Routes>
+      </UserContext.Provider>
     </BrowserRouter>
   );
 };