Paste/Backend
Archived
2
0
Fork 0
Code Issues 1 Pull Requests Actions Activity

redirect on invalid paste
All checks were successful
Deploy App / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Successful in 1m19s
Details
Publish Docker Image / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Successful in 57s
Details

Browse Source
This commit is contained in:
Lee 2024-06-01 21:21:55 +01:00
parent b2c034df5f
commit 0e585ed1cd
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/cc/fascinated/backend/controller/IndexController.java
View File

@ -1,5 +1,6 @@
package cc.fascinated.backend.controller; package cc.fascinated.backend.controller;
import cc.fascinated.backend.exception.impl.ResourceNotFoundException;
import cc.fascinated.backend.model.Paste; import cc.fascinated.backend.model.Paste;
import cc.fascinated.backend.service.PasteService; import cc.fascinated.backend.service.PasteService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -30,18 +31,29 @@ public class IndexController {
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public String paste(@PathVariable String id, Model model) { public String paste(@PathVariable String id, Model model) {
Paste paste = pasteService.getPaste(id); try {
model.addAttribute("paste", paste); Paste paste = pasteService.getPaste(id);
model.addAttribute("title", "Paste - " + paste.getId()); if (paste == null) { // If the paste does not exist, redirect to the home page
model.addAttribute("rawUrl", "/raw/" + paste.getId()); return "redirect:/";
return "paste"; }
model.addAttribute("paste", paste);
model.addAttribute("title", "Paste - " + paste.getId());
model.addAttribute("rawUrl", "/raw/" + paste.getId());
return "paste";
} catch (ResourceNotFoundException ex) {
return "redirect:/";
}
} }
@GetMapping(value = "/raw/{id}") @GetMapping(value = "/raw/{id}")
public String pasteRaw(@PathVariable String id, Model model) { public String pasteRaw(@PathVariable String id, Model model) {
Paste paste = pasteService.getPaste(id); try {
model.addAttribute("paste", paste); Paste paste = pasteService.getPaste(id);
model.addAttribute("title", "Paste - " + paste.getId() + " (Raw)"); model.addAttribute("paste", paste);
return "paste-raw"; model.addAttribute("title", "Paste - " + paste.getId() + " (Raw)");
return "paste-raw";
} catch (ResourceNotFoundException ex) {
return "redirect:/";
}
} }
} }