fixing bugs; needed to make all ids BIGINT AUTO-INCREMENT PRIMARY KEY in sql files
Amanda Anganes
parent
0757642e67
commit
49cb8bd0cb
|
|
@ -523,7 +523,7 @@ public class ClientDetailsEntity implements ClientDetails {
|
|||
*/
|
||||
@ElementCollection(fetch = FetchType.EAGER)
|
||||
@CollectionTable(
|
||||
name="resource_ids",
|
||||
name="resource_id",
|
||||
joinColumns=@JoinColumn(name="owner_id")
|
||||
)
|
||||
@Column(name="resource_id")
|
||||
|
|
|
|||
|
|
@ -72,6 +72,9 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
|
|||
private AuthenticationHolder authenticationHolder; // the authentication that made this access
|
||||
|
||||
private Jwt jwtValue; // JWT-encoded access token value
|
||||
|
||||
//TODO should not need this
|
||||
private String value;
|
||||
|
||||
private IdToken idToken; // JWT-encoded OpenID Connect IdToken
|
||||
|
||||
|
|
@ -155,7 +158,8 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
|
|||
@Basic
|
||||
@Column(name="token_value")
|
||||
public String getValue() {
|
||||
return jwtValue.toString();
|
||||
this.value = jwtValue.toString();
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -165,6 +169,7 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
|
|||
* @throws IllegalArgumentException if "value" is not a properly formatted JWT string
|
||||
*/
|
||||
public void setValue(String value) {
|
||||
this.value = value;
|
||||
setJwt(Jwt.parse(value));
|
||||
}
|
||||
|
||||
|
|
@ -276,6 +281,7 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
|
|||
*/
|
||||
public void setJwt(Jwt jwt) {
|
||||
this.jwtValue = jwt;
|
||||
this.value = jwt.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ import org.springframework.security.oauth2.common.OAuth2RefreshToken;
|
|||
@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"),
|
||||
@NamedQuery(name = "OAuth2RefreshTokenEntity.getByTokenValue", query = "select r from OAuth2RefreshTokenEntity r where r.tokenValue = :tokenValue"),
|
||||
@NamedQuery(name = "OAuth2RefreshTokenEntity.getByTokenValue", query = "select r from OAuth2RefreshTokenEntity r where r.value = :tokenValue"),
|
||||
@NamedQuery(name = "OAuth2RefreshTokenEntity.getByAuthentication", query = "select r from OAuth2RefreshTokenEntity r where r.authenticationHolder.authentication = :authentication")
|
||||
})
|
||||
public class OAuth2RefreshTokenEntity implements OAuth2RefreshToken {
|
||||
|
|
@ -64,6 +64,9 @@ public class OAuth2RefreshTokenEntity implements OAuth2RefreshToken {
|
|||
//JWT-encoded representation of this access token entity
|
||||
private Jwt jwt;
|
||||
|
||||
//TOOD: shouldn't need this
|
||||
private String value;
|
||||
|
||||
// our refresh tokens might expire
|
||||
private Date expiration;
|
||||
|
||||
|
|
@ -117,7 +120,8 @@ public class OAuth2RefreshTokenEntity implements OAuth2RefreshToken {
|
|||
@Basic
|
||||
@Column(name="token_value")
|
||||
public String getValue() {
|
||||
return jwt.toString();
|
||||
value = jwt.toString();
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -126,6 +130,7 @@ public class OAuth2RefreshTokenEntity implements OAuth2RefreshToken {
|
|||
* @throws IllegalArgumentException if the value is not a valid JWT string
|
||||
*/
|
||||
public void setValue(String value) {
|
||||
this.value = value;
|
||||
setJwt(Jwt.parse(value));
|
||||
}
|
||||
|
||||
|
|
@ -201,6 +206,7 @@ public class OAuth2RefreshTokenEntity implements OAuth2RefreshToken {
|
|||
*/
|
||||
public void setJwt(Jwt jwt) {
|
||||
this.jwt = jwt;
|
||||
this.value = jwt.toString();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ import java.util.Collection;
|
|||
import org.mitre.oauth2.model.ClientDetailsEntity;
|
||||
|
||||
public interface OAuth2ClientRepository {
|
||||
|
||||
public ClientDetailsEntity getById(Long id);
|
||||
|
||||
public ClientDetailsEntity getClientById(String clientId);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
CREATE TABLE access_token (
|
||||
id VARCHAR(256),
|
||||
id BIGINT AUTO_INCREMENT PRIMARY KEY,
|
||||
token_value VARCHAR(4096),
|
||||
expiration TIMESTAMP,
|
||||
token_type VARCHAR(256),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
CREATE TABLE approved_site (
|
||||
id VARCHAR(256),
|
||||
id BIGINT AUTO_INCREMENT PRIMARY KEY,
|
||||
user_id VARCHAR(256),
|
||||
client_id VARCHAR(256),
|
||||
creation_date DATE,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
CREATE TABLE authentication_holder (
|
||||
id VARCHAR(256),
|
||||
id BIGINT AUTO_INCREMENT PRIMARY KEY,
|
||||
owner_id VARCHAR(256),
|
||||
authentication LONGBLOB
|
||||
);
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
CREATE TABLE client_details (
|
||||
id VARCHAR(256),
|
||||
id BIGINT AUTO_INCREMENT PRIMARY KEY,
|
||||
client_description VARCHAR(256),
|
||||
allow_refresh TINYINT,
|
||||
allow_multiple_access_tokens TINYINT,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
CREATE TABLE refresh_token (
|
||||
id VARCHAR(256),
|
||||
id BIGINT AUTO_INCREMENT PRIMARY KEY,
|
||||
token_value VARCHAR(4096),
|
||||
expiration TIMESTAMP,
|
||||
client_id VARCHAR(256)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
CREATE TABLE whitelisted_site (
|
||||
id VARCHAR(256),
|
||||
id BIGINT AUTO_INCREMENT PRIMARY KEY,
|
||||
creator_user_id VARCHAR(256),
|
||||
client_id VARCHAR(256)
|
||||
);
|
||||
|
|
@ -45,13 +45,19 @@ public class JpaOAuth2ClientRepository implements OAuth2ClientRepository {
|
|||
public JpaOAuth2ClientRepository(EntityManager manager) {
|
||||
this.manager = manager;
|
||||
}
|
||||
|
||||
public ClientDetailsEntity getById(Long id) {
|
||||
return manager.find(ClientDetailsEntity.class, id);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.mitre.oauth2.repository.OAuth2ClientRepository#getClientById(java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public ClientDetailsEntity getClientById(String clientId) {
|
||||
return manager.find(ClientDetailsEntity.class, clientId);
|
||||
TypedQuery<ClientDetailsEntity> query = manager.createNamedQuery("ClientDetailsEntity.getByClientId", ClientDetailsEntity.class);
|
||||
query.setParameter("clientId", clientId);
|
||||
return JpaUtil.getSingleResult(query.getResultList());
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ public class ApprovedSiteServiceImpl implements ApprovedSiteService {
|
|||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public ApprovedSite save(ApprovedSite approvedSite) {
|
||||
return approvedSiteRepository.save(approvedSite);
|
||||
}
|
||||
|
|
@ -72,20 +73,23 @@ public class ApprovedSiteServiceImpl implements ApprovedSiteService {
|
|||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void remove(ApprovedSite approvedSite) {
|
||||
approvedSiteRepository.remove(approvedSite);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void removeById(Long id) {
|
||||
approvedSiteRepository.removeById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public ApprovedSite createApprovedSite(String clientId, String userId, Date timeoutDate, Set<String> allowedScopes,
|
||||
WhitelistedSite whitelistedSite) {
|
||||
|
||||
ApprovedSite as = new ApprovedSite();
|
||||
ApprovedSite as = approvedSiteRepository.save(new ApprovedSite());
|
||||
|
||||
Date now = new Date();
|
||||
as.setCreationDate(now);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
<class>org.mitre.oauth2.model.ClientDetailsEntity</class>
|
||||
<class>org.mitre.oauth2.model.OAuth2AccessTokenEntity</class>
|
||||
<class>org.mitre.oauth2.model.OAuth2RefreshTokenEntity</class>
|
||||
<class>org.mitre.oauth2.model.AuthenticationHolder</class>
|
||||
<class>org.mitre.openid.connect.model.Address</class>
|
||||
<class>org.mitre.openid.connect.model.ApprovedSite</class>
|
||||
<class>org.mitre.openid.connect.model.Event</class>
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@
|
|||
<div class="row">
|
||||
<div class="span4 offset2 well-small" style="text-align:left">Do you authorize
|
||||
"<c:choose>
|
||||
<c:when test="${empty client.clientName}">
|
||||
<c:when test="${empty client.applicationName}">
|
||||
<c:out value="${client.clientId}"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:out value="${client.clientName}"/>
|
||||
<c:out value="${client.applicationName}"/>
|
||||
</c:otherwise>
|
||||
</c:choose>" to sign you into their site
|
||||
using your identity?
|
||||
|
|
|
|||
Loading…
Reference in New Issue