Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TASK-6032 - User info does not return projects #2430

Merged
merged 2 commits into from
Apr 23, 2024
Merged

TASK-6032 - User info does not return projects #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50c07cc
catalog: remove user=organizationId exclusion, #TASK-6032
pfurio Apr 15, 2024
ebb082c
Merge branch 'develop' into TASK-6032
pfurio Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/UserMongoDBAdaptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,21 +353,16 @@ private void extractSharedProjects(DataResult<User> userDataResult, QueryOptions
studyMap.put(study.getFqn(), study);
studyProjectMap.put(study.getFqn(), project.getFqn());

String owner = study.getFqn().split("@")[0];

if (study.getGroups() != null) {
for (Group group : study.getGroups()) {
if (StudyManager.MEMBERS.equals(group.getId())) {
// Add all the users that should be able to see the study to the map
for (String userId : group.getUserIds()) {
// Exclude owner of the project
if (!owner.equals(userId)) {
if (users.contains(userId)) {
if (!userStudyMap.containsKey(userId)) {
userStudyMap.put(userId, new ArrayList<>());
}
userStudyMap.get(userId).add(study.getFqn());
if (users.contains(userId)) {
if (!userStudyMap.containsKey(userId)) {
userStudyMap.put(userId, new ArrayList<>());
}
userStudyMap.get(userId).add(study.getFqn());
}
}
break;
Expand All @@ -378,7 +373,7 @@ private void extractSharedProjects(DataResult<User> userDataResult, QueryOptions
}
}

// Add sharedProject information
// Add project information
for (User user : userDataResult.getResults()) {
if (userStudyMap.containsKey(user.getId())) {
Map<String, List<Study>> projectStudyMap = new HashMap<>();
Expand Down
4 changes: 2 additions & 2 deletions opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/UserManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ public OpenCGAResult<User> get(String organizationId, String userId, QueryOption
* @return The requested users
* @throws CatalogException CatalogException
*/
public OpenCGAResult<User> get(String organizationId, List<String> userIdList, QueryOptions options, String token)
public OpenCGAResult<User> get(@Nullable String organizationId, List<String> userIdList, QueryOptions options, String token)
throws CatalogException {
ParamUtils.checkNotEmptyArray(userIdList, "userId");
ParamUtils.checkParameter(token, "token");
Expand All @@ -532,7 +532,7 @@ public OpenCGAResult<User> get(String organizationId, List<String> userIdList, Q
.append("token", token);
JwtPayload jwtPayload = validateToken(token);

if (userIdList.size() == 1 && jwtPayload.getUserId().equals(userIdList.get(0)) && StringUtils.isEmpty(organizationId)) {
if (StringUtils.isEmpty(organizationId)) {
organizationId = jwtPayload.getOrganization();
}
String userId = jwtPayload.getUserId(organizationId);
Expand Down
60 changes: 60 additions & 0 deletions opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/CatalogManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.opencb.opencga.catalog.managers;

import com.mongodb.BasicDBObject;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.Ignore;
Expand Down Expand Up @@ -256,6 +257,65 @@ public void testGetUserInfo() throws CatalogException {
studyAdminToken1);
}

@Test
public void testGetProjectsFromUserInfo() throws CatalogException {
String userId = organizationId;
catalogManager.getUserManager().create(userId, "test", "[email protected]", TestParamConstants.PASSWORD, organizationId, null,
opencgaToken);
catalogManager.getStudyManager().updateGroup(studyFqn, ParamConstants.MEMBERS_GROUP, ParamUtils.BasicUpdateAction.ADD,
new GroupUpdateParams(Collections.singletonList("test")), ownerToken);
String token = catalogManager.getUserManager().login(organizationId, userId, TestParamConstants.PASSWORD).getToken();

DataResult<User> user = catalogManager.getUserManager().get(organizationId, userId, new QueryOptions(), token);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());

user = catalogManager.getUserManager().get(organizationId, normalUserId3, new QueryOptions(), normalToken3);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());

user = catalogManager.getUserManager().get(organizationId, orgOwnerUserId, new QueryOptions(), ownerToken);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());

user = catalogManager.getUserManager().get(organizationId, orgAdminUserId1, new QueryOptions(), orgAdminToken1);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());

user = catalogManager.getUserManager().get(organizationId, studyAdminUserId1, new QueryOptions(), studyAdminToken1);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());

user = catalogManager.getUserManager().get(organizationId, normalUserId1, new QueryOptions(), orgAdminToken1);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());


user = catalogManager.getUserManager().get(null, normalUserId1, new QueryOptions(), normalToken1);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());

user = catalogManager.getUserManager().get(null, normalUserId3, new QueryOptions(), normalToken3);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());

user = catalogManager.getUserManager().get(null, orgOwnerUserId, new QueryOptions(), ownerToken);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());

user = catalogManager.getUserManager().get(null, orgAdminUserId1, new QueryOptions(), orgAdminToken1);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());

user = catalogManager.getUserManager().get(null, studyAdminUserId1, new QueryOptions(), studyAdminToken1);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());

user = catalogManager.getUserManager().get(null, normalUserId1, new QueryOptions(), orgAdminToken1);
assertTrue(CollectionUtils.isNotEmpty(user.first().getProjects()));
System.out.println(user.first().getProjects().size());
}

@Test
public void testModifyUser() throws CatalogException, InterruptedException, IOException {
ObjectMap params = new ObjectMap();
Expand Down
Loading