Merge pull request 'Release/2.2.0' from develop into master

LinneyS · LinneyS · commit d0b27e679b40 · 2026-02-17T07:36:54.000Z
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/onlyoffice-jira-cloud/pulls/6
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 2.2.0
+## Fixed
+- replaced reactive session expiration handling with proactive reauthorization
+
 ## 1.1.0
 ## Added
 - list of files
diff --git a/locales/de-DE.json b/locales/de-DE.json
@@ -41,12 +41,6 @@
     "editor": {
       "messages": {
         "stop-editing-by-cause-delete": "Die Bearbeitung dieses Dokuments wurde gestoppt, da es aus der Ausgabe entfernt wurde.",
-        "stop-editing-by-cause-session-expired": "Die Bearbeitung dieses Dokuments wurde gestoppt, da die aktuelle Sitzung abgelaufen ist.",
-        "session-expired": "Die aktuelle Sitzung ist abgelaufen.",
-        "please-save-changes": "Bitte speichern Sie alle Änderungen, um Datenverlust zu vermeiden.",
-        "editor-will-be-reloaded": "Der Editor wird neu geladen, damit Sie in ({time}) weiterarbeiten können.",
-        "update-session-failed": "Eine Verlängerung der Sitzung war leider nicht möglich.",
-        "editin-will-stop": "Die Bearbeitung wird in ({time}) beendet.",
         "you-using-demo-server": "Sie verwenden den öffentlichen Demoserver von ONLYOFFICE Docs. Bitte vermeiden Sie die Speicherung privater oder sensibler Daten."
       }
     },
diff --git a/locales/en-US.json b/locales/en-US.json
@@ -41,12 +41,6 @@
     "editor": {
       "messages": {
         "stop-editing-by-cause-delete": "Editing of this document has been stopped because it has been removed from the issue.",
-        "stop-editing-by-cause-session-expired": "Editing of this document has been stopped because the current session has expired.",
-        "session-expired": "The current session has expired.",
-        "please-save-changes": "Please make sure to save any changes to prevent data loss.",
-        "editor-will-be-reloaded": "The editor will be reloaded to continue working in ({time}).",
-        "update-session-failed": "Unfortunately, it was not possible to extend the session.",
-        "editin-will-stop": "Editing will stop in ({time}).",
         "you-using-demo-server": "You are using the public demo server of ONLYOFFICE Docs. Please avoid storing any private or sensitive data."
       }
     },
diff --git a/locales/es-ES.json b/locales/es-ES.json
@@ -41,12 +41,6 @@
     "editor": {
       "messages": {
         "stop-editing-by-cause-delete": "La edición de este documento se ha detenido porque se ha eliminado de la incidencia.",
-        "stop-editing-by-cause-session-expired": "La edición de este documento se ha detenido porque la sesión actual ha expirado.",
-        "session-expired": "La sesión actual ha expirado.",
-        "please-save-changes": "Por favor, asegúrese de guardar cualquier cambio para evitar la pérdida de datos.",
-        "editor-will-be-reloaded": "El editor se volverá a cargar para continuar trabajando en ({time}).",
-        "update-session-failed": "Lamentablemente, no ha sido posible prolongar la sesión.",
-        "editin-will-stop": "La edición se detendrá en ({time}).",
         "you-using-demo-server": "Está utilizando el servidor público de demostración de ONLYOFFICE Docs. Por favor, evite almacenar cualquier dato privado o confidencial."
       }
     },
diff --git a/locales/fr-FR.json b/locales/fr-FR.json
@@ -41,12 +41,6 @@
     "editor": {
       "messages": {
         "stop-editing-by-cause-delete": "L'édition de ce document a été interrompue, car il a été supprimé du ticket.",
-        "stop-editing-by-cause-session-expired": "L'édition de ce document a été interrompue car la session a expiré.",
-        "session-expired": "La session actuelle a expiré.",
-        "please-save-changes": "Veuillez vous assurer d'enregistrer vos modifications pour éviter toute perte de données.",
-        "editor-will-be-reloaded": "L'éditeur sera rechargé pour continuer dans ({time}).",
-        "update-session-failed": "Malheureusement, il n'a pas été possible de prolonger la session.",
-        "editin-will-stop": "L’édition s'arrêtera dans ({time}).",
         "you-using-demo-server": "Vous utilisez le serveur de démonstration public d'ONLYOFFICE Docs. Veuillez éviter d'y stocker des données privées ou sensibles."
       }
     },
diff --git a/locales/it-IT.json b/locales/it-IT.json
@@ -41,12 +41,6 @@
     "editor": {
       "messages": {
         "stop-editing-by-cause-delete": "La modifica di questo documento è stata interrotta perché è stato rimosso dal ticket.",
-        "stop-editing-by-cause-session-expired": "La modifica di questo documento è stata interrotta perché la sessione corrente è scaduta.",
-        "session-expired": "La sessione corrente è scaduta.",
-        "please-save-changes": "Assicurati di salvare eventuali modifiche per evitare la perdita dei dati.",
-        "editor-will-be-reloaded": "L'editor verrà ricaricato per continuare a lavorare in ({time}).",
-        "update-session-failed": "Purtroppo non è stato possibile estendere la sessione.",
-        "editin-will-stop": "La modifica terminerà in ({time}).",
         "you-using-demo-server": "Stai usando il server demo pubblico di ONLYOFFICE Docs. Evita di salvare dati privati o sensibili."
       }
     },
