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

9 files changed, 143 insertions, 120 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
index 9f2c56d1..9ea9f779 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -39,10 +39,14 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
+import org.apache.thrift.TException;
+
 import models.Image;
 import models.Lecture;
 import models.Links;
+import models.SessionData;
 import models.person;
+import server.generated.Server.Client;
 import util.GuiOrganizer;
 import util.OpenLinks;
 
@@ -68,6 +72,7 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 	Date startDate = new Date();
 	Date endDate;
 	Component c = null;
+	Client client = models.Client.clientcon.getClient();
 	private boolean descriptionLengthOK = false; // description may not be
 													// longer than
 													// MAX_DESCRIPTION_LENGTH
@@ -90,6 +95,12 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 8559c68a..2549e60f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -136,13 +136,7 @@ public class CreateLectureLink_GUI extends JFrame {
 	 * Create the dialog.
 	 */
 	public CreateLectureLink_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);
@@ -150,6 +144,12 @@ public class CreateLectureLink_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				con.closeThriftConnection();
 				System.exit(0);
 			}
@@ -303,7 +303,7 @@ public class CreateLectureLink_GUI extends JFrame {
 
 		comboBox = new JComboBox<String>();
 		try {
-			List<String> list = client.getAllOS();
+			List<String> list = client.getAllOS(SessionData.session.getAuthToken());
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
 				comboBox.addItem(list.get(i));
@@ -464,26 +464,22 @@ public class CreateLectureLink_GUI extends JFrame {
 										formatter.format(Lecture.lecture.getEnddate()).toString(),
 										Lecture.lecture.isActive(),
 										imageID,
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getEMail(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
-										uuid);
+										uuid,
+										person.verantwortlicher.getHochschule());
 								System.out.println("imageID" + " " + imageID);
 								System.out.println("lectureID" + " " + uuid);
 								//set rights for this user
 								
 								client.writeLectureRights(
 										uuid,
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getEMail(),
+										person.verantwortlicher.getRole(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getRole());
+										person.verantwortlicher.getUserID()
+										);
 								
 								//set rights for additional users
 								for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++){
@@ -493,7 +489,8 @@ public class CreateLectureLink_GUI extends JFrame {
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read(),
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write(),
-											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin()
+											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin(),
+											SessionData.session.getAuthToken()
 											);
 								
 								}//end for
@@ -744,7 +741,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		
 		try 
 		{
-			uuid = client.createRandomUUID();
+			uuid = client.createRandomUUID(SessionData.session.getAuthToken());
 		} 
 		catch (TException e1) 
 		{
@@ -766,7 +763,7 @@ public class CreateLectureLink_GUI extends JFrame {
 			//get complete list
 			images = client.getImageList(person.verantwortlicher.getUserID());
 		} else {		
-			images = client.getImageListPermissionLink(person.verantwortlicher.getUserID());
+			images = client.getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		}
 
 		Iterator<server.generated.Image> i = images.iterator();
@@ -818,7 +815,7 @@ public class CreateLectureLink_GUI extends JFrame {
 
 		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"))));
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 58fadc72..6d908413 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -107,20 +107,13 @@ public class DeleteLecture_GUI extends JFrame {
 			+ "</div></html>";
 
 	RowFilter rf = null;
-	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(
-			2);
+	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2);
 
 	/**
 	 * Create the dialog.
 	 */
 	public DeleteLecture_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);
@@ -129,6 +122,12 @@ public class DeleteLecture_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung nach klick auf X
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				con.closeThriftConnection();
 				System.exit(0);
 			}
@@ -152,6 +151,7 @@ public class DeleteLecture_GUI extends JFrame {
 				// 6=Image
 				// 7=Schlagwort
 				// 8=ID
+
 				tablemyLectures.getColumnModel().getColumn(1).setWidth(0);
 				tablemyLectures.getColumnModel().getColumn(1).setMinWidth(0);
 				tablemyLectures.getColumnModel().getColumn(1).setMaxWidth(0);
@@ -176,10 +176,12 @@ public class DeleteLecture_GUI extends JFrame {
 				tablemyLectures.addMouseListener(new MouseAdapter() {
 
 					@Override
-					public void mouseReleased(MouseEvent e) {
+					public void mouseReleased(MouseEvent e) 
+					{
 
 						tablemyLectures.clearSelection(); //just one row is selectablemyLectures
 						tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()), tablemyLectures.rowAtPoint(e.getPoint())); 
+						System.out.println(tablemyLectures.getSelectedRow());
 					}
 				});
 
@@ -201,7 +203,7 @@ public class DeleteLecture_GUI extends JFrame {
 		// Zentriert das Fenster in die Bildmitte
 		setBounds(0, 0, 842, 722);
 		setLocationRelativeTo(formerGUI);
-
+		
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -210,8 +212,7 @@ public class DeleteLecture_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel(
-						"Zu löschende Veranstaltung wählen");
+				JLabel lblNewLabel = new JLabel("Zu löschende Veranstaltung wählen");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -238,7 +239,7 @@ public class DeleteLecture_GUI extends JFrame {
 		panel_1.setBounds(10, 49, 557, 64);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
-
+		
 		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
 		lblNewLabel_2.setBounds(30, 30, 80, 20);
 		panel_1.add(lblNewLabel_2);
@@ -379,14 +380,22 @@ public class DeleteLecture_GUI extends JFrame {
 						lectureID = modelMyLectures
 								.getValueAt(
 										tablemyLectures
-												.convertColumnIndexToModel(tablemyLectures
-														.getSelectedRow()), 8)
-								.toString();
+												.convertRowIndexToModel(tablemyLectures
+														.getSelectedRow()),
+										8).toString();
+						
+						//int test = tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow());
+						
+						
 						// LOGGER.info("Lösche Veranstaltung: " + lectureID);
 						try {
-							if (client.deleteLecture(lectureID,
-									person.verantwortlicher.getHochschule(),
-									person.verantwortlicher.getUsername())) {
+							if (client.deleteLecture(
+									lectureID,
+									SessionData.session.getAuthToken(),
+									person.verantwortlicher.getHochschule()
+									)
+									)
+							{
 								
 								// delete successful
 								LOGGER.info("Veranstaltung erfolgreich '"+lectureID+"' gelöscht.");
@@ -615,15 +624,17 @@ public class DeleteLecture_GUI extends JFrame {
 			throws ParseException {
 		List<server.generated.Lecture> lectures;
 		try {
-			
 		
 			// Hole eine Liste der erlaubten Images für die diese Person
-			if(person.verantwortlicher.getRole()=="Admin"){
+			if(person.verantwortlicher.getRole()=="Admin")
+			{
 				//get complete list
-				lectures = client.getLectureList();
-			} else {
+				lectures = client.getLectureList(SessionData.session.getAuthToken());
+			} 
+			else 
+			{
 				//get permitted list
-				lectures = client.getLectureListPermissionAdmin(person.verantwortlicher.getUserID());
+				lectures = client.getLectureListPermissionAdmin(SessionData.session.getAuthToken());
 			}
 			
 			Iterator<server.generated.Lecture> i = lectures.iterator();
@@ -648,12 +659,12 @@ public class DeleteLecture_GUI extends JFrame {
 				i.next();
 
 			}
-
 			return model;
 		} catch (TException e1) {
 
 			e1.printStackTrace();
 		}
+		
 		return model;
 	}
 
@@ -677,7 +688,7 @@ public class DeleteLecture_GUI extends JFrame {
 
 		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.getLectureData(id);
+		Map<String, String> res = client.getLectureData(id,SessionData.session.getAuthToken());
 		labelName.setText(res.get("name"));
 		labelAktiv.setText(res.get("isActive"));
 		labeldesc.setText(res.get("desc"));
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index 1d144c89..eae7a49c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -47,6 +47,7 @@ import models.Image;
 import models.ItemOwner;
 import models.Lecture;
 import models.Links;
+import models.SessionData;
 //import models.person;
 import models.person;
 
@@ -99,6 +100,12 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 		});
@@ -498,7 +505,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 
 							//check which GUI to open
 							try {
-								if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid())){
+								if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken())){
 									//user is admin of the lecture
 									PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c);
 									ev.setVisible(true);
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index d1fe57e3..a92b2dec 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -150,16 +150,16 @@ public class EditLectureLink_GUI extends JFrame {
 	 */
 	public EditLectureLink_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				con.closeThriftConnection();
 				System.exit(0);
 			}
@@ -416,7 +416,7 @@ public class EditLectureLink_GUI extends JFrame {
 
 		comboBox = new JComboBox<String>();
 		try {
-			List<String> list = client.getAllOS();
+			List<String> list = client.getAllOS(SessionData.session.getAuthToken());
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
 				comboBox.addItem(list.get(i));
@@ -630,7 +630,7 @@ public class EditLectureLink_GUI extends JFrame {
 						
 						//check which GUI to open
 						try {
-							if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid())){
+							if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken())){
 								//user is admin of the lecture
 								PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c);
 								ev.setVisible(true);
@@ -692,19 +692,17 @@ public class EditLectureLink_GUI extends JFrame {
 																.convertRowIndexToModel(tablemyImages
 																		.getSelectedRow()),
 														7).toString(),
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getEMail(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
-										Lecture.lecture.getid());
+										Lecture.lecture.getid(),
+										person.verantwortlicher.getHochschule());
 
 								// remove all additional user permissions on
 								// first stage
 								client.deleteAllAdditionalLecturePermissions(
 										Lecture.lecture.getid(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getUserID());
 
 								// then, add user permissions as they have been
@@ -741,7 +739,8 @@ public class EditLectureLink_GUI extends JFrame {
 													.get(i).isLecture_write(),// write
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
-													.get(i).isLecture_admin()// admin
+													.get(i).isLecture_admin(),// admin
+											SessionData.session.getAuthToken()
 									);
 
 								}// end for
@@ -810,19 +809,17 @@ public class EditLectureLink_GUI extends JFrame {
 																.convertRowIndexToModel(tablePublicVorlagen
 																		.getSelectedRow()),
 														7).toString(),
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getEMail(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
-										Lecture.lecture.getid());
+										Lecture.lecture.getid(),
+										person.verantwortlicher.getHochschule());
 
 								// remove all additional user permissions on
 								// first stage
 								client.deleteAllAdditionalLecturePermissions(
 										Lecture.lecture.getid(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getUserID());
 
 								// then, add user permissions as they have been
@@ -853,7 +850,8 @@ public class EditLectureLink_GUI extends JFrame {
 													.get(i).isImageWrite(),// write
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
-													.get(i).isImageAdmin()// admin
+													.get(i).isImageAdmin(),// admin
+											SessionData.session.getAuthToken()		
 									);
 								}
 
@@ -918,19 +916,17 @@ public class EditLectureLink_GUI extends JFrame {
 														.convertRowIndexToModel(tableAllImages
 																.getSelectedRow()),
 												7).toString(),
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getEMail(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
-										Lecture.lecture.getid());
+										Lecture.lecture.getid(),
+										person.verantwortlicher.getHochschule());
 
 								// remove all additional user permissions on
 								// first stage
 								client.deleteAllAdditionalLecturePermissions(
 										Lecture.lecture.getid(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getUserID());
 
 								// then, add user permissions as they have been
@@ -961,7 +957,8 @@ public class EditLectureLink_GUI extends JFrame {
 													.get(i).isImageWrite(),// write
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
-													.get(i).isImageAdmin()// admin
+													.get(i).isImageAdmin(),// admin
+											SessionData.session.getAuthToken()
 									);
 								}
 
@@ -1224,7 +1221,7 @@ public class EditLectureLink_GUI extends JFrame {
 		} else {
 			//get permitted list
 			images = client.getImageListPermissionLink(person.verantwortlicher
-				.getUserID());
+				.getUserID(),SessionData.session.getAuthToken());
 		}
 
 		Iterator<server.generated.Image> i = images.iterator();
@@ -1260,7 +1257,7 @@ public class EditLectureLink_GUI extends JFrame {
 
 			// Hole eine Liste der Images
 			//images = client.getImageListPermissionLink(person.verantwortlicher.getUserID());
-			images = client.getImageListAllTemplates();
+			images = client.getImageListAllTemplates(SessionData.session.getAuthToken());
 
 			Iterator<server.generated.Image> i = images.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1312,7 +1309,7 @@ public class EditLectureLink_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"))));
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index 6131350c..92981146 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -114,12 +114,6 @@ public class EditLectureSearch_GUI extends JFrame {
 	 */
 	public EditLectureSearch_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);
@@ -128,6 +122,12 @@ public class EditLectureSearch_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung nach klick auf X
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				con.closeThriftConnection();
 				System.exit(0);
 			}
@@ -665,10 +665,10 @@ public class EditLectureSearch_GUI extends JFrame {
 			// Hole eine Liste der erlaubten Images für die diese Person
 			if(person.verantwortlicher.getRole()=="Admin"){
 				//get complete list
-				lectures = client.getLectureList();
+				lectures = client.getLectureList(SessionData.session.getAuthToken());
 			} else {
 				//get permitted list
-				lectures = client.getLectureListPermissionWrite(person.verantwortlicher.getUserID());
+				lectures = client.getLectureListPermissionWrite(SessionData.session.getAuthToken());
 			}
 			
 			Iterator<server.generated.Lecture> i = lectures.iterator();
@@ -724,7 +724,7 @@ public class EditLectureSearch_GUI extends JFrame {
 
 		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.getLectureData(id);
+		Map<String, String> res = client.getLectureData(id,SessionData.session.getAuthToken());
 		labelName.setText(res.get("name"));
 		labelAktiv.setText(res.get("isActive"));
 		labeldesc.setText(res.get("desc"));
@@ -742,7 +742,7 @@ public class EditLectureSearch_GUI extends JFrame {
 
 		try {
 			// get values from server and set them in model
-			map = client.getItemOwner(lectureid);
+			map = client.getItemOwner(lectureid,SessionData.session.getAuthToken());
 
 			ItemOwner.itemOwner.setUserID(map.get("userID"));
 			ItemOwner.itemOwner.setUsername(map.get("loginName"));
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index 2fb0cc7a..f32648f0 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -1,7 +1,6 @@
 package gui.lecture;
 
 import gui.intro.About_GUI;
-import gui.intro.ListAllOtherUsers_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -64,6 +63,7 @@ import org.apache.thrift.TException;
 import server.generated.Person;
 import server.generated.Server.Client;
 import util.CheckIntegrity;
+import util.ListAllOtherUsers_GUI;
 import util.OpenLinks;
 
 @SuppressWarnings("serial")
@@ -123,16 +123,16 @@ public class PermissionCreateLecture_GUI extends JFrame {
 
 	public PermissionCreateLecture_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 		});
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index db947b27..52e9746a 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -2,7 +2,6 @@ package gui.lecture;
 
 import gui.image.PermissionCreateImage_GUI;
 import gui.intro.About_GUI;
-import gui.intro.ListAllOtherUsers_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -59,6 +58,7 @@ import models.person;
 import server.generated.Person;
 import server.generated.Server.Client;
 import util.CheckIntegrity;
+import util.ListAllOtherUsers_GUI;
 import util.OpenLinks;
 import javax.swing.JCheckBox;
 
@@ -106,16 +106,16 @@ public class PermissionEditLecture_GUI extends JFrame {
 
 	public PermissionEditLecture_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		
+
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 		});
@@ -239,8 +239,8 @@ public class PermissionEditLecture_GUI extends JFrame {
 			try {
 
 				map = client.getPermissionForUserAndLecture(
-						person.verantwortlicher.getUserID(),
-						Lecture.lecture.getid());
+						SessionData.session.getAuthToken(),Lecture.lecture.getid(),person.verantwortlicher.getUserID()
+						);
 				Iterator<server.generated.Person> i = map.iterator();
 
 				int x = 0;
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 7401dc1c..fc00997f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -119,13 +119,7 @@ public class SearchLecture_GUI extends JFrame {
 	 * Create the dialog.

 	 */

 	public SearchLecture_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);

@@ -136,6 +130,12 @@ public class SearchLecture_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);

 			}

 			@Override

@@ -633,10 +633,10 @@ public class SearchLecture_GUI extends JFrame {
 			// Hole eine Liste der erlaubten Images für die diese Person

 			if(person.verantwortlicher.getRole()=="Admin"){

 				//get complete list

-				lectures = client.getLectureList();

+				lectures = client.getLectureList(SessionData.session.getAuthToken());

 			} else {

 				//get permitted list			

-				lectures = client.getLectureListPermissionRead(person.verantwortlicher.getUserID());

+				lectures = client.getLectureListPermissionRead(SessionData.session.getAuthToken());

 			}

 			

 			Iterator<server.generated.Lecture> i = lectures.iterator();

@@ -675,7 +675,7 @@ public class SearchLecture_GUI extends JFrame {
 		try {

 			// Hole eine Liste der erlaubten Images für die diese Person

 			//lectures = client.getLectureList();

-			lectures = client.getLectureList();

+			lectures = client.getLectureList(SessionData.session.getAuthToken());

 			Iterator<server.generated.Lecture> i = lectures.iterator();

 			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

@@ -726,7 +726,7 @@ public class SearchLecture_GUI extends JFrame {
  

 			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.getLectureData(id);

+			Map<String,String> res=client.getLectureData(id,SessionData.session.getAuthToken());

 			labelName.setText(res.get("name"));

 			labelAktiv.setText(res.get("isActive"));

 			labeldesc.setText(res.get("desc"));