From c27d50c575ff5867aef8f10ccf2b5f2ac43dae08 Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Fri, 28 Nov 2014 16:07:58 +0100 Subject: • 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. --- dozentenmodul/src/main/java/ftp/DownloadTask.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dozentenmodul/src/main/java/ftp/DownloadTask.java') 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 { LOGGER.debug("Image's ID: " + Image.image.getImageId()); Map 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; -- cgit v1.2.3-55-g7522