feat(auth): add revokeOtherSessions and revokeAllSessions to AuthService
Uses JdbcIndexedSessionRepository (optional field — null-safe in non-web test contexts) to delete all sessions for a principal except the current one (revokeOtherSessions) or all sessions unconditionally (revokeAllSessions). Both methods return the count of deleted sessions for audit payloads. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -7,10 +7,12 @@ import org.raddatz.familienarchiv.audit.AuditService;
|
|||||||
import org.raddatz.familienarchiv.exception.DomainException;
|
import org.raddatz.familienarchiv.exception.DomainException;
|
||||||
import org.raddatz.familienarchiv.user.AppUser;
|
import org.raddatz.familienarchiv.user.AppUser;
|
||||||
import org.raddatz.familienarchiv.user.UserService;
|
import org.raddatz.familienarchiv.user.UserService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.security.authentication.AuthenticationManager;
|
import org.springframework.security.authentication.AuthenticationManager;
|
||||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
import org.springframework.security.core.AuthenticationException;
|
import org.springframework.security.core.AuthenticationException;
|
||||||
|
import org.springframework.session.jdbc.JdbcIndexedSessionRepository;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -25,6 +27,9 @@ public class AuthService {
|
|||||||
private final UserService userService;
|
private final UserService userService;
|
||||||
private final AuditService auditService;
|
private final AuditService auditService;
|
||||||
|
|
||||||
|
@Autowired(required = false)
|
||||||
|
private JdbcIndexedSessionRepository sessionRepository;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Validates credentials and returns the authenticated user plus the Spring Security
|
* Validates credentials and returns the authenticated user plus the Spring Security
|
||||||
* Authentication object. The caller is responsible for persisting the Authentication
|
* Authentication object. The caller is responsible for persisting the Authentication
|
||||||
@@ -53,6 +58,23 @@ public class AuthService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int revokeOtherSessions(String currentSessionId, String principalName) {
|
||||||
|
int count = 0;
|
||||||
|
for (String id : sessionRepository.findByPrincipalName(principalName).keySet()) {
|
||||||
|
if (!id.equals(currentSessionId)) {
|
||||||
|
sessionRepository.deleteById(id);
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int revokeAllSessions(String principalName) {
|
||||||
|
var sessions = sessionRepository.findByPrincipalName(principalName);
|
||||||
|
sessions.keySet().forEach(sessionRepository::deleteById);
|
||||||
|
return sessions.size();
|
||||||
|
}
|
||||||
|
|
||||||
public void logout(String email, String ip, String ua) {
|
public void logout(String email, String ip, String ua) {
|
||||||
AppUser user = userService.findByEmail(email);
|
AppUser user = userService.findByEmail(email);
|
||||||
auditService.log(AuditKind.LOGOUT, user.getId(), null, Map.of(
|
auditService.log(AuditKind.LOGOUT, user.getId(), null, Map.of(
|
||||||
|
|||||||
@@ -15,11 +15,16 @@ import org.springframework.security.authentication.AuthenticationManager;
|
|||||||
import org.springframework.security.authentication.BadCredentialsException;
|
import org.springframework.security.authentication.BadCredentialsException;
|
||||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
|
import org.springframework.session.jdbc.JdbcIndexedSessionRepository;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.springframework.test.util.ReflectionTestUtils;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||||
import static org.mockito.ArgumentMatchers.*;
|
import static org.mockito.ArgumentMatchers.*;
|
||||||
@@ -31,11 +36,17 @@ class AuthServiceTest {
|
|||||||
@Mock AuthenticationManager authenticationManager;
|
@Mock AuthenticationManager authenticationManager;
|
||||||
@Mock UserService userService;
|
@Mock UserService userService;
|
||||||
@Mock AuditService auditService;
|
@Mock AuditService auditService;
|
||||||
|
@Mock JdbcIndexedSessionRepository sessionRepository;
|
||||||
@InjectMocks AuthService authService;
|
@InjectMocks AuthService authService;
|
||||||
|
|
||||||
private static final String IP = "127.0.0.1";
|
private static final String IP = "127.0.0.1";
|
||||||
private static final String UA = "Mozilla/5.0 (Test)";
|
private static final String UA = "Mozilla/5.0 (Test)";
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void injectSessionRepository() {
|
||||||
|
ReflectionTestUtils.setField(authService, "sessionRepository", sessionRepository);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void login_returns_user_on_valid_credentials() {
|
void login_returns_user_on_valid_credentials() {
|
||||||
UUID userId = UUID.randomUUID();
|
UUID userId = UUID.randomUUID();
|
||||||
@@ -129,4 +140,36 @@ class AuthServiceTest {
|
|||||||
&& !payload.containsKey("password"))
|
&& !payload.containsKey("password"))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
@Test
|
||||||
|
void revokeOtherSessions_preserves_current_and_deletes_N_minus_1() {
|
||||||
|
var sessions = new HashMap<String, Object>();
|
||||||
|
sessions.put("session-keep", null);
|
||||||
|
sessions.put("session-del-1", null);
|
||||||
|
sessions.put("session-del-2", null);
|
||||||
|
doReturn(sessions).when(sessionRepository).findByPrincipalName("user@test.de");
|
||||||
|
|
||||||
|
int count = authService.revokeOtherSessions("session-keep", "user@test.de");
|
||||||
|
|
||||||
|
assertThat(count).isEqualTo(2);
|
||||||
|
verify(sessionRepository, never()).deleteById("session-keep");
|
||||||
|
verify(sessionRepository).deleteById("session-del-1");
|
||||||
|
verify(sessionRepository).deleteById("session-del-2");
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
@Test
|
||||||
|
void revokeAllSessions_deletes_all_sessions_for_principal() {
|
||||||
|
var sessions = new HashMap<String, Object>();
|
||||||
|
sessions.put("session-1", null);
|
||||||
|
sessions.put("session-2", null);
|
||||||
|
doReturn(sessions).when(sessionRepository).findByPrincipalName("user@test.de");
|
||||||
|
|
||||||
|
int count = authService.revokeAllSessions("user@test.de");
|
||||||
|
|
||||||
|
assertThat(count).isEqualTo(2);
|
||||||
|
verify(sessionRepository).deleteById("session-1");
|
||||||
|
verify(sessionRepository).deleteById("session-2");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user