diff --git a/client/src/components/ImageGallery/ImageGallery.tsx b/client/src/components/ImageGallery/ImageGallery.tsx index 60dfc14..85d80ed 100644 --- a/client/src/components/ImageGallery/ImageGallery.tsx +++ b/client/src/components/ImageGallery/ImageGallery.tsx @@ -124,7 +124,7 @@ const ImageDialog: React.FC = ({ galleryOpen, setDialogOpen, setImageLink onCopy(obj.id)} size="small" data-testid={`copy-button-${obj.id}`}> - handleDelete(obj.id)} size="small" color="secondary" data-testid={`delete-button-${obj.id}`}> + handleDelete(obj.id)} size="small" color="primary" data-testid={`delete-button-${obj.id}`}> {copiedId === obj.id && Copié!} diff --git a/client/src/services/ApiService.tsx b/client/src/services/ApiService.tsx index b3b73ed..acf4066 100644 --- a/client/src/services/ApiService.tsx +++ b/client/src/services/ApiService.tsx @@ -144,13 +144,14 @@ class ApiService { } public getUserID(): string { - const objectStr = localStorage.getItem("jwt"); + const token = localStorage.getItem("jwt"); - if (!objectStr) { + if (!token) { return ""; } - const jsonObj = JSON.parse(objectStr); + const jsonObj = jwtDecode(token) as { userId: string }; + if (!jsonObj.userId) { return ""; } @@ -1259,8 +1260,8 @@ public async login(email: string, password: string): Promise { if (result.status !== 200) { throw new Error(`La suppression de l'image a échoué. Status: ${result.status}`); } - const deleted = result.data.delete; + const deleted = result.data.deleted; return deleted; } catch (error) { diff --git a/server/routers/images.js b/server/routers/images.js index 2be24d2..f2d601a 100644 --- a/server/routers/images.js +++ b/server/routers/images.js @@ -14,6 +14,6 @@ router.post("/upload", jwt.authenticate, upload.single('image'), asyncHandler(im router.get("/get/:id", asyncHandler(images.get)); router.get("/getImages", asyncHandler(images.getImages)); router.get("/getUserImages", asyncHandler(images.getUserImages)); -router.get("/delete", asyncHandler(images.delete)); +router.delete("/delete", asyncHandler(images.delete)); module.exports = router;