diff --git a/src/main/java/net/Broken/RestApi/Data/UserManager/GuildInfo.java b/src/main/java/net/Broken/RestApi/Data/UserManager/GuildInfo.java new file mode 100644 index 0000000..cc0f7ad --- /dev/null +++ b/src/main/java/net/Broken/RestApi/Data/UserManager/GuildInfo.java @@ -0,0 +1,11 @@ +package net.Broken.RestApi.Data.UserManager; + +public class GuildInfo { + public String name; + public String id; + + public GuildInfo(String name, String id) { + this.name = name; + this.id = id; + } +} diff --git a/src/main/java/net/Broken/RestApi/MusicWebAPIController.java b/src/main/java/net/Broken/RestApi/MusicWebAPIController.java index 2179ba4..5ba423f 100644 --- a/src/main/java/net/Broken/RestApi/MusicWebAPIController.java +++ b/src/main/java/net/Broken/RestApi/MusicWebAPIController.java @@ -46,7 +46,7 @@ public class MusicWebAPIController { return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } else{ - logger.info("currentMusicInfo for " + guild.getName()); + logger.trace("currentMusicInfo for " + guild.getName()); } Music musicCommande = (Music) MainBot.commandes.get("music"); @@ -74,7 +74,7 @@ public class MusicWebAPIController { return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } else{ - logger.info("getPlaylist for " + guild.getName()); + logger.trace("getPlaylist for " + guild.getName()); } List list = null; @@ -82,6 +82,7 @@ public class MusicWebAPIController { return new ResponseEntity<>(new PlaylistData(list), HttpStatus.OK); } +// TODO change token to cookie @RequestMapping(value = "/command", method = RequestMethod.POST) public ResponseEntity command(@RequestBody CommandPostData data, HttpServletRequest request, @RequestParam(value = "guild") String guildId){ @@ -128,7 +129,7 @@ public class MusicWebAPIController { return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } else{ - logger.info("getPlaylist for " + guild.getName()); + logger.trace("getPlaylist for " + guild.getName()); } List temp = new ArrayList<>(); for(VoiceChannel aChanel : FindGeneral.find(guild).getVoiceChannels()){ diff --git a/src/main/java/net/Broken/RestApi/UserManagerAPIController.java b/src/main/java/net/Broken/RestApi/UserManagerAPIController.java index d0b79f7..8d66a17 100644 --- a/src/main/java/net/Broken/RestApi/UserManagerAPIController.java +++ b/src/main/java/net/Broken/RestApi/UserManagerAPIController.java @@ -4,25 +4,22 @@ import net.Broken.DB.Entity.PendingUserEntity; import net.Broken.DB.Entity.UserEntity; import net.Broken.DB.Repository.PendingUserRepository; import net.Broken.DB.Repository.UserRepository; -import net.Broken.RestApi.Data.UserManager.CheckResposeData; -import net.Broken.RestApi.Data.UserManager.ConfirmData; -import net.Broken.RestApi.Data.UserManager.UserConnectionData; -import net.Broken.RestApi.Data.UserManager.UserInfoData; -import net.Broken.Tools.UserManager.Exceptions.PasswordNotMatchException; -import net.Broken.Tools.UserManager.Exceptions.TokenNotMatch; -import net.Broken.Tools.UserManager.Exceptions.UserAlreadyRegistered; -import net.Broken.Tools.UserManager.Exceptions.UserNotFoundException; +import net.Broken.MainBot; +import net.Broken.RestApi.Data.UserManager.*; +import net.Broken.Tools.UserManager.Exceptions.*; import net.Broken.Tools.UserManager.UserUtils; +import net.dv8tion.jda.core.entities.Guild; +import net.dv8tion.jda.core.entities.User; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; /** @@ -97,5 +94,26 @@ public class UserManagerAPIController { } } + @RequestMapping(value = "/getGuilds", method = RequestMethod.GET) + public ResponseEntity> getGuilds(@CookieValue("token") String token){ + logger.debug(token); + try { + UserEntity userE = userUtils.getUserWithApiToken(userRepository, token); + User user = MainBot.jda.getUserById(userE.getJdaId()); + List temp = new ArrayList<>(); + + for (Guild guild : user.getMutualGuilds()){ + temp.add(new GuildInfo(guild.getName(), guild.getId())); + } + return new ResponseEntity<>(temp, HttpStatus.OK); + + + } catch (UnknownTokenException e) { + logger.catching(e); + return new ResponseEntity<>(HttpStatus.UNAUTHORIZED); + } + + } + }