summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
diff options
context:
space:
mode:
authorSimon Rettberg2015-09-09 17:40:34 +0200
committerSimon Rettberg2015-09-09 17:40:34 +0200
commit3574378599159ab3dbde9a3279c3c8157bab6796 (patch)
treebee7c35aeb70742991ddbcdde47a609975fae63f /dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
parentRenamed method in MSS (diff)
downloadtutor-module-3574378599159ab3dbde9a3279c3c8157bab6796.tar.gz
tutor-module-3574378599159ab3dbde9a3279c3c8157bab6796.tar.xz
tutor-module-3574378599159ab3dbde9a3279c3c8157bab6796.zip
[client] Use new authentication RPC to master
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java20
1 files changed, 18 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
index f8932a15..a624fc1a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
@@ -23,6 +23,7 @@ import org.openslx.bwlp.thrift.iface.LecturePermissions;
import org.openslx.bwlp.thrift.iface.LectureRead;
import org.openslx.bwlp.thrift.iface.LectureSummary;
import org.openslx.bwlp.thrift.iface.LectureWrite;
+import org.openslx.bwlp.thrift.iface.Satellite;
import org.openslx.bwlp.thrift.iface.SatelliteServer.Client;
import org.openslx.bwlp.thrift.iface.TAuthorizationException;
import org.openslx.bwlp.thrift.iface.TInvocationException;
@@ -96,8 +97,23 @@ public class ThriftActions {
masterToken = session.masterToken;
} else {
// after login
- // TODO sat adress selection popup!!
- address = "132.230.8.113";
+ if (data.satellites == null || data.satellites.isEmpty()) {
+ // TODO: Ask for manual IP address entry
+ Gui.asyncMessageBox(
+ "Login erfolgreich, aber für die gewählte Einrichtung ist kein Satellit registriert",
+ MessageType.ERROR, LOGGER, null);
+ return false;
+ }
+ // TODO: Show list if > 1
+ Satellite sat = data.satellites.get(0);
+ if (sat.addressList == null || sat.addressList.isEmpty()) {
+ // TODO: Ask for manual IP address entry
+ Gui.asyncMessageBox(
+ "Login erfolgreich, aber für den Satelliten ist keine IP-Adresse hinterlegt",
+ MessageType.ERROR, LOGGER, null);
+ return false;
+ }
+ address = sat.addressList.get(0);
satToken = data.satelliteToken;
masterToken = data.masterToken;
}