From fd93f234d0db746c7105a2d88a4bdeeb361d1b60 Mon Sep 17 00:00:00 2001 From: Vladislav Makhov Date: Wed, 11 Nov 2020 15:47:37 +0300 Subject: [PATCH] Refactoring --- web/ASC.Web.Common/src/desktop/index.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/web/ASC.Web.Common/src/desktop/index.js b/web/ASC.Web.Common/src/desktop/index.js index 907b0615aa..edaffc227a 100644 --- a/web/ASC.Web.Common/src/desktop/index.js +++ b/web/ASC.Web.Common/src/desktop/index.js @@ -1,16 +1,14 @@ import { toastr } from "asc-web-common"; import { setEncryptionKeys, getEncryptionAccess } from "../store/auth/actions"; +import { isDesktopClient, isEncryptionSupport } from "../store/auth/selectors"; const domain = window.location.origin; const provider = "AppServer"; +const guid = "{FFF0E1EB-13DB-4678-B67D-FF0A41DBBCEF}"; +const desktop = isDesktopClient; +const encryption = isEncryptionSupport; -const isDesktop = window["AscDesktopEditor"] || false; -const isEncryptionSupport = - (window["AscDesktopEditor"] && - typeof window.AscDesktopEditor.cloudCryptoCommand === "function") || - false; - -if (isDesktop && isEncryptionSupport) { +if (desktop && encryption) { window.cloudCryptoCommand = (type, params, callback) => { switch (type) { case "encryptionKeys": @@ -60,8 +58,7 @@ export class Desktop { userId, }; if (isEncryptionSupport) { - data.encryptionKeys.cryptoEngineId = - "{FFF0E1EB-13DB-4678-B67D-FF0A41DBBCEF}"; + data.encryptionKeys.cryptoEngineId = guid; } else { return; }