[client] reworked exceptions handling of BWIDM auth

1 files changed, 16 insertions, 8 deletions

diff --git a/dozentenmodul/src/main/java/gui/core/LoginGUI.java b/dozentenmodul/src/main/java/gui/core/LoginGUI.java
index 5c329d5d..6ca06518 100644
--- a/dozentenmodul/src/main/java/gui/core/LoginGUI.java
+++ b/dozentenmodul/src/main/java/gui/core/LoginGUI.java
@@ -10,6 +10,7 @@ import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Shell;
 import org.openslx.bwlp.thrift.iface.Organization;
+import org.openslx.bwlp.thrift.iface.TAuthenticationException;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.thrifthelper.ThriftManager;
 
@@ -24,6 +25,7 @@ public class LoginGUI extends LoginComposite {
 
 	private final String NO_USERNAME = "Kein Benutzername angegeben!";
 	private final String NO_PASSWORD = "Kein Passwort angegeben!";
+	private final String BAD_AUTH = "Authentifizierung fehlgeschlagen!";
 
 	private String username = null;
 	private String password = null;
@@ -148,14 +150,20 @@ public class LoginGUI extends LoginComposite {
 		case BWIDM:
 			BWIDMAuthenticator bwidmAuth = new BWIDMAuthenticator(
 					selectedOrg.getEcpUrl());
-			bwidmAuth.login(username, password, new AuthenticatorCallback() {
-				@Override
-				public void postLogin(UserInfo user) {
-					LOGGER.info(user.firstName + " " + user.lastName);
-					if (user != null)
-						GuiManager.addContent(new DisclaimerComposite(getShell()));
-				}
-			});
+			try {
+				bwidmAuth.login(username, password, new AuthenticatorCallback() {
+					@Override
+					public void postLogin(UserInfo user) {
+						LOGGER.info(user.firstName + " " + user.lastName);
+						if (user != null)
+							GuiManager.addContent(new DisclaimerComposite(getShell()));
+					}
+				});
+			} catch (TAuthenticationException e) {
+				LOGGER.error("Authentication error, see trace: ", e);
+				GuiManager.showMessage(BAD_AUTH);
+				return;
+			}
 			break;
 		case BWLP:
 			LOGGER.info("bwlp");