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

Re-enabled reading of system scopes. Added 1.1 data export functionality

pull/705/head
arielak 2014-07-31 16:29:57 -04:00 committed by Justin Richer
parent e2119884a5
commit b677b96595
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java
View File

@ -130,8 +130,7 @@ public class MITREidDataService_1_0 implements MITREidDataService {
} else if (name.equals(REFRESHTOKENS)) { } else if (name.equals(REFRESHTOKENS)) {
readRefreshTokens(reader); readRefreshTokens(reader);
} else if (name.equals(SYSTEMSCOPES)) { } else if (name.equals(SYSTEMSCOPES)) {
//readSystemScopes(reader); readSystemScopes(reader);
reader.skipValue();
} else { } else {
// unknown token, skip it // unknown token, skip it
reader.skipValue(); reader.skipValue();

35
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java
View File

@ -108,7 +108,7 @@ public class MITREidDataService_1_1 implements MITREidDataService {
writer.beginObject(); writer.beginObject();
// clients list // clients list
/*writer.name(CLIENTS); writer.name(CLIENTS);
writer.beginArray(); writer.beginArray();
writeClients(writer); writeClients(writer);
writer.endArray(); writer.endArray();
@ -135,7 +135,7 @@ public class MITREidDataService_1_1 implements MITREidDataService {
writer.name(SYSTEMSCOPES); writer.name(SYSTEMSCOPES);
writer.beginArray(); writer.beginArray();
writeSystemScopes(writer);*/ writeSystemScopes(writer);
writer.endArray(); writer.endArray();
writer.endObject(); // end mitreid-connect-1.1 writer.endObject(); // end mitreid-connect-1.1
@ -228,7 +228,7 @@ public class MITREidDataService_1_1 implements MITREidDataService {
/** /**
* @param writer * @param writer
*/ */
/*private void writeAuthenticationHolders(JsonWriter writer) { private void writeAuthenticationHolders(JsonWriter writer) {
Collection<AuthenticationHolderEntity> holders = new ArrayList<AuthenticationHolderEntity>(); Collection<AuthenticationHolderEntity> holders = new ArrayList<AuthenticationHolderEntity>();
try { try {
holders = authHolderRepository.getAll(); holders = authHolderRepository.getAll();
@ -255,20 +255,14 @@ public class MITREidDataService_1_1 implements MITREidDataService {
} }
} }
logger.info("Done writing authentication holders"); logger.info("Done writing authentication holders");
}*/ }
//used by writeAuthenticationHolders //used by writeAuthenticationHolders
/*private void writeAuthorizationRequest(OAuth2Request authReq, JsonWriter writer) throws IOException { private void writeAuthorizationRequest(OAuth2Request authReq, JsonWriter writer) throws IOException {
writer.beginObject(); writer.beginObject();
writer.name("authorizationParameters"); writer.name("requestParameters");
writer.beginObject(); writer.beginObject();
for (Entry<String, String> entry : authReq.getAuthorizationParameters().entrySet()) { for (Entry<String, String> entry : authReq.getRequestParameters().entrySet()) {
writer.name(entry.getKey()).value(entry.getValue());
}
writer.endObject();
writer.name("approvalParameters");
writer.beginObject();
for (Entry<String, String> entry : authReq.getApprovalParameters().entrySet()) {
writer.name(entry.getKey()).value(entry.getValue()); writer.name(entry.getKey()).value(entry.getValue());
} }
writer.endObject(); writer.endObject();
@ -293,8 +287,6 @@ public class MITREidDataService_1_1 implements MITREidDataService {
} }
writer.endArray(); writer.endArray();
writer.name("approved").value(authReq.isApproved()); writer.name("approved").value(authReq.isApproved());
writer.name("denied").value(authReq.isDenied());
writer.name("state").value(authReq.getState());
writer.name("redirectUri").value(authReq.getRedirectUri()); writer.name("redirectUri").value(authReq.getRedirectUri());
writer.name("responseTypes"); writer.name("responseTypes");
writer.beginArray(); writer.beginArray();
@ -302,8 +294,14 @@ public class MITREidDataService_1_1 implements MITREidDataService {
writer.value(s); writer.value(s);
} }
writer.endArray(); writer.endArray();
writer.name("extensions");
writer.beginObject();
for (Entry<String, Serializable> entry : authReq.getExtensions().entrySet()) {
writer.name(entry.getKey()).value(base64UrlEncodeObject(entry.getValue()));
}
writer.endObject(); writer.endObject();
}*/ writer.endObject();
}
private String base64UrlEncodeObject(Serializable obj) { private String base64UrlEncodeObject(Serializable obj) {
String encoded = null; String encoded = null;
@ -508,7 +506,7 @@ public class MITREidDataService_1_1 implements MITREidDataService {
@Override @Override
public void importData(JsonReader reader) throws IOException { public void importData(JsonReader reader) throws IOException {
logger.info("Reading configuration for 1.0"); logger.info("Reading configuration for 1.1");
// this *HAS* to start as an object // this *HAS* to start as an object
/*reader.beginObject(); /*reader.beginObject();
@ -530,8 +528,7 @@ public class MITREidDataService_1_1 implements MITREidDataService {
} else if (name.equals(REFRESHTOKENS)) { } else if (name.equals(REFRESHTOKENS)) {
readRefreshTokens(reader); readRefreshTokens(reader);
} else if (name.equals(SYSTEMSCOPES)) { } else if (name.equals(SYSTEMSCOPES)) {
//readSystemScopes(reader); readSystemScopes(reader);
reader.skipValue();
} else { } else {
// unknown token, skip it // unknown token, skip it
reader.skipValue(); reader.skipValue();