Merge branch 'feature/add_error_page' into 'develop'

add error controller See merge request !21

Merge branch 'feature/add_error_page' into 'develop'
add error controller See merge request !21
27c75d02 · BEAUVAIS ANTOINE · d75552a9 · f7677b81 · 27c75d02 · 27c75d02
Commit 27c75d02 authored 3 years ago by BEAUVAIS ANTOINE
--- a/src/main/java/fr/unistra/sil/erp/back/controller/web/WebErrorController.java
+++ b/src/main/java/fr/unistra/sil/erp/back/controller/web/WebErrorController.java
+package fr.unistra.sil.erp.back.controller.web;
+
+import org.springframework.boot.web.servlet.error.ErrorController;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+public class WebErrorController implements ErrorController {
+    @RequestMapping("/error")
+    public String handleError(HttpServletRequest request) {
+        Object status = request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE);
+
+        if (status != null) {
+            int statusCode = Integer.parseInt(status.toString());
+
+            if (statusCode == HttpStatus.NOT_FOUND.value()) {
+                return "error-404";
+            } else if (statusCode == HttpStatus.INTERNAL_SERVER_ERROR.value()) {
+                return "error";
+            }
+        }
+        return "error";
+    }
+}
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
 spring.mvc.static-path-pattern=/static/**
 spring.datasource.url=jdbc:sqlite:dev.db
+server.error.whitelabel.enabled=false
+server.error.path=/error
--- a/src/main/resources/templates/error-404.html
+++ b/src/main/resources/templates/error-404.html
+<!DOCTYPE html>
+<html lang="EN">
+<body>
+<h1>Requested page not found</h1>
+<a href="/">Go Home</a>
+</body>
+</html>
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
+<!DOCTYPE html>
+<html lang="EN">
+<body>
+<h1>Something went wrong! </h1>
+<h2>Our Engineers are on it</h2>
+<a href="/">Go Home</a>
+</body>
+</html>