From 69792d01198a32480b13413cef9ca22f1c7138d8 Mon Sep 17 00:00:00 2001
From: Sergey Konovalov <Sergey.Konovalov@onlyoffice.com>
Date: Sun, 4 May 2025 18:01:38 +0300
Subject: [PATCH] [bug] Use current password for pdf; Fix bug 74298

---
 DocService/sources/canvasservice.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/DocService/sources/canvasservice.js b/DocService/sources/canvasservice.js
index 3d7d3f25..36c6b2e4 100644
--- a/DocService/sources/canvasservice.js
+++ b/DocService/sources/canvasservice.js
@@ -868,8 +868,9 @@ function* commandSaveFromOrigin(ctx, cmd, outputData, password) {
   var completeParts = yield* saveParts(ctx, cmd, "changes0.json");
   if (completeParts) {
     let docPassword = sqlBase.DocumentPassword.prototype.getDocPassword(ctx, password);
-    if (docPassword.initial) {
-      cmd.setPassword(docPassword.initial);
+    //Use current password for pdf because password is entered in the browser when opening and is set via setPassword
+    if (docPassword.initial || docPassword.current) {
+      cmd.setPassword(docPassword.initial || docPassword.current);
     }
     //todo setLCID in browser
     var queueData = getSaveTask(ctx, cmd);