diff --git a/src/main/java/com/sasiedzi/event/config/SecurityConfiguration.java b/src/main/java/com/sasiedzi/event/config/SecurityConfiguration.java index fd94060..da6a327 100644 --- a/src/main/java/com/sasiedzi/event/config/SecurityConfiguration.java +++ b/src/main/java/com/sasiedzi/event/config/SecurityConfiguration.java @@ -120,7 +120,7 @@ public class SecurityConfiguration { .requestMatchers(mvc.pattern("/management/**")).hasAuthority(AuthoritiesConstants.ADMIN) ) .rememberMe( - rememberMe -> rememberMe.rememberMeServices(rememberMeServices()).key("remember-me-cookie-key32342ff") // Klucz do szyfrowania tokenu + rememberMe -> rememberMe.rememberMeServices(rememberMeServices()) // Klucz do szyfrowania tokenu ) .oauth2Login(oauth2 -> oauth2 @@ -134,7 +134,10 @@ public class SecurityConfiguration { @Bean public RememberMeServices rememberMeServices() { - TokenBasedRememberMeServices rememberMeServices = new TokenBasedRememberMeServices("remember-me-key", userDetailsService()); + TokenBasedRememberMeServices rememberMeServices = new TokenBasedRememberMeServices( + "remember-me-cookie-key32342ff", + userDetailsService() + ); rememberMeServices.setTokenValiditySeconds(60 * 60 * 24 * 170); rememberMeServices.setAlwaysRemember(true); // Ustawienie czasu ważności tokenu na 170 dni diff --git a/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java b/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java index 002e4fc..c3b8b1b 100644 --- a/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java +++ b/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java @@ -11,6 +11,7 @@ public class TransactionItemComparator implements Comparator { if (item1 == null && item2 == null) return 0; if (item1 == null) return -1; if (item2 == null) return 1; + if (item1.getId().equals(item2.getId())) return 0; // Teraz porównujemy pola userAccount return compareUserAccounts(item1.getUserAccount(), item2.getUserAccount()); diff --git a/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java b/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java index cb9a208..800eb6b 100644 --- a/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java +++ b/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java @@ -22,6 +22,7 @@ public class UserAccountComparator implements Comparator { if (ua1 == null && ua2 == null) return 0; if (ua1 == null) return -1; if (ua2 == null) return 1; + if (ua1.getId().equals(ua2.getId())) return 0; String name1 = ua1.getName(); String name2 = ua2.getName();