Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
a7fe8665
Unverified
Commit
a7fe8665
authored
May 23, 2024
by
Simon Weimann
Committed by
GitHub
May 23, 2024
Browse files
add member_role_id for saml group link (#1126)
parent
bc350802
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/GroupApi.java
View file @
a7fe8665
...
@@ -1315,6 +1315,26 @@ public class GroupApi extends AbstractApi {
...
@@ -1315,6 +1315,26 @@ public class GroupApi extends AbstractApi {
addSamlGroupLink
(
groupIdOrPath
,
samlGroupName
,
groupAccess
.
toValue
());
addSamlGroupLink
(
groupIdOrPath
,
samlGroupName
,
groupAccess
.
toValue
());
}
}
/**
* Adds an SAML group link.
*
* <pre><code>GitLab Endpoint: POST /groups/:id/saml_group_links</code></pre>
*
* @param groupIdOrPath the group ID, path of the group, or a Group instance holding the group ID or path
* @param samlGroupName the name of the SAML group
* @param groupAccess the minimum access level for members of the SAML group
* @param memberRoleId the id of the custom member role to assign
* @throws GitLabApiException if any exception occurs
*/
public
void
addSamlGroupLink
(
Object
groupIdOrPath
,
String
samlGroupName
,
AccessLevel
groupAccess
,
int
memberRoleId
)
throws
GitLabApiException
{
if
(
groupAccess
==
null
)
{
throw
new
RuntimeException
(
"groupAccess cannot be null or empty"
);
}
addSamlGroupLink
(
groupIdOrPath
,
samlGroupName
,
groupAccess
.
toValue
(),
memberRoleId
);
}
/**
/**
* Adds an SAML group link.
* Adds an SAML group link.
*
*
...
@@ -1326,9 +1346,25 @@ public class GroupApi extends AbstractApi {
...
@@ -1326,9 +1346,25 @@ public class GroupApi extends AbstractApi {
* @throws GitLabApiException if any exception occurs
* @throws GitLabApiException if any exception occurs
*/
*/
public
void
addSamlGroupLink
(
Object
groupIdOrPath
,
String
samlGroupName
,
Integer
groupAccess
)
throws
GitLabApiException
{
public
void
addSamlGroupLink
(
Object
groupIdOrPath
,
String
samlGroupName
,
Integer
groupAccess
)
throws
GitLabApiException
{
addSamlGroupLink
(
groupIdOrPath
,
samlGroupName
,
groupAccess
,
null
);
}
/**
* Adds an SAML group link.
*
* <pre><code>GitLab Endpoint: POST /groups/:id/saml_group_links</code></pre>
*
* @param groupIdOrPath the group ID, path of the group, or a Group instance holding the group ID or path
* @param samlGroupName the name of the SAML group
* @param groupAccess the minimum access level for members of the SAML group
* @param memberRoleId the id of the custom member role to assign
* @throws GitLabApiException if any exception occurs
*/
public
void
addSamlGroupLink
(
Object
groupIdOrPath
,
String
samlGroupName
,
Integer
groupAccess
,
Integer
memberRoleId
)
throws
GitLabApiException
{
GitLabApiForm
formData
=
new
GitLabApiForm
()
GitLabApiForm
formData
=
new
GitLabApiForm
()
.
withParam
(
"saml_group_name"
,
samlGroupName
,
true
)
.
withParam
(
"saml_group_name"
,
samlGroupName
,
true
)
.
withParam
(
"access_level"
,
groupAccess
,
true
);
.
withParam
(
"access_level"
,
groupAccess
,
true
)
.
withParam
(
"member_role_id"
,
memberRoleId
);
post
(
Response
.
Status
.
CREATED
,
formData
,
"groups"
,
getGroupIdOrPath
(
groupIdOrPath
),
"saml_group_links"
);
post
(
Response
.
Status
.
CREATED
,
formData
,
"groups"
,
getGroupIdOrPath
(
groupIdOrPath
),
"saml_group_links"
);
}
}
...
@@ -1888,7 +1924,7 @@ public class GroupApi extends AbstractApi {
...
@@ -1888,7 +1924,7 @@ public class GroupApi extends AbstractApi {
* Only working with GitLab 14.0 and above.
* Only working with GitLab 14.0 and above.
*
*
* <pre><code>GitLab Endpoint: GET /groups/:id/avatar</code></pre>
* <pre><code>GitLab Endpoint: GET /groups/:id/avatar</code></pre>
*
*
* @param groupIdOrPath the group ID, path of the group, or a Group instance holding the group ID or path
* @param groupIdOrPath the group ID, path of the group, or a Group instance holding the group ID or path
* @return an InputStream to read the raw file from
* @return an InputStream to read the raw file from
* @throws GitLabApiException if any exception occurs
* @throws GitLabApiException if any exception occurs
...
@@ -2141,7 +2177,7 @@ public class GroupApi extends AbstractApi {
...
@@ -2141,7 +2177,7 @@ public class GroupApi extends AbstractApi {
public
GroupAccessToken
rotateGroupAccessToken
(
Object
groupIdOrPath
,
Long
tokenId
)
throws
GitLabApiException
{
public
GroupAccessToken
rotateGroupAccessToken
(
Object
groupIdOrPath
,
Long
tokenId
)
throws
GitLabApiException
{
return
rotateGroupAccessToken
(
groupIdOrPath
,
tokenId
,
null
);
return
rotateGroupAccessToken
(
groupIdOrPath
,
tokenId
,
null
);
}
}
/**
/**
* Rotate a group access token. Revokes the previous token and creates a new token that expires in one week.
* Rotate a group access token. Revokes the previous token and creates a new token that expires in one week.
...
...
src/main/java/org/gitlab4j/api/models/SamlGroupLink.java
View file @
a7fe8665
...
@@ -12,6 +12,8 @@ public class SamlGroupLink implements Serializable {
...
@@ -12,6 +12,8 @@ public class SamlGroupLink implements Serializable {
private
AccessLevel
accessLevel
;
private
AccessLevel
accessLevel
;
private
int
memberRoleId
;
public
String
getName
()
{
public
String
getName
()
{
return
name
;
return
name
;
}
}
...
@@ -28,6 +30,14 @@ public class SamlGroupLink implements Serializable {
...
@@ -28,6 +30,14 @@ public class SamlGroupLink implements Serializable {
accessLevel
=
aAccessLevel
;
accessLevel
=
aAccessLevel
;
}
}
public
int
getMemberRoleId
()
{
return
memberRoleId
;
}
public
void
setMemberRoleId
(
int
aMemberRoleId
)
{
memberRoleId
=
aMemberRoleId
;
}
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
(
JacksonJson
.
toJsonString
(
this
));
return
(
JacksonJson
.
toJsonString
(
this
));
...
...
src/test/resources/org/gitlab4j/api/saml-group-link.json
View file @
a7fe8665
{
{
"access_level"
:
30
,
"access_level"
:
30
,
"name"
:
"A_GITLAB_DEVELOPER"
"name"
:
"A_GITLAB_DEVELOPER"
,
"member_role_id"
:
6
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment