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. --- .../main/java/gui/lecture/EditLectureLink_GUI.java | 61 ++++++++++------------ 1 file changed, 29 insertions(+), 32 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java') 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(); try { - List list = client.getAllOS(); + List 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 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 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 res = client.getImageData(id, version); + Map 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")))); -- cgit v1.2.3-55-g7522