@gridsuite/commons-ui 0.217.0 → 0.218.0

package/dist/features/notifications/NotificationsProvider.js

@@ -1,9 +1,9 @@
 import { jsx } from "react/jsx-runtime";
-import { useEffect, useMemo } from "react";
+import { useSyncExternalStore, useEffect, useMemo } from "react";
 import ReconnectingWebSocket from "reconnecting-websocket";
 import { NotificationsContext } from "./contexts/NotificationsContext.js";
 import { useListenerManager } from "./hooks/useListenerManager.js";
-import { getUserToken } from "../../redux/commonStore.js";
+import { subscribeToUserState, getUser, getUserToken } from "../../redux/commonStore.js";
 const DELAY_BEFORE_WEBSOCKET_CONNECTED = 12e3;
 function isUrlDefined(tuple) {
   return tuple[1] !== void 0;
@@ -23,15 +23,15 @@ function NotificationsProvider({ urls, children }) {
     addListener: addListenerOnReopen,
     removeListener: removeListenerOnReopen
   } = useListenerManager(urls);
+  const isAuthenticated = useSyncExternalStore(subscribeToUserState, () => getUser() !== null);
   useEffect(() => {
     const token = getUserToken();
-    if (!token) {
+    if (!isAuthenticated || !token) {
       console.info("Skipping Notification WebSockets: no user token available");
       return void 0;
     }
     const connections = Object.entries(urls).filter(isUrlDefined).map(([urlKey, url]) => {
-      const urlWithToken = appendTokenToUrl(url, token);
-      const rws = new ReconnectingWebSocket(urlWithToken, [], {
+      const rws = new ReconnectingWebSocket(() => appendTokenToUrl(url, getUserToken() ?? ""), [], {
         // this option set the minimum duration being connected before reset the retry count to 0
         minUptime: DELAY_BEFORE_WEBSOCKET_CONNECTED
       });
@@ -49,7 +49,7 @@ function NotificationsProvider({ urls, children }) {
       return rws;
     });
     return () => connections.forEach((c) => c.close());
-  }, [broadcastMessage, broadcastOnReopen, urls]);
+  }, [broadcastMessage, broadcastOnReopen, urls, isAuthenticated]);
   const contextValue = useMemo(
     () => ({
       addListenerEvent: addListenerMessage,

package/dist/index.js

@@ -358,7 +358,7 @@ import { useSelectAppearance } from "./hooks/useSelectAppearance.js";
 import { OptionalServicesStatus, useParametersBackend } from "./hooks/use-parameters-backend.js";
 import { useGetLabelEquipmentTypes } from "./hooks/useGetLabelEquipmentTypes.js";
 import { LOGOUT_ERROR, RESET_AUTHENTICATION_ROUTER_ERROR, SHOW_AUTH_INFO_LOGIN, SIGNIN_CALLBACK_ERROR, UNAUTHORIZED_USER_INFO, USER, USER_VALIDATION_ERROR, resetAuthenticationRouterError, setLoggedUser, setLogoutError, setShowAuthenticationRouterLogin, setSignInCallbackError, setUnauthorizedUserInfo, setUserValidationError } from "./redux/actions/authActions.js";
-import { getUserToken, setCommonStore } from "./redux/commonStore.js";
+import { getUser, getUserToken, setCommonStore, subscribeToUserState } from "./redux/commonStore.js";
 import { cardErrorBoundaryEn } from "./translations/en/cardErrorBoundaryEn.js";
 import { businessErrorsEn } from "./translations/en/businessErrorsEn.js";
 import { commonButtonEn } from "./translations/en/commonButtonEn.js";
@@ -1209,6 +1209,7 @@ export {
   getStudyUrlWithNodeUuid,
   getStudyUrlWithNodeUuidAndRootNetworkUuid,
   getSystemLanguage,
+  getUser,
   getUserToken,
   getVoltageInitParameters,
   getVoltageInitUrl,
@@ -1323,6 +1324,7 @@ export {
   snackWithFallback,
   standardTextField,
   styles,
+  subscribeToUserState,
   substationCreationDtoToForm,
   substationCreationEmptyFormData,
   substationCreationFormSchema,

package/dist/redux/commonStore.d.ts

@@ -4,6 +4,7 @@ export type CommonStoreState = {
 };
 interface CommonStore {
     getState(): CommonStoreState;
+    subscribe(listener: () => void): () => void;
 }
 /**
  * Set a copy of the reference to the store to be able to access it from this library.
@@ -11,5 +12,7 @@ interface CommonStore {
  * NB : temporary solution before refactoring the token management in the whole gridsuite stack.
  */
 export declare function setCommonStore(store: CommonStore): void;
+export declare function getUser(): User | null;
 export declare function getUserToken(): string | undefined;
+export declare function subscribeToUserState(listener: () => void): () => void;
 export {};

package/dist/redux/commonStore.js

@@ -2,10 +2,19 @@ let commonStore;
 function setCommonStore(store) {
   commonStore = store;
 }
+function getUser() {
+  return commonStore?.getState().user ?? null;
+}
 function getUserToken() {
   return commonStore?.getState().user?.id_token;
 }
+function subscribeToUserState(listener) {
+  return commonStore?.subscribe(listener) ?? (() => {
+  });
+}
 export {
+  getUser,
   getUserToken,
-  setCommonStore
+  setCommonStore,
+  subscribeToUserState
 };

package/dist/redux/index.js

@@ -1,5 +1,5 @@
 import { LOGOUT_ERROR, RESET_AUTHENTICATION_ROUTER_ERROR, SHOW_AUTH_INFO_LOGIN, SIGNIN_CALLBACK_ERROR, UNAUTHORIZED_USER_INFO, USER, USER_VALIDATION_ERROR, resetAuthenticationRouterError, setLoggedUser, setLogoutError, setShowAuthenticationRouterLogin, setSignInCallbackError, setUnauthorizedUserInfo, setUserValidationError } from "./actions/authActions.js";
-import { getUserToken, setCommonStore } from "./commonStore.js";
+import { getUser, getUserToken, setCommonStore, subscribeToUserState } from "./commonStore.js";
 export {
   LOGOUT_ERROR,
   RESET_AUTHENTICATION_ROUTER_ERROR,
@@ -8,6 +8,7 @@ export {
   UNAUTHORIZED_USER_INFO,
   USER,
   USER_VALIDATION_ERROR,
+  getUser,
   getUserToken,
   resetAuthenticationRouterError,
   setCommonStore,
@@ -16,5 +17,6 @@ export {
   setShowAuthenticationRouterLogin,
   setSignInCallbackError,
   setUnauthorizedUserInfo,
-  setUserValidationError
+  setUserValidationError,
+  subscribeToUserState
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.217.0",
+    "version": "0.218.0",
     "description": "common react components for gridsuite applications",
     "author": "gridsuite team",
     "homepage": "https://github.com/gridsuite",