From 56be910718d8a81e6eefb07b5c77e3af2d9b30d5 Mon Sep 17 00:00:00 2001
From: Nino Breuer
Date: Tue, 26 May 2015 15:57:41 +0200
Subject: • removed "wrong" and unsafe param; is now taken by UserInfo-Object
 from token

---
 .../src/main/java/server/ServerHandler.java         | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'dozentenmodulserver/src/main/java/server')

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