diff --git a/locales/ru-RU.json b/locales/ru-RU.json
@@ -41,12 +41,6 @@
     "editor": {
       "messages": {
         "stop-editing-by-cause-delete": "Редактирование этого документа прекращено, поскольку он был удален из выпуска.",
-        "stop-editing-by-cause-session-expired": "Редактирование этого документа прекращено, поскольку текущий сеанс истек.",
-        "session-expired": "Текущий сеанс истек.",
-        "please-save-changes": "Обязательно сохраните все изменения, чтобы избежать потери данных.",
-        "editor-will-be-reloaded": "Редактор будет перезагружен для продолжения работы через ({time}).",
-        "update-session-failed": "К сожалению, продлить сеанс не удалось.",
-        "editin-will-stop": "Редактирование будет прекращено через ({time}).",
         "you-using-demo-server": "Вы используете публичный демо-сервер ONLYOFFICE Docs. Пожалуйста, не храните на нем личные или конфиденциальные данные."
       }
     },
diff --git a/static/onlyoffice-docs-jira-cloud-custom-ui/src/pages/Editor/index.tsx b/static/onlyoffice-docs-jira-cloud-custom-ui/src/pages/Editor/index.tsx
@@ -16,20 +16,11 @@
  *
  */
 
-import React, {
-  useEffect,
-  useState,
-  useRef,
-  type ReactNode,
-  useContext,
-} from "react";
+import React, { useEffect, useState, useRef, useContext } from "react";
 
 import Button from "@atlaskit/button/new";
-import Flag, { ActionsType, FlagGroup } from "@atlaskit/flag";
-import StatusWarningIcon from "@atlaskit/icon/core/status-warning";
 import { Flex, xcss } from "@atlaskit/primitives";
 import Spinner from "@atlaskit/spinner";
-import { token } from "@atlaskit/tokens";
 import { events, invoke, view } from "@forge/bridge";
 import { FullContext } from "@forge/bridge/out/types";
 
@@ -55,26 +46,6 @@ const styles = {
   },
 };
 
-type SessionExpiredFlag = {
-  description: string;
-  icon: ReactNode;
-  id: string;
-  time: number;
-  title: string;
-  actions: ActionsType;
-};
-
-const defaultSessionExpiredFlagData: SessionExpiredFlag = {
-  id: "session-expired-flag",
-  title: "",
-  description: "",
-  icon: (
-    <StatusWarningIcon label="Warning" color={token("color.icon.warning")} />
-  ),
-  time: 59,
-  actions: [],
-};
-
 export type EditorPageProps = {
   context: FullContext;
 };
@@ -84,8 +55,6 @@ const EditorPage: React.FC<EditorPageProps> = ({ context }) => {
   const [loading, setLoading] = useState(true);
   const remoteAppUrl = useRef<string | null>(null);
   const [token, setToken] = useState<string>();
-  const [sessionExpiredFlag, setSessionExpiredFlag] =
-    useState<SessionExpiredFlag>();
 
   const issueId = context.extension.issue.id;
   const attachmentId = context.extension.modal.attachmentId;
@@ -129,13 +98,42 @@ const EditorPage: React.FC<EditorPageProps> = ({ context }) => {
         });
     });
 
+    let sessionTimeout: ReturnType<typeof setTimeout>;
+
+    const scheduleReauthorization = (sessionExpires: number) => {
+      const targetTime = new Date(sessionExpires);
+      const now = new Date();
+      targetTime.setSeconds(targetTime.getSeconds() - 10);
+
+      const delay = targetTime.getTime() - now.getTime();
+
+      if (delay > 0) {
+        sessionTimeout = setTimeout(() => {
+          invoke<RemoteAppAuthorization>("authorizeRemoteApp", {
+            issueId,
+            attachmentId,
+          })
+            .then((data: RemoteAppAuthorization) => {
+              sendMessageToIframe("REFRESH_SESSION", {
+                sessionExpires: data.sessionExpires,
+              });
+              scheduleReauthorization(data.sessionExpires);
+            })
+            .catch((error) => {
+              console.error("Error reauthorizing session:", error);
+            });
+        }, delay);
+      }
+    };
+
     invoke<RemoteAppAuthorization>("authorizeRemoteApp", {
       issueId,
       attachmentId,
     })
       .then((data: RemoteAppAuthorization) => {
         setToken(data.token);
         remoteAppUrl.current = data.remoteAppUrl;
+        scheduleReauthorization(data.sessionExpires);
       })
       .catch((error) => {
         console.error("Error fetching data:", error);
@@ -148,30 +146,16 @@ const EditorPage: React.FC<EditorPageProps> = ({ context }) => {
           ),
         });
       });
