From 00e42726bd7a33c3ace9b32db1c5383085f74b7c Mon Sep 17 00:00:00 2001
From: Sergey Konovalov <Sergey.Konovalov@onlyoffice.com>
Date: Tue, 26 Apr 2022 14:26:47 +0300
Subject: [PATCH] Revert "[wopi] Move pdf/djvu/xps to WordPdf action"

This reverts commit 135662f1131214d01d244b9da2863c73e69479d1.
---
 Common/config/default.json       | 3 +--
 DocService/sources/wopiClient.js | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Common/config/default.json b/Common/config/default.json
index 0210b84d..074aa128 100644
--- a/Common/config/default.json
+++ b/Common/config/default.json
@@ -81,8 +81,7 @@
 		"favIconUrlCell" : "/web-apps/apps/spreadsheeteditor/main/resources/img/favicon.ico",
 		"favIconUrlSlide" : "/web-apps/apps/presentationeditor/main/resources/img/favicon.ico",
 		"fileInfoBlockList" : ["FileUrl"],
-		"wordPdf": ["pdf", "djvu", "xps", "oxps"],
-		"wordView": ["doc", "dotx", "dotm", "dot", "fodt", "ott", "rtf", "mht", "html", "htm", "xml", "epub", "fb2"],
+		"wordView": ["pdf", "djvu", "xps", "oxps", "doc", "dotx", "dotm", "dot", "fodt", "ott", "rtf", "mht", "html", "htm", "xml", "epub", "fb2"],
 		"wordEdit": ["docx", "docm", "docxf", "oform", "odt", "txt"],
 		"cellView": ["xls", "xlsb", "xltx", "xltm", "xlt", "fods", "ots"],
 		"cellEdit": ["xlsx", "xlsm", "ods", "csv"],
diff --git a/DocService/sources/wopiClient.js b/DocService/sources/wopiClient.js
index 7d333005..c94456b8 100644
--- a/DocService/sources/wopiClient.js
+++ b/DocService/sources/wopiClient.js
@@ -56,7 +56,6 @@ const cfgCallbackRequestTimeout = config.get('services.CoAuthoring.server.callba
 const cfgDownloadTimeout = config.get('FileConverter.converter.downloadTimeout');
 const cfgWopiFileInfoBlockList = config.get('wopi.fileInfoBlockList');
 const cfgWopiWopiZone = config.get('wopi.wopiZone');
-const cfgWopiWordPdf = config.get('wopi.wordPdf');
 const cfgWopiWordView = config.get('wopi.wordView');
 const cfgWopiWordEdit = config.get('wopi.wordEdit');
 const cfgWopiCellView = config.get('wopi.cellView');
@@ -101,10 +100,10 @@ function discovery(req, res) {
     try {
       logger.info('wopiDiscovery start');
       let baseUrl = cfgWopiHost || utils.getBaseUrlByRequest(req);
-      let names = ['WordPdf', 'Word','Excel','PowerPoint'];
-      let favIconUrls = [cfgWopiFavIconUrlWord, cfgWopiFavIconUrlWord, cfgWopiFavIconUrlCell, cfgWopiFavIconUrlSlide];
-      let exts = [{view: cfgWopiWordPdf, edit: []}, {view: cfgWopiWordView, edit: cfgWopiWordEdit},
-        {view: cfgWopiCellView, edit: cfgWopiCellEdit}, {view: cfgWopiSlideView, edit: cfgWopiSlideEdit}];
+      let names = ['Word','Excel','PowerPoint'];
+      let favIconUrls = [cfgWopiFavIconUrlWord, cfgWopiFavIconUrlCell, cfgWopiFavIconUrlSlide];
+      let exts = [{view: cfgWopiWordView, edit: cfgWopiWordEdit}, {view: cfgWopiCellView, edit: cfgWopiCellEdit},
+        {view: cfgWopiSlideView, edit: cfgWopiSlideEdit}];
       let templateStart = `${baseUrl}/hosting/wopi`;
       let templateEnd = `&amp;&lt;rs=DC_LLCC&amp;&gt;&lt;dchat=DISABLE_CHAT&amp;&gt;&lt;embed=EMBEDDED&amp;&gt;`;
       templateEnd += `&lt;fs=FULLSCREEN&amp;&gt;&lt;hid=HOST_SESSION_ID&amp;&gt;&lt;rec=RECORDING&amp;&gt;`;