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.
---
 .../java/gui/lecture/PermissionEditLecture_GUI.java  | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java')

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;
-- 
cgit v1.2.3-55-g7522