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

moved everything to use the consumes/produces framework of Spring 3.1

pull/263/head
Justin Richer 2012-11-20 13:12:21 -05:00
parent 51920ee381
commit fda86e23e9
9 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openid-connect-server/src/main/java/org/mitre/openid/connect/web/ApprovedSiteAPI.java
View File

@ -34,7 +34,7 @@ public class ApprovedSiteAPI {
* @param m
* @return
*/
@RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
@RequestMapping(method = RequestMethod.GET, produces = "application/json")
public String getAllApprovedSites(ModelMap m, Principal p) {
Collection<ApprovedSite> all = approvedSiteService.getByUserId(p.getName());
@ -48,7 +48,7 @@ public class ApprovedSiteAPI {
* Delete an approved site
*
*/
@RequestMapping(value="/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
@RequestMapping(value="/{id}", method = RequestMethod.DELETE)
public String deleteApprovedSite(@PathVariable("id") Long id, ModelMap m, Principal p) {
ApprovedSite approvedSite = approvedSiteService.getById(id);
@ -57,6 +57,7 @@ public class ApprovedSiteAPI {
} else if (!approvedSite.getUserId().equals(p.getName())) {
m.put("code", HttpStatus.FORBIDDEN);
} else {
m.put("code", HttpStatus.OK);
approvedSiteService.remove(approvedSite);
}
@ -66,7 +67,7 @@ public class ApprovedSiteAPI {
/**
* Get a single approved site
*/
@RequestMapping(value="/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
@RequestMapping(value="/{id}", method = RequestMethod.GET, produces = "application/json")
public String getApprovedSite(@PathVariable("id") Long id, ModelMap m, Principal p) {
ApprovedSite approvedSite = approvedSiteService.getById(id);
if (approvedSite == null) {

11
openid-connect-server/src/main/java/org/mitre/openid/connect/web/BlacklistAPI.java
View File

@ -43,7 +43,7 @@ public class BlacklistAPI {
* @param m
* @return
*/
@RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
@RequestMapping(method = RequestMethod.GET, produces = "application/json")
public String getAllBlacklistedSites(ModelMap m) {
Collection<BlacklistedSite> all = blacklistService.getAll();
@ -60,7 +60,7 @@ public class BlacklistAPI {
* @param p
* @return
*/
@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
@RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json")
public String addNewBlacklistedSite(@RequestBody String jsonString, ModelMap m, Principal p) {
JsonObject json = parser.parse(jsonString).getAsJsonObject();
@ -78,7 +78,7 @@ public class BlacklistAPI {
/**
* Update an existing blacklisted site
*/
@RequestMapping(value="/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
@RequestMapping(value="/{id}", method = RequestMethod.PUT, consumes = "application/json", produces = "application/json")
public String updateBlacklistedSite(@PathVariable("id") Long id, @RequestBody String jsonString, ModelMap m, Principal p) {
JsonObject json = parser.parse(jsonString).getAsJsonObject();
@ -104,13 +104,14 @@ public class BlacklistAPI {
* Delete a blacklisted site
*
*/
@RequestMapping(value="/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
@RequestMapping(value="/{id}", method = RequestMethod.DELETE)
public String deleteBlacklistedSite(@PathVariable("id") Long id, ModelMap m) {
BlacklistedSite blacklist = blacklistService.getById(id);
if (blacklist == null) {
m.put("code", HttpStatus.NOT_FOUND);
} else {
m.put("code", HttpStatus.OK);
blacklistService.remove(blacklist);
}
@ -120,7 +121,7 @@ public class BlacklistAPI {
/**
* Get a single blacklisted site
*/
@RequestMapping(value="/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
@RequestMapping(value="/{id}", method = RequestMethod.GET, produces = "application/json")
public String getBlacklistedSite(@PathVariable("id") Long id, ModelMap m) {
BlacklistedSite blacklist = blacklistService.getById(id);
if (blacklist == null) {

23
openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
View File

@ -22,6 +22,7 @@ import org.mitre.oauth2.exception.ClientNotFoundException;
import org.mitre.oauth2.model.ClientDetailsEntity;
import org.mitre.oauth2.service.ClientDetailsEntityService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@ -55,7 +56,7 @@ public class ClientAPI {
* @param modelAndView
* @return
*/
@RequestMapping(method = RequestMethod.GET, headers="Accept=application/json")
@RequestMapping(method = RequestMethod.GET, produces = "application/json")
public ModelAndView apiGetAllClients(ModelAndView modelAndView) {
Collection<ClientDetailsEntity> clients = clientService.getAllClients();
@ -72,7 +73,7 @@ public class ClientAPI {
* @param principal
* @return
*/
@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
@RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json")
public String apiAddClient(@RequestBody String jsonString, Model m, Principal principal) {
JsonObject json = parser.parse(jsonString).getAsJsonObject();
@ -108,7 +109,7 @@ public class ClientAPI {
* @param principal
* @return
*/
@RequestMapping(value="/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
@RequestMapping(value="/{id}", method = RequestMethod.PUT, consumes = "application/json", produces = "application/json")
public String apiUpdateClient(@PathVariable("id") Long id, @RequestBody String jsonString, Model m, Principal principal) {
// TODO: sanity check if the thing really is a JSON object
@ -148,13 +149,19 @@ public class ClientAPI {
* @param modelAndView
* @return
*/
@RequestMapping(value="/{id}", method=RequestMethod.DELETE, headers="Accept=application/json")
@RequestMapping(value="/{id}", method=RequestMethod.DELETE)
public String apiDeleteClient(@PathVariable("id") Long id, ModelAndView modelAndView) {
ClientDetailsEntity client = clientService.getClientById(id);
clientService.deleteClient(client);
return "jsonClientView";
if (client == null) {
modelAndView.getModelMap().put("code", HttpStatus.NOT_FOUND);
} else {
modelAndView.getModelMap().put("code", HttpStatus.OK);
clientService.deleteClient(client);
}
return "httpCodeView";
}
@ -164,7 +171,7 @@ public class ClientAPI {
* @param modelAndView
* @return
*/
@RequestMapping(value="/{id}", method=RequestMethod.GET, headers="Accept=application/json")
@RequestMapping(value="/{id}", method=RequestMethod.GET, produces = "application/json")
public ModelAndView apiShowClient(@PathVariable("id") Long id, ModelAndView modelAndView) {
ClientDetailsEntity client = clientService.getClientById(id);
if (client == null) {

6
openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java
View File

@ -169,7 +169,7 @@ public class ClientDynamicRegistrationEndpoint {
});
}
@RequestMapping(params = "type=client_associate")
@RequestMapping(params = "type=client_associate", produces = "application/json")
public String clientAssociate(
@RequestParam(value = "contacts", required = false) Set<String> contacts,
@RequestParam(value = "application_type", required = false) AppType applicationType,
@ -248,7 +248,7 @@ public class ClientDynamicRegistrationEndpoint {
return "clientAssociate";
}
@RequestMapping(params = "type=rotate_secret")
@RequestMapping(params = "type=rotate_secret", produces = "application/json")
public String rotateSecret(@RequestParam("client_id") String clientId, @RequestParam("client_secret") String clientSecret, ModelMap model) {
ClientDetailsEntity client = clientService.loadClientByClientId(clientId);
@ -271,7 +271,7 @@ public class ClientDynamicRegistrationEndpoint {
return "clientAssociate";
}
@RequestMapping(params = "type=client_update")
@RequestMapping(params = "type=client_update", produces = "application/json")
public String clientUpdate(
@RequestParam("client_id") String clientId,
@RequestParam("client_secret") String clientSecret,

2
openid-connect-server/src/main/java/org/mitre/openid/connect/web/JsonWebKeyEndpoint.java
View File

@ -30,7 +30,7 @@ public class JsonWebKeyEndpoint {
@Autowired
JwtSigningAndValidationService jwtService;
@RequestMapping("/jwk")
@RequestMapping(value = "/jwk", produces = "application/json")
public ModelAndView getJwk() {
// map from key id to signer

2
openid-connect-server/src/main/java/org/mitre/openid/connect/web/StatsAPI.java
View File

@ -17,7 +17,7 @@ public class StatsAPI {
@Autowired
private StatsService statsService;
@RequestMapping("summary")
@RequestMapping(value = "summary", produces = "application/json")
public String statsSummary(ModelMap m) {
Map<String, Integer> e = statsService.calculateSummaryStats();

2
openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
View File

@ -65,7 +65,7 @@ public class UserInfoEndpoint {
* @throws InvalidScopeException if the oauth2 token doesn't have the "openid" scope
*/
@PreAuthorize("hasRole('ROLE_USER') and #oauth2.hasScope('openid')")
@RequestMapping(value="/userinfo", method= {RequestMethod.GET, RequestMethod.POST})
@RequestMapping(value="/userinfo", method= {RequestMethod.GET, RequestMethod.POST}, produces = "application/json")
public String getInfo(Principal p, @RequestParam("schema") String schema, Model model) {
if (p == null) {

11
openid-connect-server/src/main/java/org/mitre/openid/connect/web/WhitelistAPI.java
View File

@ -42,7 +42,7 @@ public class WhitelistAPI {
* @param m
* @return
*/
@RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
@RequestMapping(method = RequestMethod.GET, produces = "application/json")
public String getAllWhitelistedSites(ModelMap m) {
Collection<WhitelistedSite> all = whitelistService.getAll();
@ -59,7 +59,7 @@ public class WhitelistAPI {
* @param p
* @return
*/
@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
@RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json")
public String addNewWhitelistedSite(@RequestBody String jsonString, ModelMap m, Principal p) {
JsonObject json = parser.parse(jsonString).getAsJsonObject();
@ -80,7 +80,7 @@ public class WhitelistAPI {
/**
* Update an existing whitelisted site
*/
@RequestMapping(value="/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
@RequestMapping(value="/{id}", method = RequestMethod.PUT, consumes = "application/json", produces = "application/json")
public String updateWhitelistedSite(@PathVariable("id") Long id, @RequestBody String jsonString, ModelMap m, Principal p) {
JsonObject json = parser.parse(jsonString).getAsJsonObject();
@ -106,13 +106,14 @@ public class WhitelistAPI {
* Delete a whitelisted site
*
*/
@RequestMapping(value="/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
@RequestMapping(value="/{id}", method = RequestMethod.DELETE)
public String deleteWhitelistedSite(@PathVariable("id") Long id, ModelMap m) {
WhitelistedSite whitelist = whitelistService.getById(id);
if (whitelist == null) {
m.put("code", HttpStatus.NOT_FOUND);
} else {
m.put("code", HttpStatus.OK);
whitelistService.remove(whitelist);
}
@ -122,7 +123,7 @@ public class WhitelistAPI {
/**
* Get a single whitelisted site
*/
@RequestMapping(value="/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
@RequestMapping(value="/{id}", method = RequestMethod.GET, produces = "application/json")
public String getWhitelistedSite(@PathVariable("id") Long id, ModelMap m) {
WhitelistedSite whitelist = whitelistService.getById(id);
if (whitelist == null) {

4
openid-connect-server/src/main/java/org/mitre/swd/web/SimpleWebDiscoveryEndpoint.java
View File

@ -34,7 +34,7 @@ public class SimpleWebDiscoveryEndpoint {
ConfigurationPropertiesBean config;
@RequestMapping(value="/.well-known/simple-web-discovery",
params={"principal", "service=http://openid.net/specs/connect/1.0/issuer"})
params={"principal", "service=http://openid.net/specs/connect/1.0/issuer"}, produces = "application/json")
public ModelAndView openIdConnectIssuerDiscovery(@RequestParam("principal") String principal, ModelAndView modelAndView) {
String baseUrl = config.getIssuer();
@ -54,7 +54,7 @@ public class SimpleWebDiscoveryEndpoint {
}
@RequestMapping(value={"/.well-known/host-meta", "/.well-known/host-meta.json"},
params={"resource", "rel=http://openid.net/specs/connect/1.0/issuer"})
params={"resource", "rel=http://openid.net/specs/connect/1.0/issuer"}, produces = "application/json")
public ModelAndView xrdDiscovery(@RequestParam("resource") String resource, ModelAndView modelAndView) {
Map<String, String> relMap = new HashMap<String, String>();