github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

got things to deploy - could not reference UserInfo directly in ApprovedSite and WhitelistedSite; needed to reference DefaultUserInfo instead.

pull/165/merge
Amanda Anganes 2012-06-27 15:34:12 -04:00
parent 4e10fce7ef
commit 676808bdac
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java
View File

@ -31,6 +31,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.Transient;
import org.mitre.oauth2.model.ClientDetailsEntity; import org.mitre.oauth2.model.ClientDetailsEntity;
@ -47,7 +48,7 @@ public class ApprovedSite {
private Long id; private Long id;
// which user made the approval // which user made the approval
private UserInfo userInfo; private DefaultUserInfo userInfo;
// which OAuth2 client is this tied to // which OAuth2 client is this tied to
private ClientDetailsEntity clientDetails; private ClientDetailsEntity clientDetails;
@ -98,14 +99,14 @@ public class ApprovedSite {
*/ */
@ManyToOne @ManyToOne
@JoinColumn(name="userinfo_id") @JoinColumn(name="userinfo_id")
public UserInfo getUserInfo() { public DefaultUserInfo getUserInfo() {
return userInfo; return userInfo;
} }
/** /**
* @param userInfo the userInfo to set * @param userInfo the userInfo to set
*/ */
public void setUserInfo(UserInfo userInfo) { public void setUserInfo(DefaultUserInfo userInfo) {
this.userInfo = userInfo; this.userInfo = userInfo;
} }
@ -192,7 +193,7 @@ public class ApprovedSite {
* Does this AP entry correspond to a WS? * Does this AP entry correspond to a WS?
* @return * @return
*/ */
@Basic @Transient
public Boolean getIsWhitelisted() { public Boolean getIsWhitelisted() {
return (whitelistedSite != null); return (whitelistedSite != null);
} }

6
openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
View File

@ -50,7 +50,7 @@ public class WhitelistedSite {
private Long id; private Long id;
// Reference to the admin user who created this entry // Reference to the admin user who created this entry
private UserInfo creator; private DefaultUserInfo creator;
// which OAuth2 client is this tied to // which OAuth2 client is this tied to
private ClientDetailsEntity clientDetails; private ClientDetailsEntity clientDetails;
@ -115,11 +115,11 @@ public class WhitelistedSite {
@ManyToOne @ManyToOne
@JoinColumn(name="userinfo_id") @JoinColumn(name="userinfo_id")
public UserInfo getCreator() { public DefaultUserInfo getCreator() {
return creator; return creator;
} }
public void setCreator(UserInfo creator) { public void setCreator(DefaultUserInfo creator) {
this.creator = creator; this.creator = creator;
} }
} }

1
openid-connect-server/src/main/resources/META-INF/persistence.xml
View File

@ -14,6 +14,7 @@
<class>org.mitre.openid.connect.model.IdToken</class> <class>org.mitre.openid.connect.model.IdToken</class>
<class>org.mitre.openid.connect.model.IdTokenClaims</class> <class>org.mitre.openid.connect.model.IdTokenClaims</class>
<class>org.mitre.openid.connect.model.DefaultUserInfo</class> <class>org.mitre.openid.connect.model.DefaultUserInfo</class>
<!-- <class>org.mitre.openid.connect.model.UserInfo</class> -->
<class>org.mitre.openid.connect.model.WhitelistedSite</class> <class>org.mitre.openid.connect.model.WhitelistedSite</class>
<shared-cache-mode>NONE</shared-cache-mode> <shared-cache-mode>NONE</shared-cache-mode>
</persistence-unit> </persistence-unit>