[client] merged the session initializing stuff in ThriftActions.initSession

1 files changed, 8 insertions, 42 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index 3068f8a1..11699b6c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -15,6 +15,7 @@ import java.util.List;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JFrame;
+import javax.swing.JOptionPane;
 
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.Organization;
@@ -38,6 +39,7 @@ import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.window.layout.LoginWindowLayout;
 import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.Sorters;
+import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.cache.OrganizationCache;
 import org.openslx.thrifthelper.ThriftManager;
 import org.openslx.util.QuickTimer;
@@ -326,45 +328,8 @@ public class LoginWindow extends LoginWindowLayout {
 	 */
 	private void postSuccessfulLogin(AuthenticationData data) {
 		LOGGER.info(loginType.toString() + " succeeded, token " + data.satelliteToken);
-
-		// TODO: Show satellite selection if > 1
-		//String satAddress = data.satellites.get(0).addressList.get(0);
-		String satAddress = "132.230.8.113"; // TODO: HACK HACK
-		Client client = ThriftManager.getNewSatelliteClient(GraphicalCertHandler.getSslContext(satAddress),
-				satAddress, App.THRIFT_SSL_PORT, App.THRIFT_TIMEOUT_MS);
-		if (client == null) {
-			Gui.showMessageBox(this, "Login erfolgreich, aber der Satellit antwortet nicht",
-					MessageType.ERROR, LOGGER, null);
-			return;
-		}
-		WhoamiInfo whoami = null;
-		Exception e = null;
-		try {
-			whoami = client.whoami(data.satelliteToken);
-		} catch (TAuthorizationException e1) {
-			Gui.showMessageBox(this,
-					"Authentifizierung erfolgreich, der Satellit verweigert jedoch die Verbindung.\n\n"
-							+ "Grund: " + e1.number.toString() + " (" + e1.message + ")", MessageType.ERROR,
-					null, null);
-			return;
-		} catch (TInvocationException e1) {
-			Gui.showMessageBox(
-					this,
-					"Authentifizierung erfolgreich, bei der Kommunikation mit dem Satelliten trat jedoch ein interner Server-Fehler auf.",
-					MessageType.ERROR, LOGGER, e);
-			return;
-		} catch (Exception ex) {
-			e = ex;
-		}
-		if (whoami != null) {
-			Session.initialize(whoami, satAddress, data.satelliteToken, data.masterToken);
-			ThriftManager.setSatelliteAddress(
-					GraphicalCertHandler.getSslContext(Session.getSatelliteAddress()),
-					Session.getSatelliteAddress(), App.THRIFT_SSL_PORT, App.THRIFT_TIMEOUT_MS);
-			// now read the config to see if the user already agreed to the disclaimer
-			//			if (DisclaimerWindow.shouldBeShown())
-			//				VirtualizerNoticeWindow.open();
-			// Save session (TODO: Extra checkbox)
+		// now try to init the session with the data received
+		if (ThriftActions.initSession(JOptionPane.getFrameForComponent(this), data)) {
 			if (saveUsernameCheck.isSelected()) {
 				Config.saveCurrentSession(Session.getSatelliteAddress(), Session.getSatelliteToken(),
 						Session.getMasterToken());
@@ -372,9 +337,10 @@ public class LoginWindow extends LoginWindowLayout {
 			dispose();
 			return;
 		}
-		Gui.showMessageBox(this,
-				"Authentifizierung erfolgreich, aber der Satellit akzeptiert das Sitzungstoken nicht.",
-				MessageType.ERROR, LOGGER, e);
+//		// did not work
+//		Gui.showMessageBox(this,
+//				"Authentifizierung erfolgreich, aber der Satellit akzeptiert das Sitzungstoken nicht.",
+//				MessageType.ERROR, LOGGER, null);
 	}
 
 	@SuppressWarnings("deprecation")