From 62b83a7a18e1878cf8192d80f02c10dffc0478d7 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Sat, 9 May 2020 01:41:41 +0200
Subject: Fix connecting to a new client after exiting a client. Add logo,
 favicon and logout button.

---
 .../bwlp_guac/BwlpAuthenticationProvider.java      | 30 ++--------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

(limited to 'src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java')

diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java
index b902621..0fc7bc8 100644
--- a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java
+++ b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java
@@ -1,21 +1,15 @@
 package de.bwlehrpool.bwlp_guac;
 
-import java.io.IOException;
 import java.util.*;
 
 import org.apache.guacamole.GuacamoleException;
-import org.apache.guacamole.form.TextField;
 import org.apache.guacamole.net.auth.*;
 import org.apache.guacamole.net.auth.credentials.GuacamoleCredentialsException;
-import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
-import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.servlet.http.HttpServletRequest;
-import javax.xml.soap.Text;
 
 import org.apache.guacamole.form.Field;
 import org.apache.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException;
@@ -34,11 +28,6 @@ public class BwlpAuthenticationProvider implements AuthenticationProvider {
 	}
 
 	public AuthenticatedUser authenticateUser(Credentials credentials) throws GuacamoleException {
-		// XXX We can somehow request additional fields to be shown during login by throwing an exception
-		// that declares additional ones; but when I tried, it removed the existing username and password
-		// field, so do we need to state them too? Seems wrong since we don't need them, we'd just want
-		// an additional field to pick the room/location we want to end up in and let the actual
-		// authentication plugin define the username/password fields.
 		return null;
 	}
 
@@ -60,21 +49,7 @@ public class BwlpAuthenticationProvider implements AuthenticationProvider {
 
 	public UserContext decorate(UserContext context, AuthenticatedUser authenticatedUser, Credentials credentials)
 			throws GuacamoleException {
-		String username = authenticatedUser.getCredentials().getUsername();
-
-		LOGGER.warn("decorate called for " + username);
-		BwlpUserContext user = oldMappings.get(username);
-
-		if (user != null)
-			return user;
-
-		int locationid = requestLocation(credentials);
-
-		LOGGER.warn("Doing the decoration");
-		user = new BwlpUserContext(authenticatedUser, context, locationid);
-		oldMappings.put(username, user);
-
-		return user;
+		return context;
 	}
 
 	private Map<String, BwlpUserContext> oldMappings = Collections
@@ -130,8 +105,7 @@ public class BwlpAuthenticationProvider implements AuthenticationProvider {
 				correctPassword = ConnectionManager.getLocationPool().get(selectedId).password;
 			}
 		} catch (Exception e) {
-			LOGGER.info("Error reading location");
-			LOGGER.info(e.toString());
+			LOGGER.info("Error reading location", e);
 			tryAgain = true;
 		}
 
-- 
cgit v1.2.3-55-g7522