privilege checking for not admin fixed

rest-api/src/test/java/lcsb/mapviewer/api/projects/ProjectRestImplTest.java

@@ -7,6 +7,8 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.times;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
@@ -159,6 +161,19 @@ public class ProjectRestImplTest extends RestTestFunctions {
 		}
 	}
 
+	@Test
+	public void testGetProjects() throws Exception {
+		try {
+			ProjectRestImpl projectRest = createMockProjectRest("testFiles/model/sample.xml");
+			List<ProjectMetaData> result = projectRest.getProjects(token.getId());
+			Gson gson = new Gson();
+			assertNotNull(gson.toJson(result));
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw e;
+		}
+	}
+
 	@Test
 	public void testGetStatistics() throws Exception {
 		try {
@@ -208,6 +223,9 @@ public class ProjectRestImplTest extends RestTestFunctions {
 
 		IProjectService projectServiceMock = Mockito.mock(IProjectService.class);
 		Mockito.when(projectServiceMock.getProjectByProjectId(anyString(), any())).thenReturn(project);
+		List<Project> projects = new ArrayList<>();
+		projects.add(project);
+		Mockito.when(projectServiceMock.getAllProjects(any())).thenReturn(projects);
 		_projectRestImpl.setProjectService(projectServiceMock);
 
 		return _projectRestImpl;

service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java

@@ -291,7 +291,7 @@ public class ProjectService implements IProjectService {
 		}
 		List<Project> result = new ArrayList<>();
 		for (Project project : projects) {
-			if (userService.userHasPrivilege(token, PrivilegeType.VIEW_PROJECT, result)) {
+			if (userService.userHasPrivilege(token, PrivilegeType.VIEW_PROJECT, project)) {
 				result.add(project);
 			}
 		}

service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceTest.java

@@ -82,6 +82,19 @@ public class ProjectServiceTest extends ServiceTestFunctions {
 	public void tearDown() throws Exception {
 	}
 
+	@Test
+	public void testGetProjectWithoutAccessToEverything() {
+		try {
+			createUser();
+			AuthenticationToken token = userService.login(user.getLogin(), "passwd");
+			List<Project> projects = projectService.getAllProjects(token);
+			assertNotNull(projects);
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw e;
+		}
+	}
+
 	@Test
 	public void test() {
 		try {