Merge pull request #1612 from /issues/1611-not-found

Fix #1611: 404 error is propagated as 500
wultra · Apr 2, 2024 · fd9d573 · fd9d573
2 parents 0a5ea29 + 41ed3dc
commit fd9d573
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/...n/java/io/getlime/security/powerauth/app/nextstep/exception/DefaultExceptionResolver.java b/...n/java/io/getlime/security/powerauth/app/nextstep/exception/DefaultExceptionResolver.java
@@ -40,6 +40,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 /**
  * Controller advice responsible for default exception resolving.
@@ -862,4 +863,17 @@ public DefaultExceptionResolver(Audit audit) {
         return new ErrorResponse(error);
     }
 
+    /**
+     * Exception handler for no resource found.
+     *
+     * @param e Exception.
+     * @return Response with error details.
+     */
+    @ExceptionHandler(NoResourceFoundException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public @ResponseBody ErrorResponse handleNoResourceFoundException(final NoResourceFoundException e) {
+        logger.warn("Error occurred when calling an API: {}", e.getMessage());
+        logger.debug("Exception detail: ", e);
+        return new ErrorResponse("ERROR_NOT_FOUND", "Resource not found.");
+    }
 }
diff --git a/...a/io/getlime/security/powerauth/app/tppengine/errorhandling/DefaultExceptionResolver.java b/...a/io/getlime/security/powerauth/app/tppengine/errorhandling/DefaultExceptionResolver.java
@@ -37,6 +37,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 /**
  * Controller advice responsible for default exception resolving.
@@ -141,4 +142,17 @@ public DefaultExceptionResolver(Audit audit) {
         return new ErrorResponse(new TppAppError("tpp.app.unableToCreate", t.getErrors()));
     }
 
-}
+    /**
+     * Exception handler for no resource found.
+     *
+     * @param e Exception.
+     * @return Response with error details.
+     */
+    @ExceptionHandler(NoResourceFoundException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public @ResponseBody ErrorResponse handleNoResourceFoundException(final NoResourceFoundException e) {
+        logger.warn("Error occurred when calling an API: {}", e.getMessage());
+        logger.debug("Exception detail: ", e);
+        return new ErrorResponse("ERROR_NOT_FOUND", "Resource not found.");
+    }
+}
diff --git a/...in/java/io/getlime/security/powerauth/app/webflow/exception/DefaultExceptionResolver.java b/...in/java/io/getlime/security/powerauth/app/webflow/exception/DefaultExceptionResolver.java
@@ -33,6 +33,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 /**
  * Controller advice responsible for default exception resolving.
@@ -134,4 +135,17 @@ public String handleUnauthorizedException(InsufficientAuthenticationException ex
         return new ErrorResponse(error);
     }
 
+    /**
+     * Exception handler for no resource found.
+     *
+     * @param e Exception.
+     * @return Response with error details.
+     */
+    @ExceptionHandler(NoResourceFoundException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public @ResponseBody ErrorResponse handleNoResourceFoundException(final NoResourceFoundException e) {
+        logger.warn("Error occurred when calling an API: {}", e.getMessage());
+        logger.debug("Exception detail: ", e);
+        return new ErrorResponse("ERROR_NOT_FOUND", "Resource not found.");
+    }
 }