• 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.

1 files changed, 17 insertions, 18 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index fe956f8f..09a6a966 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -158,14 +158,7 @@ public class DeleteImage_GUI extends JFrame {
 	 * Create the dialog.
 	 */
 	public DeleteImage_GUI(Component formerGUI) {
-		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		
+
 		
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -177,6 +170,12 @@ public class DeleteImage_GUI extends JFrame {
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung nach klick auf X
 				con.closeThriftConnection();
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 
@@ -325,7 +324,7 @@ public class DeleteImage_GUI extends JFrame {
 		try {
 			// Holt sich eine Liste aller verfügbaren Betriebssysteme vom
 			// Server
-			List<String> list = client.getAllOS();
+			List<String> list = client.getAllOS(SessionData.session.getAuthToken());
 			// Leeres Item hinzufuegen
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
@@ -376,7 +375,7 @@ public class DeleteImage_GUI extends JFrame {
 
 				// oeffnet das Hauuetmenue
 				con.closeThriftConnection();
-
+				
 				// oeffnet das Hauuetmenue
 
 				DeleteImage_GUI.this.setVisible(false);
@@ -412,8 +411,7 @@ public class DeleteImage_GUI extends JFrame {
 				String imageid = "";
 				String imageversion = "";
 				int eingabe;
-				String username = person.verantwortlicher.getName() + " "
-						+ person.verantwortlicher.getVorname();
+
 				if (tablemyImages.getSelectedRowCount() != 0) {
 
 					// frage, soll das selektierte Daten geloescht werden?
@@ -441,11 +439,12 @@ public class DeleteImage_GUI extends JFrame {
 
 						try {
 							if (!client.connectedToLecture(imageid,
-									imageversion)) {
+									imageversion,SessionData.session.getAuthToken())) {
 								try {
-									client.deleteImageServer(imageid,
-											imageversion);
-									if (client.deleteImageData(imageid,imageversion)) {
+									
+									client.deleteImageServer(imageid,imageversion, SessionData.session.getAuthToken());
+									
+									if (client.deleteImageData(imageid,imageversion,SessionData.session.getAuthToken())) {
 										
 										LOGGER.info("Image '"+imageid+"' erfolgreich gelöscht.");
 
@@ -787,7 +786,7 @@ public class DeleteImage_GUI extends JFrame {
 				images = client.getImageList(person.verantwortlicher.getUserID());
 			} else {
 				//get permitted list
-				images = client.getImageListPermissionAdmin(person.verantwortlicher.getUserID());
+				images = client.getImageListPermissionAdmin(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 			}
 
 			Iterator<server.generated.Image> i = images.iterator();
@@ -854,7 +853,7 @@ public class DeleteImage_GUI extends JFrame {
 		try {
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-			Map<String, String> res = client.getImageData(id, version);
+			Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken());
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));
 			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));