Refactoring

web/ASC.Web.Common/src/desktop/index.js

@@ -0,0 +1,49 @@
+export class Desktop {
+  static regDesktop(displayName = null, email = null) {
+    const data = {
+      displayName: displayName,
+      email: email,
+      domain: window.location.origin,
+      provider: "AppServer",
+    };
+    return window.AscDesktopEditor.execCommand(
+      "portal:login",
+      JSON.stringify(data)
+    );
+  }
+
+  static logout() {
+    const data = {
+      domain: window.location.origin,
+    };
+    return window.AscDesktopEditor.execCommand(
+      "portal:logout",
+      JSON.stringify(data)
+    );
+  }
+
+  static relogin() {
+    return setTimeout(() => {
+      const data = {
+        domain: window.location.origin,
+        onsuccess: "reload",
+      };
+      window.AscDesktopEditor.execCommand(
+        "portal:logout",
+        JSON.stringify(data)
+      );
+    }, 1000);
+  }
+
+  static setEncryptionKeys() {
+    return {};
+  }
+
+  static setAccess() {
+    return {};
+  }
+
+  static encryptionUploadDialog() {
+    return {};
+  }
+}

web/ASC.Web.Common/src/index.js

@@ -5,3 +5,4 @@ export * from "./components";
 export * as constants from "./constants";
 export * as utils from "./utils";
 export * from "./pages";
+export * from "./desktop";

web/ASC.Web.Common/src/store/auth/actions.js

@@ -1,5 +1,6 @@
 import { default as api } from "../../api";
 import { isDesktopClient } from "./selectors";
+import { Desktop } from "../../desktop/";
 
 export const LOGIN_POST = "LOGIN_POST";
 export const SET_CURRENT_USER = "SET_CURRENT_USER";
@@ -126,15 +127,7 @@ export function getUser(dispatch) {
     .getUser()
     .then((user) => {
       window.AscDesktopEditor &&
-        window.AscDesktopEditor.execCommand(
-          "portal:login",
-          JSON.stringify({
-            displayName: user.displayName,
-            email: user.email,
-            domain: window.location.origin,
-            provider: "AppServer",
-          })
-        );
+        Desktop.regDesktop(user.displayName, user.email);
       dispatch(setCurrentUser(user));
     })
     .catch((err) => dispatch(setCurrentUser({})));
@@ -193,14 +186,7 @@ export function logout() {
     return api.user
       .logout()
       .then(() => {
-        isDesktop &&
-          window.AscDesktopEditor.execCommand(
-            "portal:logout",
-            JSON.stringify({
-              domain: window.location.origin,
-            })
-          );
-
+        isDesktop && Desktop.logout();
         dispatch(setLogout());
       })
       .then(() => dispatch(setIsLoaded(true)));

web/ASC.Web.Common/src/store/auth/reducer.js

@@ -60,8 +60,9 @@ const initialState = {
       guestsCaption: "Guests",
     },
     isEncryptionSupport:
-      window["AscDesktopEditor"] &&
-      typeof window.AscDesktopEditor.cloudCryptoCommand === "function",
+      (window["AscDesktopEditor"] &&
+        typeof window.AscDesktopEditor.cloudCryptoCommand === "function") ||
+      false,
     isDesktopClient: window["AscDesktopEditor"] !== undefined,
   },
 };