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

Fixed bugs; I can get tokens now. User approval handler seems to be working corrrectly.

pull/165/merge
Amanda Anganes 2012-08-09 11:04:43 -04:00
parent 49cb8bd0cb
commit 617e9568d8
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,8 +60,8 @@ public class ClientDetailsEntity implements ClientDetails {
/** Our own fields **/ /** Our own fields **/
private String clientDescription = "";//this is ours private String clientDescription = "";//this is ours
private Boolean allowRefresh = false; // do we allow refresh tokens for this client? private Boolean allowRefresh = false; // do we allow refresh tokens for this client?
private Boolean allowMultipleAccessTokens; // do we allow multiple access tokens, or not? private Boolean allowMultipleAccessTokens = false; // do we allow multiple access tokens, or not?
private Boolean reuseRefreshToken; // do we let someone reuse a refresh token? private Boolean reuseRefreshToken = false; // do we let someone reuse a refresh token?
/** Fields from ClientDetails interface **/ /** Fields from ClientDetails interface **/
private String clientId = ""; private String clientId = "";
@ -104,7 +104,7 @@ public class ClientDetailsEntity implements ClientDetails {
private JweAlgorithms idTokenEncryptedResponseInt; private JweAlgorithms idTokenEncryptedResponseInt;
private Integer defaultMaxAge; private Integer defaultMaxAge;
private Boolean requireAuthTime; private Boolean requireAuthTime = false;
private String defaultACR; private String defaultACR;

2
openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
View File

@ -124,7 +124,7 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
* @return the authentication * @return the authentication
*/ */
@ManyToOne @ManyToOne
@JoinColumn(name = "owner_id") @JoinColumn(name = "auth_holder_id")
public AuthenticationHolder getAuthenticationHolder() { public AuthenticationHolder getAuthenticationHolder() {
return authenticationHolder; return authenticationHolder;
} }

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

@ -165,9 +165,10 @@ public class ApprovedSite {
*/ */
@ElementCollection(fetch = FetchType.EAGER) @ElementCollection(fetch = FetchType.EAGER)
@CollectionTable( @CollectionTable(
name="allowed_scopes", name="allowed_scope",
joinColumns=@JoinColumn(name="owner_id") joinColumns=@JoinColumn(name="owner_id")
) )
@Column(name="allowed_scope")
public Set<String> getAllowedScopes() { public Set<String> getAllowedScopes() {
return allowedScopes; return allowedScopes;
} }

2
openid-connect-server/db/tables/access_token.sql
View File

@ -5,6 +5,6 @@ CREATE TABLE access_token (
token_type VARCHAR(256), token_type VARCHAR(256),
refresh_token_id VARCHAR(256), refresh_token_id VARCHAR(256),
client_id VARCHAR(256), client_id VARCHAR(256),
authentication LONGBLOB, auth_holder_id VARCHAR(256),
id_token_string VARCHAR(4096) id_token_string VARCHAR(4096)
); );