This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit fb5b5464 authored by Philipp Gritsch's avatar Philipp Gritsch Committed by Michael Breu
Browse files

attempts to fix #501

parent dd3f4d98
2 merge requests!284Preparing August Release,!260Resolve "Sharing Plattform: Prüfung: Gitlab Login für Simon in Produktion funktioniert nicht zuverlässig."
......@@ -581,13 +581,13 @@ public class GitlabEventService {
ProjectPermissions result = new ProjectPermissions();
adminGitLabApi.enableRequestResponseLogging(java.util.logging.Level.INFO);
try {
for (Member member : adminGitLabApi.getProjectApi().getMembers(p.getId())) {
for (Member member : adminGitLabApi.getProjectApi().getAllMembers(p.getId())) {
if (member.getEmail() == null) {
// member does not show email address?
User user = adminGitLabApi.getUserApi().getUser(member.getId());
result.emailAddressesWithAccess.add(user.getEmail());
result.addEmailWithAccess(user.getEmail());
} else {
result.emailAddressesWithAccess.add(member.getEmail());
result.addEmailWithAccess(member.getEmail());
}
}
} catch (GitLabApiException e) {
......@@ -596,7 +596,7 @@ public class GitlabEventService {
final List<ProjectSharedGroup> sharedWithGroups = p.getSharedWithGroups();
for (ProjectSharedGroup group : sharedWithGroups) {
result.groupsWithAccess.add(group.getGroupName());
result.addGroupWithAccess(group.getGroupName());
}
return result;
}
......@@ -635,8 +635,8 @@ public class GitlabEventService {
gp.setArchived(p.getArchived());
gp.setVisibility(p.getVisibility());
gp.setUsers(perm.getEmailAddressesWithAccess());
gp.setGroups(perm.getGroupsWithAccess());
gp.setUsers(new ArrayList<>(perm.getEmailAddressesWithAccess()));
gp.setGroups(new ArrayList<>(perm.getGroupsWithAccess()));
gp.setOpen_issues_count(p.getOpenIssuesCount());
gp.setForks_count(p.getForksCount());
gp.setLast_activity_at(lastActivity);
......
package at.ac.uibk.gitsearch.service.gitlab_events;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
public class ProjectPermissions {
final List<String> emailAddressesWithAccess = new ArrayList<>();
final List<String> groupsWithAccess = new ArrayList<>();
private final Set<String> emailAddressesWithAccess = new HashSet<>();
private final Set<String> groupsWithAccess = new HashSet<>();
public List<String> getEmailAddressesWithAccess() {
public void addEmailWithAccess(String email) {
this.emailAddressesWithAccess.add(email);
}
public void addGroupWithAccess(String group) {
this.groupsWithAccess.add(group);
}
public Set<String> getEmailAddressesWithAccess() {
return emailAddressesWithAccess;
}
public List<String> getGroupsWithAccess() {
public Set<String> getGroupsWithAccess() {
return groupsWithAccess;
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment