• started changing the authentification

2 files changed, 32 insertions, 15 deletions

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 561f826f..5bbe2b59 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -279,6 +279,7 @@ public class Login_GUI extends JFrame {
 		
 		GuiOrganizer.centerGUI(this);
 		c = this;
+
 		
 	}// end LoginGUI()
 
@@ -287,9 +288,8 @@ public class Login_GUI extends JFrame {
 		LOGGER.info("Trying login of type: " + loginType);
 
 		
-		if (loginType == LOGIN_TYPE_BWLEHRPOOL) {
-			
-			
+		if (loginType == LOGIN_TYPE_BWLEHRPOOL) 
+		{	
 			// start the authentication process against the masterserver
 			org.openslx.imagemaster.thrift.iface.SessionData result = null;
 			// Connect to Master
@@ -302,7 +302,7 @@ public class Login_GUI extends JFrame {
 				LOGGER.info("Thrift client could not be initialized, is the masterserver up and running?");
 				return;
 			}
-
+			
 			String passText = new String(lblpass.getPassword());
 			UserInfo user = null;
 			// Log user in
diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index a0809546..1671b893 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -48,21 +48,38 @@ public class ServerHandler implements Server.Iface
 	}
 	
 	
+	public boolean checkSession(String authToken) throws InvalidTokenException
+	{
+		//cached proof. if session is valid, return
+		if(SessionData.session.getAuthToken().equals(authToken))
+		{
+			return true;
+		}
+		
+		//else, set session to current token and check against masterserver
+		//TODO change calls from functions
+		SessionData.session.setAuthToken(authToken);
+		
+		return authenticated();
+	}
+	
 	
 	public boolean authenticated() throws InvalidTokenException
 	{
-		MasterThriftConnection thrift = new MasterThriftConnection();
-		client = thrift.getMasterThriftConnection();
-		try {
-			if(client.getUserFromToken(SessionData.session.getAuthToken()) != null)
-			{
-				return true; 
+			//start initial authentication with the masterserver
+			MasterThriftConnection thrift = new MasterThriftConnection();
+			client = thrift.getMasterThriftConnection();
+			try {
+				if(client.getUserFromToken(SessionData.session.getAuthToken()) != null)
+				{
+					return true; 
+				}
+			} catch (TException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
 			}
-		} catch (TException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		log.info("User not authenticated.");
+			log.info("User not authenticated.");
+			
 		return false;
 	}