IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Vladislav Makhov 2020-12-03 12:12:14 +03:00
parent 45ca67e7b8
commit f188489c06
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
View File

@ -187,7 +187,7 @@ class FilesRowContent extends React.PureComponent {
//debugger;
if (isPrivacy) {
return setEncryptionAccess(file).then((encryptedFile) => {
//debugger;
debugger;
if (!encryptedFile) return Promise.resolve();
return replaceFileStream(
file.id,
@ -200,7 +200,10 @@ class FilesRowContent extends React.PureComponent {
return openDocEditor(file.id, tab, file.webUrl);
})
.then(() => this.completeAction(itemId))
.catch((err) => toastr.error(err))
.catch((err) => {
debugger;
toastr.error(err);
})
.finally(() => setIsLoading(false));
};

47
products/ASC.Files/Client/src/helpers/desktop.js
View File

@ -32,28 +32,33 @@ export function encryptionUploadDialog(callback) {
export function setEncryptionAccess(file) {
return getEncryptionAccess(file.id).then((keys) => {
let promise = new Promise((resolve, reject) => {
window.AscDesktopEditor.cloudCryptoCommand(
"share",
{
"cryptoEngineId": guid,
"file": [file.viewUrl],
"keys": [
{
"publicKey":
"-----BEGIN PUBLIC KEY-----&#xAMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApEKtEiSlig1Ue3JF6ajv&#xAtlWXEDdd/zcBmKUpkVtgi3gvCbGFB2VnUZRgOBWLQ8Bx+VU5beFlg0+/jUNSIzs1&#xAMwjGFa17CV8CxaZmtwTZjDwkfozWopttwxHfRIaOV8t2ZFB2V2qoGBCC4vxeF2/t&#xAMkNOgAnhVjH8Pq3uy5oOwzlZgU5u93ly12Jpa/bl2xGiXAqJpPH8s7ceSWBe/0Ky&#xAiDRz1DtRMs2elWQ6ag+tZwBk3Ee+j+ffK62d2n/B6ksY9oZ/joyzaHzjgeKI4+3E&#xAxW0Wh4zt/EEuypc6ySVd6+3WafRRqvQm+tXpolX6NL9oeCsyj0YrQGVcg6qm7BXn&#xABQIDAQAB&#xA-----END PUBLIC KEY-----&#xA",
"userId": "66faa6e4-f133-11ea-b126-00ffeec8b4ef",
},
],
},
(obj) => {
let bytes = [];
if (obj.isCrypto) {
bytes = obj.bytes;
try {
window.AscDesktopEditor.cloudCryptoCommand(
"share",
{
"cryptoEngineId": guid,
"file": [file.viewUrl],
"keys": [
{
"publicKey":
"-----BEGIN PUBLIC KEY-----&#xAMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApEKtEiSlig1Ue3JF6ajv&#xAtlWXEDdd/zcBmKUpkVtgi3gvCbGFB2VnUZRgOBWLQ8Bx+VU5beFlg0+/jUNSIzs1&#xAMwjGFa17CV8CxaZmtwTZjDwkfozWopttwxHfRIaOV8t2ZFB2V2qoGBCC4vxeF2/t&#xAMkNOgAnhVjH8Pq3uy5oOwzlZgU5u93ly12Jpa/bl2xGiXAqJpPH8s7ceSWBe/0Ky&#xAiDRz1DtRMs2elWQ6ag+tZwBk3Ee+j+ffK62d2n/B6ksY9oZ/joyzaHzjgeKI4+3E&#xAxW0Wh4zt/EEuypc6ySVd6+3WafRRqvQm+tXpolX6NL9oeCsyj0YrQGVcg6qm7BXn&#xABQIDAQAB&#xA-----END PUBLIC KEY-----&#xA",
"userId": "66faa6e4-f133-11ea-b126-00ffeec8b4ef",
},
],
},
(obj) => {
let file = null;
if (obj.isCrypto !== false) {
let bytes = obj.bytes;
let filename = "temp_name";
file = new File([bytes], filename);
}
resolve(file);
}
resolve(bytes);
reject((e) => console.log("error: ", e));
}
);
);
} catch (e) {
reject(e);
}
});
return promise;
});