Merge branch 'maven/fixes/8.0' into maven/fixes/8.1

edu-sharing · Nov 15, 2023 · 145c1e4 · 145c1e4
2 parents 5027b58 + 6638b31
commit 145c1e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/service/src/main/php/config.dist.php b/service/src/main/php/config.dist.php
@@ -21,7 +21,7 @@
 /*onlyoffice*/
 define('ONLYOFFICE_DOCUMENT_SERVER', '');
 define('ONLYOFFICE_PLUGIN_URL', '');
-define('ONLYOFFICE_JWT_SECRET','');
+define('ONLYOFFICE_JWT_SECRET', '');
 define('ONLYOFFICE_STORAGEFOLDER','storage');
 
 /*onyx*/

diff --git a/service/src/main/php/src/tools/onlyoffice/doceditor.php b/service/src/main/php/src/tools/onlyoffice/doceditor.php
@@ -235,10 +235,7 @@ function getCallbackUrl($id) {
             }
         };
         <?php if (defined('ONLYOFFICE_JWT_SECRET') && !empty(ONLYOFFICE_JWT_SECRET)): ?>
-        config.token = "<?php
-            $token = ["payload" => $payload];
-            echo JWT::encode($token, ONLYOFFICE_JWT_SECRET);
-            ?>"
+        config.token = "<?php echo JWT::encode($payload, ONLYOFFICE_JWT_SECRET);?>"
         <?php endif; ?>;
         var сonnectEditor = function () {
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);