ENSEEIHT/projet-application-web
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: changed login to use form params instead of json

Browse source
This commit is contained in:
Laureηt 2022-05-27 16:16:45 +02:00
parent 434342bc86
commit 2f6ee4a742
No known key found for this signature in database
GPG key ID: D88C6B294FD40994
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/com/pixels/services/UserService.java
View file

@ -74,7 +74,9 @@ public class UserService {
@POST @POST
@Path("signup") @Path("signup")
@Consumes(MediaType.APPLICATION_FORM_URLENCODED) @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
public void signup(@CookieParam("JSESSIONID") Cookie cookie, @FormParam("username") String username, @FormParam("password") String password) { public void signup(@CookieParam("JSESSIONID") Cookie cookie, @FormParam("username") String username,
@FormParam("password") String password) {
// on créé un utilisateur // on créé un utilisateur
User new_user = new User(username, password); User new_user = new User(username, password);
@ -89,8 +91,10 @@ public class UserService {
@POST @POST
@Path("login") @Path("login")
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
public void login(@CookieParam("JSESSIONID") Cookie cookie, String json) { public void login(@CookieParam("JSESSIONID") Cookie cookie, @FormParam("username") String username,
@FormParam("password") String password) {
User user; User user;
try { try {
// si on trouve l'utilisateur via son sessionID // si on trouve l'utilisateur via son sessionID
@ -99,14 +103,11 @@ public class UserService {
LOGGER.info(user.getUsername() + " already logged in"); LOGGER.info(user.getUsername() + " already logged in");
// TODO: renvoyer un json avec les creds // TODO: renvoyer un json avec les creds
} catch (NoResultException e) { } catch (NoResultException e) {
// on parse le json en objet User
User json_user = gson.fromJson(json, User.class);
// on trouve le user à partir de son username // on trouve le user à partir de son username
user = em.find(User.class, json_user.getUsername()); user = em.find(User.class, username);
// si les identifiants sont valides // si les identifiants sont valides
if (user.validPassword(json_user.getPassword())) { if (user.validPassword(password)) {
// on enregistre son sessionID // on enregistre son sessionID
user.setSessionID(cookie.getValue()); user.setSessionID(cookie.getValue());