[bug] For bug 49716

Teetoow · Apr 27, 2021 · 98ae4f7 · 98ae4f7
1 parent 9cb1188
commit 98ae4f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js
@@ -88,6 +88,7 @@ function InputCommand(data, copyExplicit) {
     this['inline'] = data['inline'];
     this['password'] = data['password'];
     this['savepassword'] = data['savepassword'];
+    this['withoutPassword'] = data['withoutPassword'];
     this['outputurls'] = data['outputurls'];
     this['closeonerror'] = data['closeonerror'];
     this['serverVersion'] = data['serverVersion'];
@@ -143,6 +144,7 @@ function InputCommand(data, copyExplicit) {
     this['inline'] = undefined;//content disposition
     this['password'] = undefined;
     this['savepassword'] = undefined;
+    this['withoutPassword'] = undefined;
     this['outputurls'] = undefined;
     this['closeonerror'] = undefined;
     this['serverVersion'] = undefined;
@@ -377,6 +379,12 @@ InputCommand.prototype = {
   setSavePassword: function(data) {
     this['savepassword'] = data;
   },
+  getWithoutPassword: function() {
+    return this['withoutPassword'];
+  },
+  setWithoutPassword: function(data) {
+    this['withoutPassword'] = data;
+  },
   setOutputUrls: function(data) {
     this['outputurls'] = data;
   },

diff --git a/DocService/sources/canvasservice.js b/DocService/sources/canvasservice.js
@@ -1172,7 +1172,7 @@ exports.downloadAs = function(req, res) {
       }
       var selectRes = yield taskResult.select(docId);
       var row = selectRes.length > 0 ? selectRes[0] : null;
-      if (row && row.password) {
+      if (row && row.password && !cmd.getWithoutPassword()) {
         cmd.setSavePassword(row.password);
       }
       cmd.setData(req.body);