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

changed expires_at -> client_secret_expires_at, issued_at -> client_id_issued_at

pull/342/head
Justin Richer 2013-05-31 11:11:19 -04:00
parent 3f7fe30f5c
commit c760ebf4a4
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openid-connect-common/src/main/java/org/mitre/oauth2/model/RegisteredClient.java
View File

@ -24,8 +24,8 @@ public class RegisteredClient {
// these fields are needed in addition to the ones in ClientDetailsEntity // these fields are needed in addition to the ones in ClientDetailsEntity
private String registrationAccessToken; private String registrationAccessToken;
private String registrationClientUri; private String registrationClientUri;
private Date expiresAt; private Date clientSecretExpiresAt;
private Date issuedAt; private Date clientIdIssuedAt;
private ClientDetailsEntity client; private ClientDetailsEntity client;
/** /**
@ -692,28 +692,28 @@ public class RegisteredClient {
this.registrationClientUri = registrationClientUri; this.registrationClientUri = registrationClientUri;
} }
/** /**
* @return the expiresAt * @return the clientSecretExpiresAt
*/ */
public Date getExpiresAt() { public Date getClientSecretExpiresAt() {
return expiresAt; return clientSecretExpiresAt;
} }
/** /**
* @param expiresAt the expiresAt to set * @param clientSecretExpiresAt the clientSecretExpiresAt to set
*/ */
public void setExpiresAt(Date expiresAt) { public void setClientSecretExpiresAt(Date expiresAt) {
this.expiresAt = expiresAt; this.clientSecretExpiresAt = expiresAt;
} }
/** /**
* @return the issuedAt * @return the clientIdIssuedAt
*/ */
public Date getIssuedAt() { public Date getClientIdIssuedAt() {
return issuedAt; return clientIdIssuedAt;
} }
/** /**
* @param issuedAt the issuedAt to set * @param clientIdIssuedAt the clientIdIssuedAt to set
*/ */
public void setIssuedAt(Date issuedAt) { public void setClientIdIssuedAt(Date issuedAt) {
this.issuedAt = issuedAt; this.clientIdIssuedAt = issuedAt;
} }

16
openid-connect-common/src/main/java/org/mitre/openid/connect/ClientDetailsEntityJsonProcessor.java
View File

@ -157,8 +157,8 @@ public class ClientDetailsEntityJsonProcessor {
// get any fields from the registration // get any fields from the registration
rc.setRegistrationAccessToken(getAsString(o, "registration_access_token")); rc.setRegistrationAccessToken(getAsString(o, "registration_access_token"));
rc.setRegistrationClientUri(getAsString(o, "registration_client_uri")); rc.setRegistrationClientUri(getAsString(o, "registration_client_uri"));
rc.setIssuedAt(getAsDate(o, "issued_at")); rc.setClientIdIssuedAt(getAsDate(o, "client_id_issued_at"));
rc.setExpiresAt(getAsDate(o, "expires_at")); rc.setClientSecretExpiresAt(getAsDate(o, "client_secret_expires_at"));
return rc; return rc;
} else { } else {
@ -179,17 +179,17 @@ public class ClientDetailsEntityJsonProcessor {
if (c.getClientSecret() != null) { if (c.getClientSecret() != null) {
o.addProperty("client_secret", c.getClientSecret()); o.addProperty("client_secret", c.getClientSecret());
if (c.getExpiresAt() == null) { if (c.getClientSecretExpiresAt() == null) {
o.addProperty("expires_at", 0); // TODO: do we want to let secrets expire? o.addProperty("client_secret_expires_at", 0); // TODO: do we want to let secrets expire?
} else { } else {
o.addProperty("expires_at", c.getExpiresAt().getTime() / 1000L); o.addProperty("client_secret_expires_at", c.getClientSecretExpiresAt().getTime() / 1000L);
} }
} }
if (c.getIssuedAt() != null) { if (c.getClientIdIssuedAt() != null) {
o.addProperty("issued_at", c.getIssuedAt().getTime() / 1000L); o.addProperty("client_id_issued_at", c.getClientIdIssuedAt().getTime() / 1000L);
} else if (c.getCreatedAt() != null) { } else if (c.getCreatedAt() != null) {
o.addProperty("issued_at", c.getCreatedAt().getTime() / 1000L); o.addProperty("client_id_issued_at", c.getCreatedAt().getTime() / 1000L);
} }
if (c.getRegistrationAccessToken() != null) { if (c.getRegistrationAccessToken() != null) {
o.addProperty("registration_access_token", c.getRegistrationAccessToken()); o.addProperty("registration_access_token", c.getRegistrationAccessToken());