diff --git a/Back-end/src/main/java/com/example/starter/AuthHandler.java b/Back-end/src/main/java/com/example/starter/AuthHandler.java
index 12205b3..68de2e4 100644
--- a/Back-end/src/main/java/com/example/starter/AuthHandler.java
+++ b/Back-end/src/main/java/com/example/starter/AuthHandler.java
@@ -78,7 +78,7 @@ public class AuthHandler {
}
databaseService.pool
- .preparedQuery("SELECT name, surname, password, points FROM users WHERE email = ?") // Ajout de name et surname
+ .preparedQuery("SELECT id,name, surname, password, points FROM users WHERE email = ?") // Ajout de name et surname
.execute(Tuple.of(email))
.onSuccess(result -> {
if (result.rowCount() == 0) {
@@ -89,6 +89,7 @@ public class AuthHandler {
}
var row = result.iterator().next();
+ Integer id = row.getInteger("id");
String storedHashedPassword = row.getString("password");
Integer nbPointsUser = row.getInteger("points");
String name = row.getString("name");
@@ -100,7 +101,8 @@ public class AuthHandler {
JsonObject claims = new JsonObject()
.put("sub", email)
.put("name", name)
- .put("surname", surname);
+ .put("surname", surname)
+ .put("id", id);
if (nbPointsUser <= 60) {
claims.put("role", "user");
diff --git a/Back-end/src/main/java/com/example/starter/QueryObjects.java b/Back-end/src/main/java/com/example/starter/QueryObjects.java
index 029a497..f984225 100644
--- a/Back-end/src/main/java/com/example/starter/QueryObjects.java
+++ b/Back-end/src/main/java/com/example/starter/QueryObjects.java
@@ -91,7 +91,7 @@ public class QueryObjects {
.put("status", row.getString("status"))
.put("batterie", row.getInteger("batterie"))
.put("type_batterie", row.getString("type_batterie"))
- .put("proprio", row.getString("proprio"));
+ .put("proprio_id", row.getInteger("proprio_id"));
objects.add(object);
}
return objects;
diff --git a/Back-end/src/main/java/com/example/starter/QueryUsers.java b/Back-end/src/main/java/com/example/starter/QueryUsers.java
index 4ea1c5f..f9f744a 100644
--- a/Back-end/src/main/java/com/example/starter/QueryUsers.java
+++ b/Back-end/src/main/java/com/example/starter/QueryUsers.java
@@ -59,8 +59,7 @@ public class QueryUsers {
.end(new JsonObject().put("error", "Corps de la requête manquant").encode());
return;
}
- //Integer idUser = body.getInteger("idUser");
- Integer idUser = 4;
+ Integer idUser = body.getInteger("id");
databaseService.pool
.preparedQuery("SELECT * FROM users WHERE id=?;")
.execute(Tuple.of(idUser))
diff --git a/Back-end/src/main/java/com/example/starter/SetObjects.java b/Back-end/src/main/java/com/example/starter/SetObjects.java
index a1bb0e6..30045e4 100644
--- a/Back-end/src/main/java/com/example/starter/SetObjects.java
+++ b/Back-end/src/main/java/com/example/starter/SetObjects.java
@@ -103,10 +103,10 @@ public class SetObjects {
String location = body.getString("location");
String status = body.getString("status");
String batterieType = body.getString("batterieType");
- String proprio = body.getString("proprio");
+ Integer proprio_id = body.getInteger("proprio_id");
databaseService.pool
- .preparedQuery("INSERT INTO weather_objects (name,description,type,location,status,type_batterie,proprio) VALUES (?,?,?,?,?,?,?)")
- .execute(Tuple.of(name,description,type,location,status,batterieType,proprio))
+ .preparedQuery("INSERT INTO weather_objects (name,description,type,location,status,type_batterie,proprio_id) VALUES (?,?,?,?,?,?,?)")
+ .execute(Tuple.of(name,description,type,location,status,batterieType,proprio_id))
.onFailure(e->{
System.err.println("Erreur de récupération de la BDD :"+e.getMessage());
context.response()
diff --git a/Front-end/package-lock.json b/Front-end/package-lock.json
index 8494b4e..d7b9ad1 100644
--- a/Front-end/package-lock.json
+++ b/Front-end/package-lock.json
@@ -4389,6 +4389,7 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
"integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==",
+ "license": "MIT",
"engines": {
"node": ">=18"
}
diff --git a/Front-end/src/App.jsx b/Front-end/src/App.jsx
index 6aab120..fde0836 100644
--- a/Front-end/src/App.jsx
+++ b/Front-end/src/App.jsx
@@ -36,7 +36,7 @@ function App() {
{/* Routes protégées pour les admins et complexes */}
Email : {user.sub}
Rôle : {user.role}
+Rôle : {user.id}
+ > ):(