Skip to content
Snippets Groups Projects
Commit f4aa2161 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

API-Changes:

/socketurl => /socket/url
/authorize => /socket/assign
Changed status code for /socket/assign to 204 (this does not create).
parent 7ddbd438
No related merge requests found
...@@ -57,7 +57,7 @@ public class SessionController extends AbstractController { ...@@ -57,7 +57,7 @@ public class SessionController extends AbstractController {
@Autowired @Autowired
private ARSnovaSocketIOServer server; private ARSnovaSocketIOServer server;
@RequestMapping(method = RequestMethod.POST, value = "/authorize") @RequestMapping(method = RequestMethod.POST, value = "/socket/assign")
public final void authorize(@RequestBody final Object sessionObject, final HttpServletResponse response) { public final void authorize(@RequestBody final Object sessionObject, final HttpServletResponse response) {
String socketid = (String) JSONObject.fromObject(sessionObject).get("session"); String socketid = (String) JSONObject.fromObject(sessionObject).get("session");
if (socketid == null) { if (socketid == null) {
...@@ -65,7 +65,7 @@ public class SessionController extends AbstractController { ...@@ -65,7 +65,7 @@ public class SessionController extends AbstractController {
} }
User u = userService.getCurrentUser(); User u = userService.getCurrentUser();
LOGGER.info("authorize session: " + socketid + ", user is: " + u); LOGGER.info("authorize session: " + socketid + ", user is: " + u);
response.setStatus(u != null ? HttpStatus.CREATED.value() : HttpStatus.UNAUTHORIZED.value()); response.setStatus(u != null ? HttpStatus.NO_CONTENT.value() : HttpStatus.UNAUTHORIZED.value());
if(u != null) { if(u != null) {
userService.putUser2SocketId(UUID.fromString(socketid), u); userService.putUser2SocketId(UUID.fromString(socketid), u);
} }
...@@ -116,7 +116,7 @@ public class SessionController extends AbstractController { ...@@ -116,7 +116,7 @@ public class SessionController extends AbstractController {
return null; return null;
} }
@RequestMapping(value = "/socketurl", method = RequestMethod.GET) @RequestMapping(value = "/socket/url", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public final String getSocketUrl() { public final String getSocketUrl() {
StringBuilder url = new StringBuilder(); StringBuilder url = new StringBuilder();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment