From 7941ba2e1f8eb3b393b558ffdf6a25b143e5e07e Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Sun, 25 Aug 2024 22:26:28 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84Added=20user=20friendly=20error=20p?= =?UTF-8?q?age=20instead=20of=20JSON=20response?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/middlewares/error.middleware.ts | 10 +- .../onlyoffice-connector/src/views/error.eta | 211 ++++++++++++++++++ 2 files changed, 219 insertions(+), 2 deletions(-) create mode 100644 tdrive/connectors/onlyoffice-connector/src/views/error.eta diff --git a/tdrive/connectors/onlyoffice-connector/src/middlewares/error.middleware.ts b/tdrive/connectors/onlyoffice-connector/src/middlewares/error.middleware.ts index ceb29809..49f1c317 100644 --- a/tdrive/connectors/onlyoffice-connector/src/middlewares/error.middleware.ts +++ b/tdrive/connectors/onlyoffice-connector/src/middlewares/error.middleware.ts @@ -1,14 +1,20 @@ import logger from '@/lib/logger'; import { NextFunction, Request, Response } from 'express'; +import * as Utils from '@/utils'; +import { SERVER_ORIGIN, SERVER_PREFIX } from '@config'; export default (error: Error & { status?: number }, req: Request, res: Response, next: NextFunction): void => { try { const status: number = error.status || 500; - const message: string = error.message || 'something went wrong'; + const message: string = error.message || 'Something went wrong'; logger.error(`[${req.method}] ${req.path} >> StatusCode:: ${status}, Message:: ${message}`, error.stack); - res.status(status).json({ message }); + res.status(status); + res.render('error', { + server: Utils.joinURL([SERVER_ORIGIN, SERVER_PREFIX]), + errorMessage: message, + }); } catch (error) { next(error); } diff --git a/tdrive/connectors/onlyoffice-connector/src/views/error.eta b/tdrive/connectors/onlyoffice-connector/src/views/error.eta new file mode 100644 index 00000000..b82ed3c3 --- /dev/null +++ b/tdrive/connectors/onlyoffice-connector/src/views/error.eta @@ -0,0 +1,211 @@ + + + + + + + + 404 HTML Tempate by Colorlib + + + + + + + +
+
+
+

500

+
+

We are sorry, internal server error!

+

Please, contact our support at support@twake.com.

+ Back To Homepage +
+
+ + + + + +