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

Cleaned up sql tables some more; sticking to _ naming convention

pull/165/merge
Amanda Anganes 2012-08-09 09:15:29 -04:00
parent d7deda1699
commit 9c32e92da5
15 changed files with 140 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ import org.springframework.security.oauth2.provider.ClientDetails;
*
*/
@Entity
@Table(name="clientdetails")
@Table(name="client_details")
@NamedQueries({
@NamedQuery(name = "ClientDetailsEntity.findAll", query = "SELECT c FROM ClientDetailsEntity c"),
@NamedQuery(name = "ClientDetailsEntity.getByClientId", query = "select c from ClientDetailsEntity c where c.clientId = :clientId")
@ -304,6 +304,7 @@ public class ClientDetailsEntity implements ClientDetails {
* @return the clientDescription
*/
@Basic
@Column(name="client_description")
public String getClientDescription() {
return clientDescription;
}
@ -319,6 +320,7 @@ public class ClientDetailsEntity implements ClientDetails {
* @return the allowRefresh
*/
@Basic
@Column(name="allow_refresh")
public Boolean isAllowRefresh() {
return allowRefresh;
}
@ -331,6 +333,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="allow_multiple_access_tokens")
public Boolean isAllowMultipleAccessTokens() {
return allowMultipleAccessTokens;
}
@ -340,6 +343,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="reuse_refresh_tokens")
public Boolean isReuseRefreshToken() {
return reuseRefreshToken;
}
@ -375,6 +379,7 @@ public class ClientDetailsEntity implements ClientDetails {
*/
@Basic
@Override
@Column(name="client_id")
public String getClientId() {
return clientId;
}
@ -391,6 +396,7 @@ public class ClientDetailsEntity implements ClientDetails {
*/
@Basic
@Override
@Column(name="client_secret")
public String getClientSecret() {
return clientSecret;
}
@ -466,6 +472,7 @@ public class ClientDetailsEntity implements ClientDetails {
@Override
@Basic
@Column(name="access_token_validity_seconds")
public Integer getAccessTokenValiditySeconds() {
return accessTokenValiditySeconds;
}
@ -479,6 +486,7 @@ public class ClientDetailsEntity implements ClientDetails {
@Override
@Basic
@Column(name="refresh_token_validity_seconds")
public Integer getRefreshTokenValiditySeconds() {
return refreshTokenValiditySeconds;
}
@ -547,6 +555,7 @@ public class ClientDetailsEntity implements ClientDetails {
@Basic
@Column(name="application_type")
public AppType getApplicationType() {
return applicationType;
}
@ -556,6 +565,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="application_name")
public String getApplicationName() {
return applicationName;
}
@ -565,6 +575,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="token_endpoint_auth_type")
public AuthType getTokenEndpointAuthType() {
return tokenEndpointAuthType;
}
@ -574,6 +585,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="user_id_type")
public String getUserIdType() {
return userIdType;
}
@ -597,6 +609,17 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="logo_url")
public String getLogoUrl() {
return logoUrl;
}
public void setLogoUrl(String logoUrl) {
this.logoUrl = logoUrl;
}
@Basic
@Column(name="policy_url")
public String getPolicyUrl() {
return policyUrl;
}
@ -606,6 +629,27 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="jwk_url")
public String getJwkUrl() {
return jwkUrl;
}
public void setJwkUrl(String jwkUrl) {
this.jwkUrl = jwkUrl;
}
@Basic
@Column(name="jwk_encryption_url")
public String getJwkEncryptionUrl() {
return jwkEncryptionUrl;
}
public void setJwkEncryptionUrl(String jwkEncryptionUrl) {
this.jwkEncryptionUrl = jwkEncryptionUrl;
}
@Basic
@Column(name="x509_url")
public String getX509Url() {
return x509Url;
}
@ -615,6 +659,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="x509_encryption_url")
public String getX509EncryptionUrl() {
return x509EncryptionUrl;
}
@ -624,6 +669,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="sector_identifier_url")
public String getSectorIdentifierUrl() {
return sectorIdentifierUrl;
}
@ -633,6 +679,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="requre_signed_request_object")
public JwsAlgorithm getRequireSignedRequestObject() {
return requireSignedRequestObject;
}
@ -643,6 +690,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="user_info_signed_response_alg")
public JwsAlgorithm getUserInfoSignedResponseAlg() {
return userInfoSignedResponseAlg;
}
@ -652,6 +700,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="user_info_encrypted_response_alg")
public JweAlgorithms getUserInfoEncryptedResponseAlg() {
return userInfoEncryptedResponseAlg;
}
@ -662,6 +711,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="user_info_encrypted_response_enc")
public JweAlgorithms getUserInfoEncryptedResponseEnc() {
return userInfoEncryptedResponseEnc;
}
@ -672,6 +722,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="user_info_encrypted_response_int")
public JweAlgorithms getUserInfoEncryptedResponseInt() {
return userInfoEncryptedResponseInt;
}
@ -682,6 +733,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="id_token_signed_response_alg")
public JwsAlgorithm getIdTokenSignedResponseAlg() {
return idTokenSignedResponseAlg;
}
@ -691,6 +743,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="id_token_encrypted_response_alg")
public JweAlgorithms getIdTokenEncryptedResponseAlg() {
return idTokenEncryptedResponseAlg;
}
@ -701,6 +754,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="id_token_encrypted_response_enc")
public JweAlgorithms getIdTokenEncryptedReponseEnc() {
return idTokenEncryptedReponseEnc;
}
@ -711,6 +765,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="id_token_encrypted_response_int")
public JweAlgorithms getIdTokenEncryptedResponseInt() {
return idTokenEncryptedResponseInt;
}
@ -721,6 +776,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="default_max_age")
public Integer getDefaultMaxAge() {
return defaultMaxAge;
}
@ -730,6 +786,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="require_auth_time")
public Boolean getRequireAuthTime() {
return requireAuthTime;
}
@ -739,6 +796,7 @@ public class ClientDetailsEntity implements ClientDetails {
}
@Basic
@Column(name="default_acr")
public String getDefaultACR() {
return defaultACR;
}
@ -747,33 +805,6 @@ public class ClientDetailsEntity implements ClientDetails {
this.defaultACR = defaultACR;
}
@Basic
public String getLogoUrl() {
return logoUrl;
}
public void setLogoUrl(String logoUrl) {
this.logoUrl = logoUrl;
}
@Basic
public String getJwkUrl() {
return jwkUrl;
}
public void setJwkUrl(String jwkUrl) {
this.jwkUrl = jwkUrl;
}
@Basic
public String getJwkEncryptionUrl() {
return jwkEncryptionUrl;
}
public void setJwkEncryptionUrl(String jwkEncryptionUrl) {
this.jwkEncryptionUrl = jwkEncryptionUrl;
}
@Override
public String toString() {
return "ClientDetailsEntity ["

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

@ -51,7 +51,7 @@ import org.springframework.security.oauth2.common.OAuth2RefreshToken;
*
*/
@Entity
@Table(name="accesstoken")
@Table(name="access_token")
@NamedQueries({
@NamedQuery(name = "OAuth2AccessTokenEntity.getByRefreshToken", query = "select a from OAuth2AccessTokenEntity a where a.refreshToken = :refreshToken"),
@NamedQuery(name = "OAuth2AccessTokenEntity.getByClient", query = "select a from OAuth2AccessTokenEntity a where a.client = :client"),
@ -179,6 +179,7 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
}
@Basic
@Column(name="token_type")
public String getTokenType() {
return tokenType;
}
@ -245,6 +246,7 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
* @return the idTokenString
*/
@Basic
@Column(name="id_token_string")
public String getIdTokenString() {
if (idToken != null) {
return idToken.toString();

4
openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java
View File

@ -46,7 +46,7 @@ import org.springframework.security.oauth2.common.OAuth2RefreshToken;
*
*/
@Entity
@Table(name="refreshtoken")
@Table(name="refresh_token")
@NamedQueries({
@NamedQuery(name = "OAuth2RefreshTokenEntity.getByClient", query = "select r from OAuth2RefreshTokenEntity r where r.client = :client"),
@NamedQuery(name = "OAuth2RefreshTokenEntity.getExpired", query = "select r from OAuth2RefreshTokenEntity r where r.expiration is not null and r.expiration < current_timestamp"),
@ -115,7 +115,7 @@ public class OAuth2RefreshTokenEntity implements OAuth2RefreshToken {
* Get the JWT-encoded value of this token
*/
@Basic
@Column(name="tokenValue")
@Column(name="token_value")
public String getValue() {
return jwt.toString();
}

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

@ -20,6 +20,7 @@ import java.util.Set;
import javax.persistence.Basic;
import javax.persistence.CollectionTable;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@ -35,7 +36,7 @@ import javax.persistence.Temporal;
import javax.persistence.Transient;
@Entity
@Table(name="approvedsite")
@Table(name="approved_site")
@NamedQueries({
@NamedQuery(name = "ApprovedSite.getAll", query = "select a from ApprovedSite a"),
@NamedQuery(name = "ApprovedSite.getByUserId", query = "select a from ApprovedSite a where a.userId = :userId"),
@ -97,6 +98,7 @@ public class ApprovedSite {
* @return the userInfo
*/
@Basic
@Column(name="user_id")
public String getUserId() {
return userId;
}
@ -112,6 +114,7 @@ public class ApprovedSite {
* @return the clientId
*/
@Basic
@Column(name="client_id")
public String getClientId() {
return clientId;
}
@ -128,6 +131,7 @@ public class ApprovedSite {
*/
@Basic
@Temporal(javax.persistence.TemporalType.TIMESTAMP)
@Column(name="creation_date")
public Date getCreationDate() {
return creationDate;
}
@ -144,6 +148,7 @@ public class ApprovedSite {
*/
@Basic
@Temporal(javax.persistence.TemporalType.TIMESTAMP)
@Column(name="access_date")
public Date getAccessDate() {
return accessDate;
}
@ -179,6 +184,7 @@ public class ApprovedSite {
*/
@Basic
@Temporal(javax.persistence.TemporalType.TIMESTAMP)
@Column(name="timeout_date")
public Date getTimeoutDate() {
return timeoutDate;
}
@ -201,7 +207,7 @@ public class ApprovedSite {
@ManyToOne
@JoinColumn(name="whitelistedsite_id")
@JoinColumn(name="whitelisted_site_id")
public WhitelistedSite getWhitelistedSite() {
return whitelistedSite;
}

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

@ -19,6 +19,7 @@ import java.util.Set;
import javax.persistence.Basic;
import javax.persistence.CollectionTable;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@ -37,7 +38,7 @@ import javax.persistence.Table;
*
*/
@Entity
@Table(name="whitelistedsite")
@Table(name="whitelisted_site")
@NamedQueries({
@NamedQuery(name = "WhitelistedSite.getAll", query = "select w from WhitelistedSite w"),
@NamedQuery(name = "WhitelistedSite.getByClientId", query = "select w from WhitelistedSite w where w.clientId = :clientId"),
@ -85,6 +86,7 @@ public class WhitelistedSite {
* @return the clientId
*/
@Basic
@Column(name="client_id")
public String getClientId() {
return clientId;
}
@ -116,6 +118,7 @@ public class WhitelistedSite {
}
@Basic
@Column(name="creator_user_id")
public String getCreatorUserId() {
return creatorUserId;
}

6
openid-connect-server/db/tables/accesstoken.sql → openid-connect-server/db/tables/access_token.sql
View File

@ -1,10 +1,10 @@
CREATE TABLE accesstoken (
CREATE TABLE access_token (
id VARCHAR(256),
token_value VARCHAR(4096),
expiration TIMESTAMP,
tokenType VARCHAR(256),
token_type VARCHAR(256),
refresh_token_id VARCHAR(256),
client_id VARCHAR(256),
authentication LONGBLOB,
idTokenString VARCHAR(4096)
id_token_string VARCHAR(4096)
);

9
openid-connect-server/db/tables/approved_site.sql Normal file
View File

@ -0,0 +1,9 @@
CREATE TABLE approved_site (
id VARCHAR(256),
user_id VARCHAR(256),
client_id VARCHAR(256),
creation_date DATE,
access_date DATE,
timeout_date DATE,
whitelisted_site_id VARCHAR(256)
);

9
openid-connect-server/db/tables/approvedsite.sql
View File

@ -1,9 +0,0 @@
CREATE TABLE approvedsite (
id BIGINT AUTO_INCREMENT PRIMARY KEY,
userId VARCHAR(256),
clientId VARCHAR(256),
creationDate DATE,
accessDate DATE,
timeoutDate DATE,
whitelistedsite_id VARCHAR(256)
);

4
openid-connect-server/db/tables/authentication_holder.sql
View File

@ -1,5 +1,5 @@
CREATE TABLE authentication_holder {
CREATE TABLE authentication_holder (
id VARCHAR(256),
owner_id VARCHAR(256),
authentication LONGBLOB
}
);

41
openid-connect-server/db/tables/client_details.sql Normal file
View File

@ -0,0 +1,41 @@
CREATE TABLE client_details (
id VARCHAR(256),
client_description VARCHAR(256),
allow_refresh TINYINT,
allow_multiple_access_tokens TINYINT,
reuse_refresh_tokens TINYINT,
client_id VARCHAR(256),
client_secret VARCHAR(2000),
access_token_validity_seconds BIGINT,
refresh_token_validity_seconds BIGINT,
application_type VARCHAR(256),
application_name VARCHAR(256),
token_endpoint_auth_type VARCHAR(256),
user_id_type VARCHAR(256),
logo_url VARCHAR(256),
policy_url VARCHAR(256),
jwk_url VARCHAR(256),
jwk_encryption_url VARCHAR(256),
x509_url VARCHAR(256),
x509_encryption_url VARCHAR(256),
sector_identifier_url VARCHAR(256),
requre_signed_request_object VARCHAR(256),
user_info_signed_response_alg VARCHAR(256),
user_info_encrypted_response_alg VARCHAR(256),
user_info_encrypted_response_enc VARCHAR(256),
user_info_encrypted_response_int VARCHAR(256),
id_token_signed_response_alg VARCHAR(256),
id_token_encrypted_response_alg VARCHAR(256),
id_token_encrypted_response_enc VARCHAR(256),
id_token_encrypted_response_int VARCHAR(256),
default_max_age BIGINT,
require_auth_time TINYINT,
default_acr VARCHAR(256)
);

41
openid-connect-server/db/tables/clientdetails.sql
View File

@ -1,41 +0,0 @@
CREATE TABLE clientdetails (
id VARCHAR(256),
clientDescription VARCHAR(256),
allowRefresh TINYINT,
allowMultipleAccessTokens TINYINT,
reuseRefreshTokens TINYINT,
clientId VARCHAR(256),
clientSecret VARCHAR(2000),
accessTokenValiditySeconds BIGINT,
refreshTokenValiditySeconds BIGINT,
applicationType VARCHAR(256),
applicationName VARCHAR(256),
tokenEndpointAuthType VARCHAR(256),
userIdType VARCHAR(256),
logoUrl VARCHAR(256),
policyUrl VARCHAR(256),
jwkUrl VARCHAR(256),
jwkEncryptionUrl VARCHAR(256),
x509Url VARCHAR(256)
x509EncryptionUrl VARCHAR(256),
sectorIdentifierUrl VARCHAR(256),
requreSignedRequestObject VARCHAR(256),
userInfoSignedResponseAlg VARCHAR(256),
userInfoEncryptedResponseAlg VARCHAR(256),
userInfoEncryptedResponseEnc VARCHAR(256),
userInfoEncryptedResponseInt VARCHAR(256),
idTokenSignedResponseAlg VARCHAR(256),
idTokenEncryptedResponseAlg VARCHAR(256),
idTokenEncryptedResponseEnc VARCHAR(256),
idTokenEncryptedResponseInt VARCHAR(256),
defaultMaxAge BIGINT,
requireAuthTime TINYINT,
defaultACR VARCHAR(256)
);

4
openid-connect-server/db/tables/contact.sql
View File

@ -1,4 +1,4 @@
CREATE TABLE contact {
CREATE TABLE contact (
owner_id VARCHAR(256),
contact VARCHAR(256)
}
);

4
openid-connect-server/db/tables/refreshtoken.sql → openid-connect-server/db/tables/refresh_token.sql
View File

@ -1,6 +1,6 @@
CREATE TABLE refreshtoken (
CREATE TABLE refresh_token (
id VARCHAR(256),
tokenValue VARCHAR(4096),
token_value VARCHAR(4096),
expiration TIMESTAMP,
client_id VARCHAR(256)
);

5
openid-connect-server/db/tables/whitelisted_site.sql Normal file
View File

@ -0,0 +1,5 @@
CREATE TABLE whitelisted_site (
id VARCHAR(256),
creator_user_id VARCHAR(256),
client_id VARCHAR(256)
);

5
openid-connect-server/db/tables/whitelistedsite.sql
View File

@ -1,5 +0,0 @@
CREATE TABLE whitelistedsite (
id BIGINT AUTO_INCREMENT PRIMARY KEY,
creatorUserId VARCHAR(256),
clientId VARCHAR(256)
);