logging for Moodle autologin

SafeExamBrowser · Dec 11, 2024 · 037ea8b · 037ea8b
1 parent 8280a73
commit 037ea8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java b/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java
@@ -65,6 +65,7 @@ public final class InstitutionalAuthenticationEntryPoint implements Authenticati
 
 
     private final String defaultLogo;
+    private final GuiServiceInfo guiServiceInfo;
     private final WebserviceURIService webserviceURIService;
     private final ClientHttpRequestFactoryService clientHttpRequestFactoryService;
 
@@ -73,11 +74,13 @@ public InstitutionalAuthenticationEntryPoint(
             @Value("${sebserver.gui.defaultLogo:" + Constants.NO_NAME + "}") final String defaultLogoFileName,
             final WebserviceURIService webserviceURIService,
             final ClientHttpRequestFactoryService clientHttpRequestFactoryService,
-            final ResourceLoader resourceLoader) {
+            final ResourceLoader resourceLoader, 
+            final GuiServiceInfo guiServiceInfo) {
 
         this.guiEntryPoint = guiEntryPoint;
         this.webserviceURIService = webserviceURIService;
         this.clientHttpRequestFactoryService = clientHttpRequestFactoryService;
+        this.guiServiceInfo = guiServiceInfo;
 
         String _defaultLogo;
         if (!Constants.NO_NAME.equals(defaultLogoFileName)) {
@@ -132,11 +135,10 @@ public void commence(
             }
 
             if (authorizationContext.autoLogin(jwt)) {
-                final String uriString = "https://ralph.ethz.ch";
-                log.info("Autologin successful, redirect to: {}", uriString);
+                final String redirect = guiServiceInfo.getExternalServerURIBuilder().toUriString();
+                log.info("Autologin successful, redirect to: {}", redirect);
                 response.setStatus(HttpStatus.TEMPORARY_REDIRECT.value());
-                response.setHeader(HttpHeaders.LOCATION, uriString);
-                //forwardToEntryPoint(request, response, /* this.guiEntryPoint */ "/", true);
+                response.setHeader(HttpHeaders.LOCATION, redirect);
                 return;
             }
         }

diff --git a/...hz/seb/sebserver/gui/service/remote/webservice/auth/OAuth2AuthorizationContextHolder.java b/...hz/seb/sebserver/gui/service/remote/webservice/auth/OAuth2AuthorizationContextHolder.java
@@ -192,7 +192,6 @@ public boolean isValid() {
         public boolean isLoggedIn() {
             final OAuth2AccessToken accessToken = this.restTemplate.getOAuth2ClientContext().getAccessToken();
             if (accessToken == null || StringUtils.isEmpty(accessToken.toString())) {
-                log.warn("No Access Token for user: {}", this.restTemplate.getOAuth2ClientContext().getAccessTokenRequest().getHeaders());
                 return false;
             }
 
@@ -293,9 +292,6 @@ public boolean autoLogin(final String oneTimeToken) {
                 final TokenLoginInfo loginInfo = response.getBody();
                 this.resource.setUsername(loginInfo.username);
                 this.resource.setPassword(loginInfo.userUUID);
-
-//                this.restTemplate.getOAuth2ClientContext().setAccessToken(null);
-//                this.restTemplate.getAccessToken();
                 this.restTemplate.getOAuth2ClientContext().setAccessToken(loginInfo.login);
 
                 loginForward = loginInfo.login_forward;