diff --git a/src/main/java/net/Broken/RestApi/Data/CommandPostData.java b/src/main/java/net/Broken/RestApi/Data/CommandPostData.java index a119623..9ddffce 100644 --- a/src/main/java/net/Broken/RestApi/Data/CommandPostData.java +++ b/src/main/java/net/Broken/RestApi/Data/CommandPostData.java @@ -10,5 +10,4 @@ public class CommandPostData { public int playlistLimit; public String chanelId; public String name; - public String token; } diff --git a/src/main/java/net/Broken/RestApi/MusicWebAPIController.java b/src/main/java/net/Broken/RestApi/MusicWebAPIController.java index 3cf6c9e..a24475d 100644 --- a/src/main/java/net/Broken/RestApi/MusicWebAPIController.java +++ b/src/main/java/net/Broken/RestApi/MusicWebAPIController.java @@ -84,18 +84,18 @@ public class MusicWebAPIController { // TODO change token to cookie @RequestMapping(value = "/command", method = RequestMethod.POST) - public ResponseEntity command(@RequestBody CommandPostData data, HttpServletRequest request, @RequestParam(value = "guild") String guildId){ + public ResponseEntity command(@RequestBody CommandPostData data, HttpServletRequest request, @RequestParam(value = "guild") String guildId, @CookieValue("token") String token){ if(data.command != null) { - if(data.token != null) { + if(token != null) { Guild guild = MainBot.jda.getGuildById(guildId); if(guild == null ){ logger.warn("Request whit no guild!"); - return new ResponseEntity<>(HttpStatus.BAD_REQUEST); + return new ResponseEntity<>(new CommandResponseData(data.command,"Missing Guild!\nPlease Re-connect.","token"), HttpStatus.UNAUTHORIZED); } try { - UserEntity user = userUtils.getUserWithApiToken(userRepository, data.token); + UserEntity user = userUtils.getUserWithApiToken(userRepository, token); logger.info("Receive command " + data.command + " from " + request.getRemoteAddr() + " USER: " + user.getName() + " GUILD: " + guild.getName()); if (ApiCommandLoader.apiCommands.containsKey(data.command)) diff --git a/src/main/resources/static/js/music.js b/src/main/resources/static/js/music.js index 5600d45..773a402 100644 --- a/src/main/resources/static/js/music.js +++ b/src/main/resources/static/js/music.js @@ -316,7 +316,6 @@ function updateControl(data){ function sendCommand(command){ modal_loading.modal('open'); - command["token"] = Cookies.get('token'); console.log(command) $.ajax({ type: "POST",