Onkel-Werner-Freizeiten/CampOrganizer2
1
1
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

corrected username check and dropdown size, see #57

Browse Source
This commit is contained in:
Jottyfan
2023-09-21 21:32:18 +02:00
parent 497a4dfcf9
commit 12a325ee03
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationRepository.java
View File

@@ -94,7 +94,7 @@ public class RegistrationRepository {
SelectConditionStep<TProfileRecord> sql = jooq
// @formatter:off
.selectFrom(T_PROFILE)
.where(T_PROFILE.USERNAME.eq(login));
.where(DSL.lower(T_PROFILE.USERNAME).eq(login));
// @formatter:on
LOGGER.debug(sql);
return sql.fetch().size() < 1;
@@ -111,9 +111,9 @@ public class RegistrationRepository {
LambdaResultWrapper lrw = new LambdaResultWrapper();
jooq.transaction(t -> {
if (bean.getLogin() != null && !bean.getLogin().isEmpty()) {
Boolean loginNotYetInUse = isLoginNotYetInUse(bean.getLogin());
Boolean loginNotYetInUse = isLoginNotYetInUse(bean.getLogin().toLowerCase());
if (bean.getRegisterInKeycloak() && !loginNotYetInUse) {
throw new DataAccessException("login already in use: " + bean.getLogin());
throw new DataAccessException("login already in use: " + bean.getLogin().toLowerCase());
}
Integer fkProfile = null;
if (loginNotYetInUse) {
@@ -127,7 +127,7 @@ public class RegistrationRepository {
T_PROFILE.PASSWORD,
T_PROFILE.DUEDATE,
T_PROFILE.UUID)
.values(bean.getForename(), bean.getSurname(), bean.getLogin(), oldPassword, LocalDateTime.now().plus(356, ChronoUnit.DAYS), UUID.nameUUIDFromBytes(bean.getLogin().getBytes()).toString())
.values(bean.getForename(), bean.getSurname(), bean.getLogin().toLowerCase(), oldPassword, LocalDateTime.now().plus(356, ChronoUnit.DAYS), UUID.nameUUIDFromBytes(bean.getLogin().getBytes()).toString())
.returning(T_PROFILE.PK);
// @formatter:on
LOGGER.debug(sql1.toString());
@@ -147,7 +147,7 @@ public class RegistrationRepository {
// @formatter:off
.select(T_PROFILE.PK)
.from(T_PROFILE)
.where(T_PROFILE.USERNAME.eq(bean.getLogin()));
.where(DSL.lower(T_PROFILE.USERNAME).eq(bean.getLogin().toLowerCase()));
// @formatter:on
LOGGER.debug(sql1.toString());
fkProfile = sql1.fetchOne().get(T_PROFILE.PK);