Commit 03ef4663 authored by Greg Messner's avatar Greg Messner
Browse files

Added support for group_saml_identity (#538)

parent 00299127
...@@ -6,6 +6,7 @@ public class Identity { ...@@ -6,6 +6,7 @@ public class Identity {
private String provider; private String provider;
private String externUid; private String externUid;
private Integer samlProviderId;
public String getProvider() { public String getProvider() {
return provider; return provider;
...@@ -23,6 +24,14 @@ public class Identity { ...@@ -23,6 +24,14 @@ public class Identity {
this.externUid = externUid; this.externUid = externUid;
} }
public Integer getSamlProviderId() {
return samlProviderId;
}
public void setSamlProviderId(Integer samlProviderId) {
this.samlProviderId = samlProviderId;
}
@Override @Override
public String toString() { public String toString() {
return (JacksonJson.toJsonString(this)); return (JacksonJson.toJsonString(this));
......
...@@ -9,6 +9,7 @@ public class Member extends AbstractUser<Member> { ...@@ -9,6 +9,7 @@ public class Member extends AbstractUser<Member> {
private AccessLevel accessLevel; private AccessLevel accessLevel;
private Date expiresAt; private Date expiresAt;
private Identity groupSamlIdentity;
public AccessLevel getAccessLevel() { public AccessLevel getAccessLevel() {
return this.accessLevel; return this.accessLevel;
...@@ -26,6 +27,14 @@ public class Member extends AbstractUser<Member> { ...@@ -26,6 +27,14 @@ public class Member extends AbstractUser<Member> {
this.expiresAt = expiresAt; this.expiresAt = expiresAt;
} }
public Identity getGroupSamlIdentity() {
return groupSamlIdentity;
}
public void setGroupSamlIdentity(Identity groupSamlIdentity) {
this.groupSamlIdentity = groupSamlIdentity;
}
public Member withAccessLevel(AccessLevel accessLevel) { public Member withAccessLevel(AccessLevel accessLevel) {
this.accessLevel = accessLevel; this.accessLevel = accessLevel;
return this; return this;
...@@ -36,6 +45,11 @@ public class Member extends AbstractUser<Member> { ...@@ -36,6 +45,11 @@ public class Member extends AbstractUser<Member> {
return this; return this;
} }
public Member withGroupSamlIdentity(Identity groupSamlIdentity) {
this.groupSamlIdentity = groupSamlIdentity;
return this;
}
@Override @Override
public String toString() { public String toString() {
return (JacksonJson.toJsonString(this)); return (JacksonJson.toJsonString(this));
......
...@@ -18,5 +18,20 @@ ...@@ -18,5 +18,20 @@
"web_url": "http://192.168.1.8:3000/root", "web_url": "http://192.168.1.8:3000/root",
"expires_at": "2012-10-22T14:13:35Z", "expires_at": "2012-10-22T14:13:35Z",
"access_level": 30 "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
Supports Markdown
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