diff options
| author | Nino Breuer | 2014-11-28 16:07:58 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-11-28 16:07:58 +0100 |
| commit | c27d50c575ff5867aef8f10ccf2b5f2ac43dae08 (patch) | |
| tree | 5c2e6586338308ce49e21272931e2341ae7d47ec /dozentenmodul/src/main/java/ftp | |
| parent | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff) | |
| download | tutor-module-c27d50c575ff5867aef8f10ccf2b5f2ac43dae08.tar.gz tutor-module-c27d50c575ff5867aef8f10ccf2b5f2ac43dae08.tar.xz tutor-module-c27d50c575ff5867aef8f10ccf2b5f2ac43dae08.zip | |
• changed implementation of user authentication.
• changed position of class file
• fixed some little things (not necessary to mention)
Important Notes:
•organizationID in token returns "wrong" values, therefore university is still set by client. To be fixed someday.
• userID is the value with which the user starts his log in. this value is not represented in the token! (as it is not(!) the email). To be implemented someday, as this value is represented in the masterserver.
• Feature isn't well tested.
Diffstat (limited to 'dozentenmodul/src/main/java/ftp')
| -rw-r--r-- | dozentenmodul/src/main/java/ftp/DownloadTask.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/ftp/DownloadTask.java b/dozentenmodul/src/main/java/ftp/DownloadTask.java index eee607be..ae607c8a 100644 --- a/dozentenmodul/src/main/java/ftp/DownloadTask.java +++ b/dozentenmodul/src/main/java/ftp/DownloadTask.java @@ -11,6 +11,7 @@ import javax.swing.JOptionPane; import javax.swing.SwingWorker; import models.Image; +import models.SessionData; import org.apache.commons.io.FileUtils; import org.apache.log4j.Logger; @@ -152,7 +153,7 @@ public class DownloadTask extends SwingWorker<Void, Void> { LOGGER.debug("Image's ID: " + Image.image.getImageId()); Map<String, String> imageData = null; try { - imageData = models.Client.clientcon.getClient().getImageData(Image.image.getImageId(), Image.image.getVersion()); + imageData = models.Client.clientcon.getClient().getImageData(Image.image.getImageId(), Image.image.getVersion(), SessionData.session.getAuthToken()); } catch (TException e) { LOGGER.error("Thrift exception during transfer, see trace: ", e); return false; |
