[server] Changed whoami(): return WhoamiInfo

2 files changed, 9 insertions, 3 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions/User.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions/User.java
index fba1126d..a0ed9b94 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions/User.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions/User.java
@@ -254,8 +254,12 @@ public class User {
 		}
 	}
 
+	public static boolean canListImages(UserInfo user) throws TAuthorizationException {
+		return isTutor(user);
+	}
+
 	public static void canListImagesOrFail(UserInfo user) throws TAuthorizationException {
-		if (!isTutor(user))
+		if (!canListImages(user))
 			throw new TAuthorizationException(AuthorizationError.NO_PERMISSION,
 					"No permission to see list of images");
 	}
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
index 4392a249..cd622197 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
@@ -46,6 +46,7 @@ import org.openslx.bwlp.thrift.iface.TransferInformation;
 import org.openslx.bwlp.thrift.iface.TransferStatus;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
+import org.openslx.bwlp.thrift.iface.WhoamiInfo;
 import org.openslx.sat.thrift.version.Version;
 
 public class ServerHandler implements SatelliteServer.Iface {
@@ -154,8 +155,9 @@ public class ServerHandler implements SatelliteServer.Iface {
 	}
 
 	@Override
-	public UserInfo whoami(String userToken) throws TAuthorizationException {
-		return SessionManager.getOrFail(userToken);
+	public WhoamiInfo whoami(String userToken) throws TAuthorizationException {
+		UserInfo user = SessionManager.getOrFail(userToken);
+		return new WhoamiInfo(user, User.isSuperUser(user), User.canListImages(user));
 	}
 
 	@Override