• removed "wrong" and unsafe param; is now taken by UserInfo-Object from token

2 files changed, 13 insertions, 10 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 52164f6a..455213c7 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -591,7 +591,7 @@ public class SearchEditImage_GUI extends JInternalFrame {
 			} else {
 				//only get permitted list
 				images = ThriftManager.getSatClient().getImageListPermissionWrite(
-						person.verantwortlicher.getUserID(), SessionData.authToken);
+						person.verantwortlicher.getEMail(), SessionData.authToken);
 			}
 
 			TableFiller.fillModelWithImageList(model, images);
diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index 6b97c412..4c0f6d5e 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -287,46 +287,49 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-
+	//@param: userID - deprecated, to be removed while setting up new suite-architecture
 	public List<Image> getImageListPermissionWrite(String userID, String token) throws TException 
 	{
 		if(authenticated(token))
 		{
-
-			return sql.getImageListPermissionWrite(userID);
+			UserInfo ui = getUserFromToken(token);
+			return sql.getImageListPermissionWrite(ui.getUserId());
 		}
 		return null;
 	}
 
 	@Override
+	//@param: userID - deprecated, to be removed while setting up new suite-architecture
 	public List<Image> getImageListPermissionRead(String userID, String token) throws TException 
 	{
 		if(authenticated(token))
 		{
-
-			return sql.getImageListPermissionRead(userID);
+			UserInfo ui = getUserFromToken(token);
+			return sql.getImageListPermissionRead(ui.getUserId());
 		}
 		return null;
 	}
 
 	@Override
+	//@param: userID - deprecated, to be removed while setting up new suite-architecture
 	public List<Image> getImageListPermissionLink(String userID, String token) throws TException 
 	{
 		if(authenticated(token))
 		{
-
-			return sql.getImageListPermissionLink(userID);
+			UserInfo ui = getUserFromToken(token);
+			return sql.getImageListPermissionLink(ui.getUserId());
 		}
 		return null;
 	}
 
 	@Override
+	//@param: userID - deprecated, to be removed while setting up new suite-architecture
 	public List<Image> getImageListPermissionAdmin(String userID, String token) throws TException 
 	{
 		if(authenticated(token))
 		{
-
-			return sql.getImageListPermissionAdmin(userID);
+			UserInfo ui = getUserFromToken(token);
+			return sql.getImageListPermissionAdmin(ui.getUserId());
 		}
 		return null;
 	}