From 67a2defe413017bdb14a621d859358333ef1abe8 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 5 Apr 2019 06:13:01 +0200 Subject: [PATCH 1/2] made all api methods public --- .../bugageocaching/controller/Controller.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index 8992e4a..a2e93df 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -130,7 +130,7 @@ public class Controller { @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @RequestMapping("/api/logout") @ResponseBody - ResponseEntity logout(@RequestParam String token) { + public ResponseEntity logout(@RequestParam String token) { // System.out.println("logout"); User user = userRepository.findByUsername(token.substring(0, token.indexOf("$"))); // System.out.println(token); @@ -146,10 +146,10 @@ public class Controller { @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @RequestMapping("/api/createStation") @ResponseBody - ResponseEntity createStation(@RequestParam String description, + public ResponseEntity createStation(@RequestParam String description, @RequestParam String lattitude, @RequestParam String longitude, - @RequestParam String solution) throws IllegalParameterException { + @RequestParam String solution) { if (description.length() == 0 || lattitude.length() == 0 || longitude.length() == 0 || solution.length() == 0) { return ResponseEntity.status(400).body("At least one Argument was empty"); @@ -196,7 +196,7 @@ public class Controller { @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @RequestMapping("/api/checkAdmin") @ResponseBody - ResponseEntity checkAdmin(@RequestParam String token) { + public ResponseEntity checkAdmin(@RequestParam String token) { User user = userRepository.findByUsername(token.substring(0, token.indexOf("$"))); for (Role role : user.getRoles()) { if (role.getId() == 0) { // is admin @@ -210,18 +210,18 @@ public class Controller { @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @RequestMapping("/api/getAllStations") @ResponseBody - ResponseEntity getAllStations() { + public ResponseEntity getAllStations() { return ResponseEntity.status(200).body(new Gson().toJson(stationRepository.findAll())); } @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @RequestMapping("/api/createCache") @ResponseBody - ResponseEntity createCache(@RequestParam String description, + public ResponseEntity createCache(@RequestParam String description, @RequestParam String name, @RequestParam String rankingPoints, @RequestParam(value = "rewardID", defaultValue = "-1") String rewardID, - @RequestParam List stationen) throws IllegalParameterException { + @RequestParam List stationen) { if (description.length() == 0 || name.length() == 0 || rankingPoints.length() == 0 || stationen.size() == 0) { return ResponseEntity.status(400).body("Fields can´t be empty"); @@ -271,7 +271,7 @@ public class Controller { @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @RequestMapping("/api/deleteCache") @ResponseBody - ResponseEntity deleteCache(@RequestParam String cacheID) { + public ResponseEntity deleteCache(@RequestParam String cacheID) { Optional optionalCache = cacheRepository.findById(Integer.valueOf(cacheID)); if (!optionalCache.isPresent()) { return ResponseEntity.status(404).body(new Gson().toJson("There is no cache with the ID " + cacheID)); @@ -299,7 +299,7 @@ public class Controller { @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @RequestMapping("/api/getMyCaches") @ResponseBody - ResponseEntity getMyCaches(@RequestParam String token) { + public ResponseEntity getMyCaches(@RequestParam String token) { try { User user = userRepository.findByUsername(token.substring(0, token.indexOf("$"))); if (user != null) { @@ -322,14 +322,14 @@ public class Controller { @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @RequestMapping("/api/getRankingList") @ResponseBody - ResponseEntity getRankingList() { + public ResponseEntity getRankingList() { return ResponseEntity.status(200).body(new Gson().toJson(userRepository.getRankingList())); } @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @RequestMapping("/api/getUser") @ResponseBody - ResponseEntity getUser(@RequestParam String token) { + public ResponseEntity getUser(@RequestParam String token) { try { User user = userRepository.findByUsername(token.substring(0, token.indexOf("$"))); if (user != null) { From 01d860542b453d3c408629ddbef968513527e4a7 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Fri, 5 Apr 2019 11:04:53 +0200 Subject: [PATCH 2/2] Changed some ResponseEntities --- .../bugageocaching/controller/Controller.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index a2e93df..a962339 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -109,8 +109,8 @@ public class Controller { CacheAccesDefinition cacheAccesDefinition = cacheAccesDefinitionOptional.get(); bearbeitet.setCacheAccesDefinition(cacheAccesDefinition); } else { - throw new IllegalParameterException("There is no cacheAccesDefinition with the ID " + 0); - } + return ResponseEntity.status(404).body("There is no cacheAccesDefinition with the ID " + 0); + } bearbeitetRepository.save(bearbeitet); @@ -147,11 +147,11 @@ public class Controller { @RequestMapping("/api/createStation") @ResponseBody public ResponseEntity createStation(@RequestParam String description, - @RequestParam String lattitude, + @RequestParam String latitude, @RequestParam String longitude, @RequestParam String solution) { - if (description.length() == 0 || lattitude.length() == 0 || longitude.length() == 0 || solution.length() == 0) { + if (description.length() == 0 || latitude.length() == 0 || longitude.length() == 0 || solution.length() == 0) { return ResponseEntity.status(400).body("At least one Argument was empty"); } @@ -159,9 +159,9 @@ public class Controller { double longi; try { - latti = Double.valueOf(lattitude); + latti = Double.valueOf(latitude); if (latti < -90 || latti > 90) { - return ResponseEntity.status(400).body("Lattitude has to be between -90 and 90 Degree"); + return ResponseEntity.status(400).body("Latitude has to be between -90 and 90 Degree"); } } catch (NumberFormatException e) { return ResponseEntity.status(400).body("Latitude has to be a decimal"); @@ -198,6 +198,9 @@ public class Controller { @ResponseBody public ResponseEntity checkAdmin(@RequestParam String token) { User user = userRepository.findByUsername(token.substring(0, token.indexOf("$"))); + if(user == null){ + return ResponseEntity.status(404).body("User was not found"); + } for (Role role : user.getRoles()) { if (role.getId() == 0) { // is admin return ResponseEntity.status(200).body("User is Admin");