Skip to content

Commit 524e2a6

Browse files
authored
Merge pull request #13 from code135/cleaning
removed / in urls #2
2 parents ecdd4bb + bb752bb commit 524e2a6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

jamais404/src/main/java/com/jamais404/Handle404Controller.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ public String handleError(Model model, HttpServletRequest request,
4545

4646
// Gets the URI that triggered the 404 error (to avoid /error)
4747
String originalUri = request.getAttribute(RequestDispatcher.FORWARD_REQUEST_URI).toString();
48-
model.addAttribute("url", originalUri);
48+
String parsedUri = originalUri.replace("/", "");
49+
model.addAttribute("url", parsedUri);
4950

50-
Page page = pageRepository.findByName(originalUri);
51+
Page page = pageRepository.findByName(parsedUri);
5152

5253
if (page != null) {
5354
String ownerUsername = page.getOwner().getUsername();
@@ -82,7 +83,7 @@ public String handleError(Model model, HttpServletRequest request,
8283
User owner = userRepository.findByUsername(authentication.getName());
8384

8485
page = new Page();
85-
page.setName(originalUri);
86+
page.setName(parsedUri);
8687
page.setOwner(owner);
8788
pageRepository.save(page);
8889

jamais404/src/main/java/com/jamais404/HomeController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public String home(Model model, Authentication authentication) {
4545
*/
4646
@PostMapping(value = "/search")
4747
public ModelAndView search(@RequestParam String query, Authentication authentication) {
48-
String redirectUrl = "redirect:/" + query;
48+
String redirectUrl = "redirect:/" + query.replace("/", "");
4949

5050
return new ModelAndView(redirectUrl);
5151
}

0 commit comments

Comments
 (0)