From b7ceb047dfa2c666018481bc9d7649231ec5e735 Mon Sep 17 00:00:00 2001
From: Artem Tarasov <artem.tarasov@onlyoffice.com>
Date: Wed, 20 Jul 2022 23:14:20 +0300
Subject: [PATCH] Web: Doceditor: added winston to initMiddleware

---
 web/ASC.Web.Editor/src/server/index.js        |  4 +++
 .../src/server/initMiddleware.js              | 33 +++++++++++--------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/web/ASC.Web.Editor/src/server/index.js b/web/ASC.Web.Editor/src/server/index.js
index 56fd469176..8d1de39f2a 100644
--- a/web/ASC.Web.Editor/src/server/index.js
+++ b/web/ASC.Web.Editor/src/server/index.js
@@ -70,6 +70,10 @@ app.get("/products/files/doceditor", async (req, res) => {
   await i18next.changeLanguage(userLng);
   const initialI18nStoreASC = i18n.services.resourceStore.data;
 
+  if (initialEditorState?.error) {
+    winston.error(initialEditorState.error.errorMessage);
+  }
+
   const htmlString = template(
     initialEditorState,
     appComponent,
diff --git a/web/ASC.Web.Editor/src/server/initMiddleware.js b/web/ASC.Web.Editor/src/server/initMiddleware.js
index e2ade6198e..291f05b511 100644
--- a/web/ASC.Web.Editor/src/server/initMiddleware.js
+++ b/web/ASC.Web.Editor/src/server/initMiddleware.js
@@ -7,6 +7,11 @@ import path from "path";
 import { I18nextProvider } from "react-i18next";
 import fs from "fs";
 import GlobalStyle from "../components/GlobalStyle.js";
+import winston from "./logger.js";
+
+winston.stream = {
+  write: (message) => winston.info(message),
+};
 
 const sheet = new ServerStyleSheet();
 
@@ -15,19 +20,21 @@ export default async (req, res, next) => {
     path.join(__dirname, "client/manifest.json"),
     "utf-8"
   );
+  try {
+    req.initialEditorState = await initDocEditor(req);
+    req.assets = JSON.parse(manifest);
 
-  req.initialEditorState = await initDocEditor(req);
-  req.assets = JSON.parse(manifest);
-
-  req.appComponent = renderToString(
-    sheet.collectStyles(
-      <I18nextProvider i18n={req.i18n}>
-        <GlobalStyle />
-        <App {...req.initialEditorState} />
-      </I18nextProvider>
-    )
-  );
-  req.styleTags = sheet.getStyleTags();
-
+    req.appComponent = renderToString(
+      sheet.collectStyles(
+        <I18nextProvider i18n={req.i18n}>
+          <GlobalStyle />
+          <App {...req.initialEditorState} />
+        </I18nextProvider>
+      )
+    );
+    req.styleTags = sheet.getStyleTags();
+  } catch (e) {
+    winston.error(e.message);
+  }
   next();
 };