Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

feat: allow empty mail #59

Merged
Thibaut merged 1 commits from dev into master 2025-11-08 17:45:03 +00:00
Conversation 0 Commits 1 Files Changed 2 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/fr/titionfire/ffsaf/domain/service/MembreService.java
View File

@ -331,7 +331,7 @@ public class MembreService {
return update(repository.findById(id)
.call(__ -> repository.count("email LIKE ?1 AND id != ?2", membre.getEmail(), id)
.invoke(Unchecked.consumer(c -> {
if (c > 0)
if (c > 0 && !membre.getEmail().isBlank())
throw new DBadRequestException("Email déjà utiliser");
})))
.chain(membreModel -> clubRepository.findById(membre.getClub())
@ -353,7 +353,7 @@ public class MembreService {
return update(repository.findById(id)
.call(__ -> repository.count("email LIKE ?1 AND id != ?2", membre.getEmail(), id)
.invoke(Unchecked.consumer(c -> {
if (c > 0)
if (c > 0 && !membre.getEmail().isBlank())
throw new DBadRequestException("Email déjà utiliser");
})))
.invoke(Unchecked.consumer(membreModel -> {

5
src/main/webapp/src/utils/auth.js
View File

@ -9,8 +9,11 @@ export function check_validity(online_callback = () => {
axios.get(`${vite_url}/api/auth/userinfo`).then(data => {
online_callback({state: true, userinfo: data.data});
})
}else{
online_callback({state: false});
}
}).catch(() => {
console.log("=> Not authenticated");
online_callback({state: false});
})
}
@ -32,4 +35,4 @@ export function login_redirect() {
export function logout() {
window.location.href = `${vite_url}/api/logout`;
}
}