From 3b9bed32aea6b88354aac726cf963555f9983558 Mon Sep 17 00:00:00 2001
From: Sergey Konovalov <Sergey.Konovalov@onlyoffice.com>
Date: Sun, 28 Apr 2024 00:28:33 +0300
Subject: [PATCH] [bug] Fix "WOPISrc" convert param in getConverterHtml

---
 DocService/sources/converterservice.js | 2 +-
 DocService/sources/wopiClient.js       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DocService/sources/converterservice.js b/DocService/sources/converterservice.js
index 31062161..5dad2001 100644
--- a/DocService/sources/converterservice.js
+++ b/DocService/sources/converterservice.js
@@ -651,7 +651,7 @@ function getConverterHtmlHandler(req, res) {
       ctx.setDocId(docId);
       if (!(wopiSrc && access_token && access_token && targetext && docId) ||
         constants.AVS_OFFICESTUDIO_FILE_UNKNOWN === formatChecker.getFormatFromString(targetext)) {
-        ctx.logger.debug('convert-and-edit-handler invalid params: wopiSrc=%s; access_token=%s; targetext=%s; docId=%s', wopiSrc, access_token, targetext, docId);
+        ctx.logger.debug('convert-and-edit-handler invalid params: WOPISrc=%s; access_token=%s; targetext=%s; docId=%s', wopiSrc, access_token, targetext, docId);
         utils.fillResponse(req, res, new commonDefines.ConvertStatus(constants.CONVERT_PARAMS), isJson);
         return;
       }
diff --git a/DocService/sources/wopiClient.js b/DocService/sources/wopiClient.js
index 06adc492..90861e4b 100644
--- a/DocService/sources/wopiClient.js
+++ b/DocService/sources/wopiClient.js
@@ -596,7 +596,7 @@ function getConverterHtml(req, res) {
       let targetext = req.params.targetext;
 
       if (!(wopiSrc && access_token && access_token_ttl && ext && targetext)) {
-        ctx.logger.debug('convert-and-edit invalid params: wopiSrc=%s; access_token=%s; access_token_ttl=%s; ext=%s; targetext=%s', wopiSrc, access_token, access_token_ttl, ext, targetext);
+        ctx.logger.debug('convert-and-edit invalid params: WOPISrc=%s; access_token=%s; access_token_ttl=%s; ext=%s; targetext=%s', wopiSrc, access_token, access_token_ttl, ext, targetext);
         return;
       }
 
@@ -612,7 +612,7 @@ function getConverterHtml(req, res) {
       if (docId) {
         let baseUrl = tenWopiHost || utils.getBaseUrlByRequest(ctx, req);
         params.statusHandler = `${baseUrl}/hosting/wopi/convert-and-edit-handler`;
-        params.statusHandler += `?wopiSrc=${encodeURI(wopiSrc)}&access_token=${encodeURI(access_token)}`;
+        params.statusHandler += `?${constants.SHARD_KEY_WOPI_NAME}=${encodeURI(wopiSrc)}&access_token=${encodeURI(access_token)}`;
         params.statusHandler += `&targetext=${encodeURI(targetext)}&docId=${encodeURI(docId)}`;
         if (tenTokenEnableBrowser) {
           let tokenData = {docId: docId};