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 exporter, made some array exports null safe

pull/650/head
Justin Richer 2014-05-13 14:18:17 -04:00
parent 339d868e02
commit db4dcaf5cb
2 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openid-connect-common/src/main/java/org/mitre/openid/connect/service/MITREidDataService.java
View File

@ -32,7 +32,15 @@ public interface MITREidDataService {
*/ */
public static final String MITREID_CONNECT_1_0 = "mitreid-connect-1.0"; public static final String MITREID_CONNECT_1_0 = "mitreid-connect-1.0";
/** // member names
public static final String REFRESHTOKENS = "refreshTokens";
public static final String ACCESSTOKENS = "accessTokens";
public static final String AUTHENTICATIONHOLDERS = "authenticationHolders";
public static final String GRANTS = "grants";
public static final String CLIENTS = "clients";
public static final String SYSTEMSCOPES = "systemScopes";
/**
* Write out the current server state to the given JSON writer as a JSON object * Write out the current server state to the given JSON writer as a JSON object
* *
* @param writer * @param writer

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

@ -67,13 +67,6 @@ import org.springframework.stereotype.Service;
public class MITREidDataService_1_0 implements MITREidDataService { public class MITREidDataService_1_0 implements MITREidDataService {
private final static Logger logger = LoggerFactory.getLogger(MITREidDataService_1_0.class); private final static Logger logger = LoggerFactory.getLogger(MITREidDataService_1_0.class);
// member names
private static final String REFRESHTOKENS = "refreshTokens";
private static final String ACCESSTOKENS = "accessTokens";
private static final String AUTHENTICATIONHOLDERS = "authenticationHolders";
private static final String GRANTS = "grants";
private static final String CLIENTS = "clients";
private static final String SYSTEMSCOPES = "systemScopes";
@Autowired @Autowired
private OAuth2ClientRepository clientRepository; private OAuth2ClientRepository clientRepository;
@Autowired @Autowired
@ -339,22 +332,14 @@ public class MITREidDataService_1_0 implements MITREidDataService {
for (ClientDetailsEntity client : clientRepository.getAllClients()) { for (ClientDetailsEntity client : clientRepository.getAllClients()) {
try { try {
writer.beginObject(); writer.beginObject();
writer.name("id").value(client.getClientId()); writer.name("clientId").value(client.getClientId());
writer.name("resourceIds"); writer.name("resourceIds");
writer.beginArray(); writeNullSafeArray(writer, client.getResourceIds());
for (String s : client.getResourceIds()) {
writer.value(s);
}
writer.endArray();
writer.name("secret").value(client.getClientSecret()); writer.name("secret").value(client.getClientSecret());
writer.name("scope"); writer.name("scope");
writer.beginArray(); writeNullSafeArray(writer, client.getScope());
for (String s : client.getScope()) {
writer.value(s);
}
writer.endArray();
writer.name("authorities"); writer.name("authorities");
writer.beginArray(); writer.beginArray();
@ -364,27 +349,13 @@ public class MITREidDataService_1_0 implements MITREidDataService {
writer.endArray(); writer.endArray();
writer.name("accessTokenValiditySeconds").value(client.getAccessTokenValiditySeconds()); writer.name("accessTokenValiditySeconds").value(client.getAccessTokenValiditySeconds());
writer.name("refreshTokenValiditySeconds").value(client.getRefreshTokenValiditySeconds()); writer.name("refreshTokenValiditySeconds").value(client.getRefreshTokenValiditySeconds());
writer.name("additionalInformation");
writer.beginObject();
for (Entry<String, Object> entry : client.getAdditionalInformation().entrySet()) {
writer.name(entry.getKey()).value(entry.getValue().toString());
}
writer.endObject();
writer.name("redirectUris"); writer.name("redirectUris");
writer.beginArray(); writeNullSafeArray(writer, client.getRedirectUris());
for (String s : client.getRedirectUris()) {
writer.value(s);
}
writer.endArray();
writer.name("name").value(client.getClientName()); writer.name("name").value(client.getClientName());
writer.name("uri").value(client.getClientUri()); writer.name("uri").value(client.getClientUri());
writer.name("logoUri").value(client.getLogoUri()); writer.name("logoUri").value(client.getLogoUri());
writer.name("contacts"); writer.name("contacts");
writer.beginArray(); writeNullSafeArray(writer, client.getContacts());
for (String s : client.getContacts()) {
writer.value(s);
}
writer.endArray();
writer.name("tosUri").value(client.getTosUri()); writer.name("tosUri").value(client.getTosUri());
writer.name("tokenEndpointAuthMethod") writer.name("tokenEndpointAuthMethod")
.value((client.getTokenEndpointAuthMethod() != null) ? client.getTokenEndpointAuthMethod().getValue() : null); .value((client.getTokenEndpointAuthMethod() != null) ? client.getTokenEndpointAuthMethod().getValue() : null);
@ -426,19 +397,11 @@ public class MITREidDataService_1_0 implements MITREidDataService {
writer.value(requireAuthTime); writer.value(requireAuthTime);
} }
writer.name("defaultACRValues"); writer.name("defaultACRValues");
writer.beginArray(); writeNullSafeArray(writer, client.getDefaultACRvalues());
for (String s : client.getDefaultACRvalues()) {
writer.value(s);
}
writer.endArray();
writer.name("intitateLoginUri").value(client.getInitiateLoginUri()); writer.name("intitateLoginUri").value(client.getInitiateLoginUri());
writer.name("postLogoutRedirectUri").value(client.getPostLogoutRedirectUri()); writer.name("postLogoutRedirectUri").value(client.getPostLogoutRedirectUri());
writer.name("requestUris"); writer.name("requestUris");
writer.beginArray(); writeNullSafeArray(writer, client.getRequestUris());
for (String s : client.getRequestUris()) {
writer.value(s);
}
writer.endArray();
writer.name("description").value(client.getClientDescription()); writer.name("description").value(client.getClientDescription());
writer.name("allowIntrospection").value(client.isAllowIntrospection()); writer.name("allowIntrospection").value(client.isAllowIntrospection());
writer.name("reuseRefreshToken").value(client.isReuseRefreshToken()); writer.name("reuseRefreshToken").value(client.isReuseRefreshToken());
@ -452,6 +415,19 @@ public class MITREidDataService_1_0 implements MITREidDataService {
logger.info("Done writing clients"); logger.info("Done writing clients");
} }
private void writeNullSafeArray(JsonWriter writer, Set<String> items)
throws IOException {
if (items != null) {
writer.beginArray();
for (String s : items) {
writer.value(s);
}
writer.endArray();
} else {
writer.nullValue();
}
}
/** /**
* @param writer * @param writer
*/ */