Skip to content

Added support for listing LDAP group links #1015

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 15 additions & 0 deletions src/main/java/org/gitlab4j/api/GroupApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.gitlab4j.api.models.GroupFilter;
import org.gitlab4j.api.models.GroupParams;
import org.gitlab4j.api.models.GroupProjectsFilter;
import org.gitlab4j.api.models.LdapGroupLink;
import org.gitlab4j.api.models.Member;
import org.gitlab4j.api.models.Project;
import org.gitlab4j.api.models.Variable;
Expand Down Expand Up @@ -1177,6 +1178,20 @@ public void ldapSync(Object groupIdOrPath) throws GitLabApiException {
post(Response.Status.NO_CONTENT, (Form)null, "groups", getGroupIdOrPath(groupIdOrPath), "ldap_sync");
}

/**
* Get the list of LDAP group links.
*
* <pre><code>GitLab Endpoint: GET /groups/:id/ldap_group_links</code></pre>
*
* @param groupIdOrPath the group ID, path of the group, or a Group instance holding the group ID or path
* @return a list of LDAP group links
* @throws GitLabApiException if any exception occurs
*/
public List<LdapGroupLink> getLdapGroupLinks(Object groupIdOrPath) throws GitLabApiException {
Response response = get(Response.Status.OK, null, "groups", getGroupIdOrPath(groupIdOrPath), "ldap_group_links");
return (response.readEntity(new GenericType<List<LdapGroupLink>>() {}));
}

/**
* Adds an LDAP group link.
*
Expand Down
52 changes: 52 additions & 0 deletions src/main/java/org/gitlab4j/api/models/LdapGroupLink.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@

package org.gitlab4j.api.models;

import org.gitlab4j.api.utils.JacksonJson;

public class LdapGroupLink {

private String cn;

private AccessLevel groupAccess;

private String provider;

private String filter;

public String getCn() {
return cn;
}

public void setCn(String aCn) {
cn = aCn;
}

public AccessLevel getGroupAccess() {
return groupAccess;
}

public void setGroupAccess(AccessLevel aGroupAccess) {
groupAccess = aGroupAccess;
}

public String getProvider() {
return provider;
}

public void setProvider(String aProvider) {
provider = aProvider;
}

public String getFilter() {
return filter;
}

public void setFilter(String aFilter) {
filter = aFilter;
}

@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
}
7 changes: 7 additions & 0 deletions src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
import org.gitlab4j.api.models.Key;
import org.gitlab4j.api.models.Label;
import org.gitlab4j.api.models.LabelEvent;
import org.gitlab4j.api.models.LdapGroupLink;
import org.gitlab4j.api.models.Link;
import org.gitlab4j.api.models.Member;
import org.gitlab4j.api.models.MergeRequest;
Expand Down Expand Up @@ -771,6 +772,12 @@ public void testLabels() throws Exception {
assertTrue(compareJson(labels, "labels.json"));
}

@Test
public void testLdapGroupLink() throws Exception {
LdapGroupLink link = unmarshalResource(LdapGroupLink.class, "ldap-group-link.json");
assertTrue(compareJson(link, "ldap-group-link.json"));
}

@Test
public void testSearchBlobs() throws Exception {
List<SearchBlob> searchResults = unmarshalResourceList(SearchBlob.class, "wiki-blobs.json");
Expand Down
6 changes: 6 additions & 0 deletions src/test/resources/org/gitlab4j/api/ldap-group-link.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"cn": "My Group",
"group_access": 30,
"provider": "tertiary",
"filter": "(employeeType=developer)"
}