+
+    return () => {
+      clearTimeout(sessionTimeout);
+    };
   }, []);
 
   const closeWindow = () => {
     view.close();
   };
 
-  const onSessionExpired = () => {
-    invoke<RemoteAppAuthorization>("authorizeRemoteApp", {
-      issueId,
-      attachmentId,
-    })
-      .then((data: RemoteAppAuthorization) => {
-        sendMessageToIframe("UPDATE_CONFIG", {
-          mode: mode,
-          token: data.token,
-        });
-      })
-      .catch((error) => {
-        console.error(error);
-
-        sessionFailedToExtend();
-      });
-  };
-
   const onRequestUsers = (c: string, ids: string[]) => {
     getUsers(ids)
       .then((values) => {
@@ -192,60 +176,6 @@ const EditorPage: React.FC<EditorPageProps> = ({ context }) => {
       });
   };
 
-  const sessionSuccessfullyExtended = () => {
-    const timer = setInterval(() => {
-      const onFinal = () => {
-        clearInterval(timer);
-        sendMessageToIframe("RELOAD_EDITOR", null);
-      };
-
-      setSessionExpiredFlag((prev) => {
-        if (prev && prev.time - 1 < 0) {
-          onFinal();
-          return undefined;
-        }
-
-        return {
-          ...defaultSessionExpiredFlagData,
-          time: prev ? prev.time - 1 : defaultSessionExpiredFlagData.time,
-          title: t("labels.warning"),
-          description: `${t("page.editor.messages.session-expired")}
-             ${t("page.editor.messages.please-save-changes")}
-             ${t("page.editor.messages.editor-will-be-reloaded").replace("{time}", String(prev ? prev.time - 1 : defaultSessionExpiredFlagData.time))}`,
-        };
-      });
-    }, 1000);
-  };
-
-  const sessionFailedToExtend = () => {
-    const timer = setInterval(() => {
-      const onFinal = () => {
-        clearInterval(timer);
-        sendMessageToIframe("STOP_EDITING", {
-          message: t(
-            "page.editor.messages.stop-editing-by-cause-session-expired",
-          ),
-        });
-      };
-
-      setSessionExpiredFlag((prev) => {
-        if (prev && prev.time - 1 < 0) {
-          onFinal();
-          return undefined;
-        }
-
-        return {
-          ...defaultSessionExpiredFlagData,
-          time: prev ? prev.time - 1 : defaultSessionExpiredFlagData.time,
-          title: t("labels.warning"),
-          description: `${t("page.editor.messages.session-expired")}
-            ${t("page.editor.messages.update-session-failed")} ${t("page.editor.messages.please-save-changes")}
-            ${t("page.editor.messages.editin-will-stop").replace("{time}", String(prev ? prev.time - 1 : defaultSessionExpiredFlagData.time))}`,
-        };
-      });
-    }, 1000);
-  };
-
   useEffect(() => {
     if (remoteAppUrl.current) {
       const handleMessage = (event: MessageEvent) => {
@@ -286,18 +216,6 @@ const EditorPage: React.FC<EditorPageProps> = ({ context }) => {
 
           onRequestUsers(c, ids);
         }
-
-        if (type === "SESSION_EXPIRED") {
-          onSessionExpired();
-        }
-
-        if (type === "CONFIG_UPDATED") {
-          sessionSuccessfullyExtended();
-        }
-
-        if (type === "ERROR_UPDATE_CONFIG") {
-          sessionFailedToExtend();
-        }
       };
 
       window.addEventListener("message", handleMessage);
@@ -321,17 +239,6 @@ const EditorPage: React.FC<EditorPageProps> = ({ context }) => {
           src={`${remoteAppUrl.current}/editor/jira?mode=${mode}&token=${token}`}
         />
       )}
-      {sessionExpiredFlag && (
-        <FlagGroup>
-          <Flag
-            id={sessionExpiredFlag.id}
-            title={sessionExpiredFlag.title}
-            description={sessionExpiredFlag.description}
-            icon={sessionExpiredFlag.icon}
-            actions={sessionExpiredFlag.actions}
-          />
-        </FlagGroup>
-      )}
     </Flex>
   );
 };
diff --git a/static/onlyoffice-docs-jira-cloud-custom-ui/src/types/types.ts b/static/onlyoffice-docs-jira-cloud-custom-ui/src/types/types.ts
@@ -27,6 +27,7 @@ export interface Format {
 export interface RemoteAppAuthorization {
   token: string;
   remoteAppUrl: string;
+  sessionExpires: number;
 }
 
 export interface User {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ export interface Format {`
`27`	`27`	`export interface RemoteAppAuthorization {`
`28`	`28`	`token: string;`
`29`	`29`	`remoteAppUrl: string;`
	`30`	`+ sessionExpires: number;`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`export interface User {`