@controleonline/ui-common 1.2.86 → 1.2.88

package/src/react/components/DefaultProvider.web.js

@@ -33,9 +33,11 @@ import {
 } from '@controleonline/../../src/styles/branding';
 import { colors as runtimeColors } from '@controleonline/../../src/styles/colors';
 import {
+  buildDefaultDeviceConfigs,
   buildProviderManagedDeviceConfigs,
   parseConfigsObject,
 } from '@controleonline/ui-common/src/react/config/deviceConfigBootstrap';
+import {canAdministerCompany} from '@controleonline/ui-common/src/react/utils/companyAuthority';
 import {
   buildDeviceRegistrationPayload,
   buildLocalRuntimeDevice,
@@ -45,7 +47,9 @@ import {
 } from '@controleonline/ui-common/src/react/utils/deviceRuntime';
 import {
   filterWalletPaymentTypesByAllowedIds,
+  getPaymentGateway,
   resolveDevicePaymentTypeIds,
+  selectPosWalletPaymentTypes,
 } from '@controleonline/ui-common/src/react/utils/paymentDevices';
 import {
   normalizeRuntimeMenuResponse,
@@ -101,21 +105,6 @@ const resolveDeviceConfigPeopleIri = ({appType, currentCompany, user}) => {
 
   return '';
 };
-const isTenantAdministrativeAuthority = company => {
-  const userFlags = company?.user || {};
-  return !!(
-    userFlags.owner_enabled ||
-    userFlags.director_enabled ||
-    userFlags.manager_enabled ||
-    userFlags.admin_enabled ||
-    company?.owner_enabled ||
-    company?.director_enabled ||
-    company?.manager_enabled
-  );
-};
-
-
-
 const normalizeRuntimeIp = value => String(value || '').trim();
 
 const getRuntimeIpFromResponse = response =>
@@ -173,30 +162,30 @@ export const DefaultProvider = ({
   const appType = String(app_type || '').toUpperCase();
   const isShopClientApp = appType === 'SHOP';
   const themeStore = useStore('theme');
-  const getters = themeStore.getters;
-  const actions = themeStore.actions;
-
-  const authStore = useStore('auth');
-  const authGetters = authStore.getters;
-
-  const peopleStore = useStore('people');
-  const peopleGetters = peopleStore.getters;
-  const peopleActions = peopleStore.actions;
-
-  const deviceStore = useStore('device');
-  const deviceActions = deviceStore.actions;
-
-  const device_configStore = useStore('device_config');
-  const deviceConfigsGetters = device_configStore.getters;
-  const deviceConfigsActions = device_configStore.actions;
-
-  const configsStore = useStore('configs');
-  const configActions = configsStore.actions;
-  const configsGetters = configsStore.getters;
-
-  const printerStore = useStore('printer');
-  const printerActions = printerStore.actions;
-
+  const getters = themeStore.getters;
+  const actions = themeStore.actions;
+
+  const authStore = useStore('auth');
+  const authGetters = authStore.getters;
+
+  const peopleStore = useStore('people');
+  const peopleGetters = peopleStore.getters;
+  const peopleActions = peopleStore.actions;
+
+  const deviceStore = useStore('device');
+  const deviceActions = deviceStore.actions;
+
+  const device_configStore = useStore('device_config');
+  const deviceConfigsGetters = device_configStore.getters;
+  const deviceConfigsActions = device_configStore.actions;
+
+  const configsStore = useStore('configs');
+  const configActions = configsStore.actions;
+  const configsGetters = configsStore.getters;
+
+  const printerStore = useStore('printer');
+  const printerActions = printerStore.actions;
+
   const walletPaymentTypeStore = useStore('walletPaymentType');
   const paymentTypeActions = walletPaymentTypeStore.actions;
 
@@ -205,12 +194,12 @@ export const DefaultProvider = ({
 
   const { items: companyConfigs } = configsGetters;
   const { colors, menus } = getters;
-  const { currentCompany, defaultCompany, companies } = peopleGetters;
+  const { currentCompany, mainCompany, companies } = peopleGetters;
   const { item: device_config } = deviceConfigsGetters;
   const { isLogged, user } = authGetters;
   const hasCurrentCompany =
     !!currentCompany && Object.entries(currentCompany).length > 0;
-
+
   const [translateReady, setTranslateReady] = useState(false);
   const [activeTranslateBootstrapKey, setActiveTranslateBootstrapKey] =
     useState('');
@@ -258,7 +247,7 @@ export const DefaultProvider = ({
   );
   const configuredTranslationLanguage = resolveConfiguredLanguage({
     currentCompany,
-    defaultCompany,
+    mainCompany,
     currentConfig: currentTranslationConfig,
     sessionData: currentTranslationSession,
   });
@@ -266,7 +255,7 @@ export const DefaultProvider = ({
     ? buildTranslationBootstrapKey({
         language: configuredTranslationLanguage,
         currentCompanyId: normalizeEntityId(currentCompany?.id),
-        defaultCompanyId: normalizeEntityId(defaultCompany?.id),
+        mainCompanyId: normalizeEntityId(mainCompany?.id),
       })
     : '';
   const requiresTranslateBootstrap = Boolean(
@@ -307,7 +296,7 @@ export const DefaultProvider = ({
         : {
             appVersion,
             colors,
-            defaultCompany,
+            mainCompany,
             device,
           },
       bottomChrome: {
@@ -319,22 +308,22 @@ export const DefaultProvider = ({
       appVersion,
       bottomNavigationCount,
       colors,
-      defaultCompany,
+      mainCompany,
       device,
       isShopClientApp,
       menus,
       registerBottomNavigation,
     ],
   );
-
+
   useEffect(() => {
     global.refreshTranslationsUI = () => {
       setTranslateVersion(version => version + 1);
     };
-
-    return () => {
-      if (global.refreshTranslationsUI) {
-        delete global.refreshTranslationsUI;
+
+    return () => {
+      if (global.refreshTranslationsUI) {
+        delete global.refreshTranslationsUI;
       }
     };
   }, []);
@@ -429,42 +418,43 @@ export const DefaultProvider = ({
     });
   };
 
+  // Sync web device identity once per signature. Calling setItem on every
+  // effect pass (even when unchanged) re-entered the store after logout→login
+  // and produced React #185 (app-community#827).
+  const lastWebDeviceSyncRef = useRef('');
   useEffect(() => {
-    if (!isLogged && !isShopClientApp && (!device || !device.id)) {
+    if (!isLogged && !isShopClientApp) {
       return;
     }
 
     const nextDevice = buildWebDevice();
     if (!nextDevice) {
-      if (device && device.id) {
-        deviceActions.setItem(device);
-      }
       return;
     }
 
-    const shouldRefreshDevice =
-      !device?.id ||
-      device.id !== nextDevice.id ||
-      device.appVersion !== nextDevice.appVersion ||
-      device.appName !== nextDevice.appName ||
-      device.type !== nextDevice.type ||
-      JSON.stringify(device.metadata || {}) !==
-        JSON.stringify(nextDevice.metadata || {});
-
-    if (shouldRefreshDevice) {
-      setDevice(nextDevice);
-      localStorage.setItem('device', JSON.stringify(nextDevice));
-      deviceActions.setItem(nextDevice);
-      localStorage.removeItem('master-device');
+    const signature = JSON.stringify({
+      id: nextDevice.id,
+      appVersion: nextDevice.appVersion,
+      appName: nextDevice.appName,
+      type: nextDevice.type,
+      metadata: nextDevice.metadata || {},
+      externalIp: nextDevice.externalIp || null,
+    });
+
+    if (lastWebDeviceSyncRef.current === signature) {
       return;
     }
 
-    deviceActions.setItem(device);
-  }, [device, deviceActions, isLogged, isShopClientApp, packageVersion, user?.id, webRuntimeIp]);
-
+    lastWebDeviceSyncRef.current = signature;
+    setDevice(nextDevice);
+    localStorage.setItem('device', JSON.stringify(nextDevice));
+    deviceActions.setItem(nextDevice);
+    localStorage.removeItem('master-device');
+  }, [deviceActions, isLogged, isShopClientApp, packageVersion, user?.id, webRuntimeIp]);
+
   useEffect(() => {
     if (isShopClientApp || device?.id) {
-      peopleActions.defaultCompany().catch(() => {});
+      peopleActions.mainCompany().catch(() => {});
     }
   }, [device?.id, isShopClientApp, peopleActions]);
 
@@ -473,6 +463,15 @@ export const DefaultProvider = ({
       return;
     }
 
+    // Device registration changes tenant context and is not valid without an
+    // active company or administrative authority for that company.
+    if (
+      !currentCompany?.id ||
+      !canAdministerCompany({company: currentCompany, mainCompany, user})
+    ) {
+      return;
+    }
+
     let cancelled = false;
 
     const syncDeviceRegistration = async () => {
@@ -553,9 +552,12 @@ export const DefaultProvider = ({
     device?.model,
     device?.systemVersion,
     isLogged,
+    currentCompany,
+    mainCompany,
     runtimeDeviceType,
+    user,
   ]);
-
+
   useEffect(() => {
     if (isShopClientApp || !isLogged || !currentCompany?.id) {
       return;
@@ -565,7 +567,7 @@ export const DefaultProvider = ({
       .ensureCompanyPrintersLoaded({people: currentCompany.id})
       .catch(() => {});
   }, [currentCompany?.id, isLogged, isShopClientApp, printerActions]);
-
+
   useEffect(() => {
     const paymentConfigSource = isShopClientApp
       ? Object.keys(companyConfigs || {}).length > 0
@@ -580,6 +582,10 @@ export const DefaultProvider = ({
       return;
     }
 
+    if (!isShopClientApp && !mainConfigsDiscovered) {
+      return;
+    }
+
     const paymentTypeSignature = resolveDevicePaymentTypeIds(paymentConfigSource)
       .sort()
       .join(',');
@@ -625,16 +631,13 @@ export const DefaultProvider = ({
             : Array.isArray(response)
               ? response
               : [];
-        const allowedPaymentTypeIds = resolveDevicePaymentTypeIds(
-          paymentConfigSource,
-          walletPaymentTypes,
-        );
-
         paymentTypeActions.setItems(
-          filterWalletPaymentTypesByAllowedIds(
+          selectPosWalletPaymentTypes({
             walletPaymentTypes,
-            allowedPaymentTypeIds,
-          ),
+            deviceConfigs: paymentConfigSource,
+            companyConfigs,
+            gateway: getPaymentGateway(device_config || paymentConfigSource),
+          }),
         );
         walletPaymentTypeLoadedKeyRef.current = requestKey;
       })
@@ -663,7 +666,7 @@ export const DefaultProvider = ({
     isShopClientApp,
     paymentTypeActions,
   ]);
-
+
   useEffect(() => {
     if (!device?.id || !isLogged || !deviceConfigPeopleIri) {
       return;
@@ -721,7 +724,14 @@ export const DefaultProvider = ({
       return;
     }
 
-    const {nextConfigs, needsUpdate} = buildProviderManagedDeviceConfigs({
+    const isNewPdvConfig =
+      runtimeDeviceType === 'PDV' &&
+      !device_config?.id &&
+      !device_config?.['@id'];
+    const buildDeviceConfigs = isNewPdvConfig
+      ? buildDefaultDeviceConfigs
+      : buildProviderManagedDeviceConfigs;
+    const {nextConfigs, needsUpdate} = buildDeviceConfigs({
       configs: device_config?.configs,
       appVersion,
       deviceInfo: device,
@@ -732,24 +742,20 @@ export const DefaultProvider = ({
       return;
     }
 
-    // Non-admin users cannot mutate device context/financial policy (API 403).
-    // Skip bootstrap write; keep local runtime configs in memory only.
-    if (!isTenantAdministrativeAuthority(currentCompany)) {
-      setDeviceRuntimeConfigSynced(true);
-      return;
-    }
-
-    deviceConfigsActions
-      .addDeviceConfigs({
-        device: device.id,
-        configs: JSON.stringify(nextConfigs),
-        people: deviceConfigPeopleIri,
-        type: runtimeDeviceType,
-      })
-      .catch(() => { })
-      .finally(() => {
-        setDeviceRuntimeConfigSynced(true);
-      });
+    // app-community#821: never auto-persist device_config from global bootstrap.
+    // Provider-managed fields (config-version, pos-gateway, screen metrics) stay
+    // in memory only. POST/PUT to /device_configs* is reserved for explicit
+    // device settings UI — avoids 403 from DeviceFinancialConfigAuthorizationSubscriber
+    // on pages like order-history (PDV/MANAGER types are fully protected).
+    const currentItem = device_config || {};
+    deviceConfigsActions.setItem({
+      ...currentItem,
+      configs: nextConfigs,
+      device: currentItem.device || device.id,
+      people: currentItem.people || deviceConfigPeopleIri,
+      type: currentItem.type || runtimeDeviceType,
+    });
+    setDeviceRuntimeConfigSynced(true);
   }, [
     appVersion,
     device?.id,
@@ -758,11 +764,11 @@ export const DefaultProvider = ({
     deviceConfigFetched,
     deviceConfigPeopleIri,
     deviceRuntimeConfigSynced,
-    currentCompany,
     deviceConfigsActions,
-    device_config?.configs,
+    device_config,
     isLogged,
     runtimeDeviceType,
+    user,
   ]);
 
   useEffect(() => {
@@ -792,7 +798,7 @@ export const DefaultProvider = ({
         setMainConfigsDiscovered(true);
       });
   }, [configActions, currentCompany?.id, device?.id, isLogged, mainConfigsDiscovered]);
-
+
   useEffect(() => {
     if (
       isLogged &&
@@ -803,7 +809,7 @@ export const DefaultProvider = ({
       configActions.setItems(currentCompany.configs);
     }
   }, [currentCompany, isLogged, mainConfigsDiscovered]);
-
+
   useEffect(() => {
     if (!currentRouteName || isPublicRouteActive) {
       return;
@@ -826,7 +832,7 @@ export const DefaultProvider = ({
     ) {
       global.t.companies = companies;
       global.t.currentCompany = currentCompany;
-      global.t.defaultCompany = defaultCompany;
+      global.t.mainCompany = mainCompany;
       setActiveTranslateBootstrapKey(expectedTranslateBootstrapKey);
       setTranslateReady(true);
 
@@ -849,7 +855,7 @@ export const DefaultProvider = ({
     translateBootstrapKeyRef.current = expectedTranslateBootstrapKey;
     global.t = new Translate(
       companies,
-      defaultCompany,
+      mainCompany,
       currentCompany,
       Object.keys(stores),
       translateStore,
@@ -862,7 +868,7 @@ export const DefaultProvider = ({
     configuredTranslationLanguage,
     currentCompany,
     currentRouteName,
-    defaultCompany,
+    mainCompany,
     deviceConfigFetched,
     expectedTranslateBootstrapKey,
     hasCurrentCompany,
@@ -886,7 +892,7 @@ export const DefaultProvider = ({
     isTranslateBootstrapReady,
     onBootstrapReady,
   ]);
-
+
   useEffect(() => {
     if (device && device.id && isLogged) {
       peopleActions.myCompanies();
@@ -940,32 +946,32 @@ export const DefaultProvider = ({
     };
 
     fetchColors();
-  }, [actions, currentCompany?.id, defaultCompany?.id, device?.id]);
+  }, [actions, currentCompany?.id, mainCompany?.id, device?.id]);
 
   useEffect(() => {
     const companyThemeColors = isShopClientApp
-      ? defaultCompany?.theme?.colors || {}
-      : currentCompany?.theme?.colors || defaultCompany?.theme?.colors || {};
+      ? mainCompany?.theme?.colors || {}
+      : currentCompany?.theme?.colors || mainCompany?.theme?.colors || {};
     const mergedThemeColors = {
       ...(baseThemeColors || {}),
       ...(companyThemeColors || {}),
     };
-
-    const palette = resolveThemePalette(mergedThemeColors, runtimeColors);
-    applyPaletteToRuntimeColors(palette, runtimeColors);
-    applyThemeCssVariables({
-      themeColors: mergedThemeColors,
-      palette,
-    });
-
-    actions.setColors(mergedThemeColors);
+
+    const palette = resolveThemePalette(mergedThemeColors, runtimeColors);
+    applyPaletteToRuntimeColors(palette, runtimeColors);
+    applyThemeCssVariables({
+      themeColors: mergedThemeColors,
+      palette,
+    });
+
+    actions.setColors(mergedThemeColors);
   }, [
     actions,
     baseThemeColors,
     currentCompany?.id,
     currentCompany?.theme?.colors,
-    defaultCompany?.id,
-    defaultCompany?.theme?.colors,
+    mainCompany?.id,
+    mainCompany?.theme?.colors,
     isShopClientApp,
   ]);
 
@@ -986,7 +992,7 @@ export const DefaultProvider = ({
               {!isShopClientApp && showRuntimeFooter && bottomNavigationCount === 0 && (
                 <RuntimeInfoFooter
                   appVersion={appVersion}
-                  defaultCompany={defaultCompany}
+                  mainCompany={mainCompany}
                   device={device}
                   colors={colors}
                 />

package/src/react/components/RemoteCheckoutService.js

@@ -88,7 +88,7 @@ const Checkout = () => {
   const invoiceActions = invoiceStore.actions;
   const peopleStore = useStore('people');
   const peopleGetters = peopleStore.getters;
-  const {currentCompany, defaultCompany} = peopleGetters;
+  const {currentCompany, mainCompany} = peopleGetters;
   const websocketStore = useStore('websocket');
   const websocketActions = websocketStore.actions;
   const {messages, message} = invoiceGetters;
@@ -120,7 +120,7 @@ const Checkout = () => {
 
   const createInvoice = useCallback(async (selectedPayment, total, orderItem) => {
     const paidStatusIri = await resolvePosPaidInvoiceStatusIri(
-      defaultCompany?.configs['pos-paid-status'],
+      mainCompany?.configs['pos-paid-status'],
     );
 
     if (!paidStatusIri) {
@@ -143,7 +143,7 @@ const Checkout = () => {
     return await invoiceActions.save(payload);
   }, [
     currentCompany?.id,
-    defaultCompany?.configs,
+    mainCompany?.configs,
     invoiceActions,
   ]);