develop #241

Merged
judaur2005 merged 2 commits from develop into main 2026-07-04 10:39:33 +00:00
2 changed files with 16 additions and 10 deletions

View File

@@ -20,6 +20,7 @@ import io.gmss.fiscad.service.EntityFromPayLoadService;
import io.gmss.fiscad.service.MailService;
import io.gmss.fiscad.service.StringService;
import lombok.AllArgsConstructor;
import org.modelmapper.internal.bytebuddy.implementation.bytecode.Throw;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@@ -269,9 +270,14 @@ public class UserServiceImpl implements UserService {
@Override
public UserPaylaodWeb resetPasswordByMail(String token, String password) {
User user = userRepository.findByToken(token).orElseThrow(() -> new NotFoundException(
String.format("Token %s invalide ou inexistant.", token)
));
Optional<User> optionalUser = userRepository.findByToken(token);
if(optionalUser.isEmpty()){
throw new ApplicationException( String.format("Token %s invalide ou inexistant.", token));
}
User user=optionalUser.get();
user.setPassword(passwordEncoder.encode(password));
user.setResetPassword(false);
user= userRepository.save(user);

View File

@@ -2,16 +2,16 @@ server.port=8282
io.gmss.fiscad.profile=test
# LOCAL ENV TEST
spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi
spring.datasource.username=infocad_user
spring.datasource.password=W5fwD({9*q53
#spring.datasource.url=jdbc:postgresql://193.181.208.4:5432/fiscad_db
#spring.datasource.username=fiscad_user
#spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi
#spring.datasource.username=infocad_user
#spring.datasource.password=W5fwD({9*q53
spring.datasource.url=jdbc:postgresql://193.181.208.4:5432/fiscad_db
spring.datasource.username=fiscad_user
spring.datasource.password=W5fwD({9*q53
app.default-user.username=fiscad_admin
app.default-user.password=1234567890