diff --git a/src/main/java/fr/but/infoetu/meetingplannr/controller/AdminController.java b/src/main/java/fr/but/infoetu/meetingplannr/controller/AdminController.java
index e0309e4dbba6ffd14c1542e7cc09f4405706dd8c..2dc385b66d47fbabcfede17568aa4caea947a322 100644
--- a/src/main/java/fr/but/infoetu/meetingplannr/controller/AdminController.java
+++ b/src/main/java/fr/but/infoetu/meetingplannr/controller/AdminController.java
@@ -104,7 +104,7 @@ public class AdminController {
int pageSize = 5;
List<Request> allRequests = search != null && !search.trim().isEmpty()
? rr.findByReasonContainingOrDescriptionContaining(search, search)
- : rr.findAll();
+ : rr.findAllByOrderByDateDesc();
if (filter != null && filter) {
allRequests = allRequests.stream()
@@ -143,7 +143,7 @@ public class AdminController {
Meeting meeting = new Meeting();
meeting.setRequest(request);
meeting.setUser(user);
- if(user.getUsername().endsWith("@univ-lille.fr")) {
+ if(user.getUsername().endsWith("@univ-lille.fr") || user.getUsername().endsWith("@gmail.com")) {
us.sendValidationMeeting(user, meeting);
}
mr.save(meeting);
diff --git a/src/main/java/fr/but/infoetu/meetingplannr/controller/PublicController.java b/src/main/java/fr/but/infoetu/meetingplannr/controller/PublicController.java
index ba5859f5c97c90b3b325401b0f315e654498bcca..7c1e06054c77b9b284fbc99d7835a08b51ecb651 100644
--- a/src/main/java/fr/but/infoetu/meetingplannr/controller/PublicController.java
+++ b/src/main/java/fr/but/infoetu/meetingplannr/controller/PublicController.java
@@ -33,9 +33,6 @@ public class PublicController {
@Autowired
private UserService userService;
- @Autowired
- private JavaMailSender mailSender;
-
@Autowired
private PasswordEncoder passwordEncoder;
@@ -92,8 +89,8 @@ public class PublicController {
User user = userOpt.get();
- if(!user.getUsername().endsWith("@univ-lille.fr")) {
- model.addAttribute("errorMessage", "Le mot de passe ne peut pas être modifié car l'adresse email n'appartient pas à l'université de Lille");
+ if(!user.getUsername().endsWith("@univ-lille.fr") && !user.getUsername().endsWith("@gmail.com")) {
+ model.addAttribute("errorMessage", "Le mot de passe ne peut pas être modifié car l'adresse email n'est pas valide (@gmail.com ou @univ-lille.fr).");
return "public/login";
}
userService.sendPasswordVerificationEmail(user, newPassword);
diff --git a/src/main/java/fr/but/infoetu/meetingplannr/repository/RequestRepository.java b/src/main/java/fr/but/infoetu/meetingplannr/repository/RequestRepository.java
index 861a78c79c56f2f0ccdc957bb581feed636e6c28..5498bd99ba49b6d5371fcf82155ce774d75b611e 100644
--- a/src/main/java/fr/but/infoetu/meetingplannr/repository/RequestRepository.java
+++ b/src/main/java/fr/but/infoetu/meetingplannr/repository/RequestRepository.java
@@ -8,4 +8,6 @@ import fr.but.infoetu.meetingplannr.pojo.Request;
public interface RequestRepository extends JpaRepository<Request, Integer>{
List<Request> findByReasonContainingOrDescriptionContaining(String reason, String description);
+
+ List<Request> findAllByOrderByDateDesc();
}
diff --git a/src/main/java/fr/but/infoetu/meetingplannr/service/UserService.java b/src/main/java/fr/but/infoetu/meetingplannr/service/UserService.java
index 3061da22933d4990771c322965a33865a230094e..edf3b6f456480a5f86cda03b9e0911e26d615cef 100644
--- a/src/main/java/fr/but/infoetu/meetingplannr/service/UserService.java
+++ b/src/main/java/fr/but/infoetu/meetingplannr/service/UserService.java
@@ -38,7 +38,7 @@ public class UserService {
User user = userRepository.findById(uno)
.orElseThrow(() -> new RuntimeException("Utilisateur non trouvé"));
- if (user.getUsername().endsWith("@univ-lille.fr")) {
+ if (user.getUsername().endsWith("@univ-lille.fr") || user.getUsername().endsWith("@gmail.com")) {
MimeMessage message = sender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(message);
diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
index b83d95745e5918d1835504b846c930787da862f0..944db24ae00bcedce535b3e9cc5cce6a15e03e26 100644
--- a/src/main/resources/import.sql
+++ b/src/main/resources/import.sql
@@ -5,7 +5,7 @@ CREATE SEQUENCE users_uno_seq START WITH 1;
INSERT INTO users (uno, username, name, surname, phone_number, birthdate, password, authority, enabled) VALUES (nextval('users_uno_seq'), 'paul.cancel.etu@univ-lille.fr', 'John', 'Doe', '0612345678', '1990-05-15', '$2a$12$o0C1lgpgzoxPrE64DHda6O0DEDqQznVxqXb5y6gzWne3BP4nZMWrC', 'ROLE_USER', true);
-- password: securepwd
-INSERT INTO users (uno, username, name, surname, phone_number, birthdate, password, authority, enabled) VALUES (nextval('users_uno_seq'), 'jane.smith@example.com', 'Jane', 'Smith', '0698765432', '1985-08-22', '$2a$12$9DmwZZv31epkRx6kUOCeueYRCrlAUyV1J0iB6eienUWRKT3ozpLGu', 'ROLE_USER', true);
+INSERT INTO users (uno, username, name, surname, phone_number, birthdate, password, authority, enabled) VALUES (nextval('users_uno_seq'), 'paulcancel7@gmail.com', 'Jane', 'Smith', '0698765432', '1985-08-22', '$2a$12$9DmwZZv31epkRx6kUOCeueYRCrlAUyV1J0iB6eienUWRKT3ozpLGu', 'ROLE_USER', true);
-- password: robert2024
INSERT INTO users (uno, username, name, surname, phone_number, birthdate, password, authority, enabled) VALUES (nextval('users_uno_seq'), 'robert.brown@example.com', 'Robert', 'Brown', '0711121314', '1992-03-12', '$2a$12$bTyqZfn.UGxEXThkvSeU2uKUgO1o6rRadIqg8yYeo9WFLIcnVgGpq', 'ROLE_USER', true);
diff --git a/src/main/resources/static/uploads/1_b277efea-a4ed-45ab-b5c3-ad8449859a79_creepy-looking-monsters-what-could-i-improve-newest-to-v0-cxsgjc3dwfrb1.webp b/src/main/resources/static/uploads/1_b277efea-a4ed-45ab-b5c3-ad8449859a79_creepy-looking-monsters-what-could-i-improve-newest-to-v0-cxsgjc3dwfrb1.webp
new file mode 100644
index 0000000000000000000000000000000000000000..876f3d409c2d557303f8719a28657d3f36ba58f4
Binary files /dev/null and b/src/main/resources/static/uploads/1_b277efea-a4ed-45ab-b5c3-ad8449859a79_creepy-looking-monsters-what-could-i-improve-newest-to-v0-cxsgjc3dwfrb1.webp differ
diff --git a/src/main/resources/static/uploads/6_be99f7e1-0285-4c15-96a3-059a0e82669e_creepy-looking-monsters-what-could-i-improve-newest-to-v0-cxsgjc3dwfrb1.webp b/src/main/resources/static/uploads/6_be99f7e1-0285-4c15-96a3-059a0e82669e_creepy-looking-monsters-what-could-i-improve-newest-to-v0-cxsgjc3dwfrb1.webp
new file mode 100644
index 0000000000000000000000000000000000000000..876f3d409c2d557303f8719a28657d3f36ba58f4
Binary files /dev/null and b/src/main/resources/static/uploads/6_be99f7e1-0285-4c15-96a3-059a0e82669e_creepy-looking-monsters-what-could-i-improve-newest-to-v0-cxsgjc3dwfrb1.webp differ