zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-417 fix autologin

Browse source
This commit is contained in:
anhefti 2024-06-19 16:38:30 +02:00
parent 1a5bb6ff7d
commit a31e001f69
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java
View file

@ -130,6 +130,12 @@ public final class InstitutionalAuthenticationEntryPoint implements Authenticati
.getBean(AuthorizationContextHolder.class); .getBean(AuthorizationContextHolder.class);
final SEBServerAuthorizationContext authorizationContext = authorizationContextHolder final SEBServerAuthorizationContext authorizationContext = authorizationContextHolder
.getAuthorizationContext(request.getSession()); .getAuthorizationContext(request.getSession());
// check first if we already have an active session if so, invalidate ir
if (authorizationContext.isLoggedIn()) {
authorizationContext.logout();
}
if (authorizationContext.autoLogin(jwt)) { if (authorizationContext.autoLogin(jwt)) {
forwardToEntryPoint(request, response, this.guiEntryPoint, true); forwardToEntryPoint(request, response, this.guiEntryPoint, true);
return; return;

4
src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/auth/OAuth2AuthorizationContextHolder.java
View file

@ -270,10 +270,6 @@ public class OAuth2AuthorizationContextHolder implements AuthorizationContextHol
@Override @Override
public boolean autoLogin(final String oneTimeToken) { public boolean autoLogin(final String oneTimeToken) {
try { try {
// check first if we already have an active session if so, invalidate ir
if (this.isLoggedIn()) {
this.logout();
}
// Create ad-hoc RestTemplate and call token verification // Create ad-hoc RestTemplate and call token verification
final RestTemplate verifyTemplate = new RestTemplate(this.clientHttpRequestFactory); final RestTemplate verifyTemplate = new RestTemplate(this.clientHttpRequestFactory);