Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0

packages/client/src/store/FilesStore.js

@@ -1604,7 +1604,7 @@ class FilesStore {
         ].includes(err?.response?.status);
 
         if (isUserError && !isThirdPartyError) {
-          setIsErrorRoomNotAvailable(true);
+          this.setIsErrorRoomNotAvailable(true);
         } else {
           if (axios.isCancel(err)) {
             console.log("Request canceled", err.message);

packages/shared/store/SettingsStore.ts

@@ -979,8 +979,9 @@ class SettingsStore {
   };
 
   get isFrame() {
-    // console.log("get isFrame:", this.frameConfig?.name === window.name);
-    return this.frameConfig?.name === window.name;
+    const isFrame = this.frameConfig?.name === window.name;
+    window.DocSpaceConfig.isFrame = isFrame;
+    return isFrame;
   }
 
   setAppearanceTheme = (theme: TColorScheme[]) => {

packages/shared/types/index.ts

@@ -93,6 +93,7 @@ declare global {
         minimumFetchIntervalMillis?: number;
       };
       campaigns?: string[];
+      isFrame?: boolean;
     };
     AscDesktopEditor: {
       execCommand: (key: string, value: string) => void;

packages/shared/utils/axiosClient.ts

@@ -219,12 +219,14 @@ class AxiosClient {
             break;
           case 403: {
             const pathname = window.location.pathname;
+            const isFrame = window?.DocSpaceConfig?.isFrame;
+
             const isArchived = pathname.indexOf("/rooms/archived") !== -1;
 
             const isRooms =
               pathname.indexOf("/rooms/shared") !== -1 || isArchived;
 
-            if (isRooms && !skipRedirect) {
+            if (isRooms && !skipRedirect && !isFrame) {
               setTimeout(() => {
                 window.DocSpace.navigate(isArchived ? "/archived" : "/");
               }, 1000);