[client] Improve authentication handling

1 files changed, 16 insertions, 4 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index deeaa5ad..b01e02c2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -25,6 +25,7 @@ import javax.swing.JSeparator;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.bwlp.thrift.iface.WhoamiInfo;
 import org.openslx.dozmod.App;
 import org.openslx.dozmod.Config;
 import org.openslx.dozmod.Config.SavedSession;
@@ -223,12 +224,11 @@ public abstract class MainWindow {
 		if (session != null) {
 			// Wait for proxy server init
 			App.waitForInit();
-			ThriftManager.setSatelliteAddress(session.address);
 			try {
-				ThriftManager.getSatClient().isAuthenticated(session.token);
+				WhoamiInfo whoami = ThriftManager.getNewSatClient(session.address).whoami(session.token);
 				// TODO: Satellite whoami call
-				Session.setSatelliteAddress(session.address);
-				Session.fromSavedSession(session);
+				Session.initialize(whoami, session.address, session.token, session.masterToken);
+				ThriftManager.setSatelliteAddress(Session.getSatelliteAddress());
 				LOGGER.info("Saved session used for resume.");
 			} catch (TException e1) {
 				LOGGER.info("Session resume failed.", e1);
@@ -240,6 +240,8 @@ public abstract class MainWindow {
 			// User did not login, show the login mask
 			LoginWindow.open(mainWindow);
 		}
+		mainWindow.setTitle("bwLehrstuhl - " + Session.getFirstName() + " " + Session.getLastName() + " ["
+				+ Session.getSatelliteAddress() + "]");
 
 		// Show main menu by default
 		showPage(MainMenuWindow.class);
@@ -313,9 +315,19 @@ public abstract class MainWindow {
 		JMenu cascadeFileMenu = new JMenu("File");
 		menuBar.add(cascadeFileMenu);
 
+		JMenuItem logoutItem = new JMenuItem("Logout");
+		cascadeFileMenu.add(logoutItem);
 		JMenuItem exitItem = new JMenuItem("Exit");
 		cascadeFileMenu.add(exitItem);
 
+		logoutItem.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				Config.saveCurrentSession("", "", "");
+				askApplicationQuit();
+			}
+		});
+
 		exitItem.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {