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
03ef4663
Commit
03ef4663
authored
Mar 25, 2020
by
Greg Messner
Browse files
Added support for group_saml_identity (#538)
parent
00299127
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/models/Identity.java
View file @
03ef4663
...
...
@@ -6,6 +6,7 @@ public class Identity {
private
String
provider
;
private
String
externUid
;
private
Integer
samlProviderId
;
public
String
getProvider
()
{
return
provider
;
...
...
@@ -23,6 +24,14 @@ public class Identity {
this
.
externUid
=
externUid
;
}
public
Integer
getSamlProviderId
()
{
return
samlProviderId
;
}
public
void
setSamlProviderId
(
Integer
samlProviderId
)
{
this
.
samlProviderId
=
samlProviderId
;
}
@Override
public
String
toString
()
{
return
(
JacksonJson
.
toJsonString
(
this
));
...
...
src/main/java/org/gitlab4j/api/models/Member.java
View file @
03ef4663
...
...
@@ -9,6 +9,7 @@ public class Member extends AbstractUser<Member> {
private
AccessLevel
accessLevel
;
private
Date
expiresAt
;
private
Identity
groupSamlIdentity
;
public
AccessLevel
getAccessLevel
()
{
return
this
.
accessLevel
;
...
...
@@ -26,6 +27,14 @@ public class Member extends AbstractUser<Member> {
this
.
expiresAt
=
expiresAt
;
}
public
Identity
getGroupSamlIdentity
()
{
return
groupSamlIdentity
;
}
public
void
setGroupSamlIdentity
(
Identity
groupSamlIdentity
)
{
this
.
groupSamlIdentity
=
groupSamlIdentity
;
}
public
Member
withAccessLevel
(
AccessLevel
accessLevel
)
{
this
.
accessLevel
=
accessLevel
;
return
this
;
...
...
@@ -36,6 +45,11 @@ public class Member extends AbstractUser<Member> {
return
this
;
}
public
Member
withGroupSamlIdentity
(
Identity
groupSamlIdentity
)
{
this
.
groupSamlIdentity
=
groupSamlIdentity
;
return
this
;
}
@Override
public
String
toString
()
{
return
(
JacksonJson
.
toJsonString
(
this
));
...
...
src/test/resources/org/gitlab4j/api/members.json
View file @
03ef4663
...
...
@@ -18,5 +18,20 @@
"web_url"
:
"http://192.168.1.8:3000/root"
,
"expires_at"
:
"2012-10-22T14:13:35Z"
,
"access_level"
:
30
},
{
"id"
:
2
,
"username"
:
"jane_doe"
,
"name"
:
"Jane Doe"
,
"state"
:
"active"
,
"avatar_url"
:
"https://www.gravatar.com/avatar/c2525a7f58ae3776070e44c106c48e15?s=80&d=identicon"
,
"web_url"
:
"http://192.168.1.8:3000/root"
,
"expires_at"
:
"2012-10-22T14:13:35Z"
,
"access_level"
:
30
,
"group_saml_identity"
:
{
"extern_uid"
:
"ABC-1234567890"
,
"provider"
:
"group_saml"
,
"saml_provider_id"
:
10
}
}
]
\ No newline at end of file
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