Skip to content
Snippets Groups Projects
Commit 2390115f authored by Jessie Ragot's avatar Jessie Ragot
Browse files

App functional before merge with main

parent d5a960f2
No related branches found
No related tags found
1 merge request!19[feature]models-change+authentification+registration
...@@ -25,14 +25,13 @@ public class DoctorController { ...@@ -25,14 +25,13 @@ public class DoctorController {
return "doctors"; return "doctors";
} }
// Formulaire pour ajouter un médecin
@GetMapping("/create") @GetMapping("/create")
public String showCreateForm(Model model) { public String showCreateForm(Model model) {
model.addAttribute("doctor", new Doctor()); model.addAttribute("doctor", new Doctor());
return "create-doctor"; return "create-doctor";
} }
// POST pour enregistrer un médecin
@PostMapping @PostMapping
public String createDoctor(@ModelAttribute Doctor doctor) { public String createDoctor(@ModelAttribute Doctor doctor) {
doctorService.saveDoctor(doctor); doctorService.saveDoctor(doctor);
......
...@@ -16,14 +16,12 @@ public class UserController { ...@@ -16,14 +16,12 @@ public class UserController {
this.userService = userService; this.userService = userService;
} }
// Affiche le formulaire d'inscription
@GetMapping("/register") @GetMapping("/register")
public String showRegistrationForm(Model model) { public String showRegistrationForm(Model model) {
model.addAttribute("userDTO", new UserRegistrationDTO()); model.addAttribute("userDTO", new UserRegistrationDTO());
return "register"; return "register";
} }
// Traite le formulaire d'inscription
@PostMapping("/register") @PostMapping("/register")
public String registerUser(@ModelAttribute("userDTO") UserRegistrationDTO userDTO, Model model) { public String registerUser(@ModelAttribute("userDTO") UserRegistrationDTO userDTO, Model model) {
try { try {
......
...@@ -36,9 +36,9 @@ public class SecurityConfig { ...@@ -36,9 +36,9 @@ public class SecurityConfig {
.loginPage("/login") .loginPage("/login")
.usernameParameter("email") .usernameParameter("email")
.passwordParameter("password") .passwordParameter("password")
.defaultSuccessUrl("/", false) // Redirige vers l'accueil en évitant la boucle infinie .defaultSuccessUrl("/", false)
.successHandler((request, response, authentication) -> { .successHandler((request, response, authentication) -> {
if (response.isCommitted()) return; // Évite une double redirection if (response.isCommitted()) return;
String role = authentication.getAuthorities().iterator().next().getAuthority(); String role = authentication.getAuthorities().iterator().next().getAuthority();
...@@ -58,7 +58,7 @@ public class SecurityConfig { ...@@ -58,7 +58,7 @@ public class SecurityConfig {
.sessionManagement(session -> session .sessionManagement(session -> session
.maximumSessions(1) .maximumSessions(1)
.expiredUrl("/login?expired=true") // Redirige proprement si la session expire .expiredUrl("/login?expired=true")
) )
.logout(logout -> logout .logout(logout -> logout
......
package com.projet.projetIndu.services; package com.projet.projetIndu.services;
import com.projet.projetIndu.entities.Doctor;
import com.projet.projetIndu.entities.Patient; import com.projet.projetIndu.entities.Patient;
import com.projet.projetIndu.repositories.PatientRepository; import com.projet.projetIndu.repositories.PatientRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
...@@ -40,13 +38,3 @@ public class PatientService { ...@@ -40,13 +38,3 @@ public class PatientService {
patientRepository.deleteById(id); patientRepository.deleteById(id);
} }
} }
// /// En dur
// public List<Patient> getAllPatient() {
// return Arrays.asList(
// new Patient(1L, "Pierre", "Martinez", "10/05/1980", "0654789652", "jean.dupont@email.com", "1 rue de Paris", "Pollen", "Aspirine"),
// new Patient(2L, "Marine", "Boz", "19/10/2001", "066666666", "marine.boz@email.com", "10 rue de Marseille", "Péniciline", "Bisoce"),
// new Patient(3L, "Laurie", "Marie", "23/11/1994", "0778456985", "marie.durand@email.com", "2 avenue des Lilas", "Arachides", "Paracétamol")
// );
...@@ -46,7 +46,6 @@ public class UserService implements UserDetailsService { ...@@ -46,7 +46,6 @@ public class UserService implements UserDetailsService {
} }
public User registerUser(UserRegistrationDTO userDTO) { public User registerUser(UserRegistrationDTO userDTO) {
// Vérifier si un utilisateur avec cet email existe déjà
if (userRepository.existsByEmail(userDTO.getEmail())) { if (userRepository.existsByEmail(userDTO.getEmail())) {
throw new IllegalArgumentException("Email already taken"); throw new IllegalArgumentException("Email already taken");
} }
...@@ -79,7 +78,6 @@ public class UserService implements UserDetailsService { ...@@ -79,7 +78,6 @@ public class UserService implements UserDetailsService {
throw new IllegalArgumentException("Invalid role provided: " + userDTO.getRole()); throw new IllegalArgumentException("Invalid role provided: " + userDTO.getRole());
} }
// Remplissage des données utilisateur
user.setFirstName(userDTO.getFirstName()); user.setFirstName(userDTO.getFirstName());
user.setLastName(userDTO.getLastName()); user.setLastName(userDTO.getLastName());
user.setPhoneNumber(userDTO.getPhoneNumber()); user.setPhoneNumber(userDTO.getPhoneNumber());
...@@ -100,7 +98,7 @@ public class UserService implements UserDetailsService { ...@@ -100,7 +98,7 @@ public class UserService implements UserDetailsService {
return org.springframework.security.core.userdetails.User return org.springframework.security.core.userdetails.User
.withUsername(user.getEmail()) .withUsername(user.getEmail())
.password(user.getPassword()) .password(user.getPassword())
.authorities(user.getClass().getSimpleName()) // Utilisation de la classe comme rôle .authorities(user.getClass().getSimpleName())
.build(); .build();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment