@commercetools-frontend/permissions 27.13.0 → 27.15.0

package/dist/commercetools-frontend-permissions.cjs.dev.js

@@ -52,7 +52,7 @@ var _Object$entries__default = /*#__PURE__*/_interopDefault(_Object$entries);
 var upperFirst__default = /*#__PURE__*/_interopDefault(upperFirst);
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "27.13.0";
+var version = "27.15.0";
 
 // Permissions
 
@@ -149,6 +149,32 @@ const hasEveryActionRight = (demandedActionRights, actualActionRights) => _every
 // - actualPermissions:
 //     { canViewProducts: true, canManageOrders: false }
 const hasSomePermissions = (demandedPermissions, actualPermissions) => _someInstanceProperty__default["default"](demandedPermissions).call(demandedPermissions, permission => hasPermission(permission, actualPermissions));
+/**
+ * Pure permission check shared by `useIsAuthorized` and callers that cannot use
+ * the hook (e.g. OR-ing visibility across many navbar menus).
+ *
+ * Handles virtual permissions first:
+ * - `Administrator` → `isAdminOfAnyOrganization`
+ * - `AdministratorOfCurrentProject` → `isUserAdminOfCurrentProject`
+ * Then falls back to `hasSomePermissions` / `hasEveryPermissions`.
+ */
+const isAuthorizedForDemandedPermissions = _ref => {
+  let demandedPermissions = _ref.demandedPermissions,
+    actualPermissions = _ref.actualPermissions,
+    _ref$isAdminOfAnyOrga = _ref.isAdminOfAnyOrganization,
+    isAdminOfAnyOrganization = _ref$isAdminOfAnyOrga === void 0 ? false : _ref$isAdminOfAnyOrga,
+    _ref$isUserAdminOfCur = _ref.isUserAdminOfCurrentProject,
+    isUserAdminOfCurrentProject = _ref$isUserAdminOfCur === void 0 ? false : _ref$isUserAdminOfCur,
+    _ref$shouldMatchSomeP = _ref.shouldMatchSomePermissions,
+    shouldMatchSomePermissions = _ref$shouldMatchSomeP === void 0 ? false : _ref$shouldMatchSomeP;
+  if (_includesInstanceProperty__default["default"](demandedPermissions).call(demandedPermissions, 'Administrator')) {
+    return isAdminOfAnyOrganization;
+  }
+  if (_includesInstanceProperty__default["default"](demandedPermissions).call(demandedPermissions, 'AdministratorOfCurrentProject')) {
+    return Boolean(isUserAdminOfCurrentProject);
+  }
+  return shouldMatchSomePermissions ? hasSomePermissions(demandedPermissions, actualPermissions) : hasEveryPermissions(demandedPermissions, actualPermissions);
+};
 const getHasDemandedDataFence = options => {
   if (!options.selectDataFenceData) return false;
   const hasDemandedPermission = hasPermission(options.demandedDataFence.name, {
@@ -223,10 +249,10 @@ const hasSomeDataFence = options => {
     if (!actualDataFenceByTypeAndGroup) return false;
 
     // we try to find if the demanded dataFence is available inside the actual datafences
-    const specificActualDataFence = _findInstanceProperty__default["default"](_context3 = _Object$entries__default["default"](actualDataFenceByTypeAndGroup)).call(_context3, _ref => {
-      let _ref2 = _slicedToArray(_ref, 2),
-        dataFenceName = _ref2[0],
-        dataFenceValue = _ref2[1];
+    const specificActualDataFence = _findInstanceProperty__default["default"](_context3 = _Object$entries__default["default"](actualDataFenceByTypeAndGroup)).call(_context3, _ref2 => {
+      let _ref3 = _slicedToArray(_ref2, 2),
+        dataFenceName = _ref3[0],
+        dataFenceValue = _ref3[1];
       // Either the manage permission matches or the
       // a demanded view permission is implied by a manage permission.
       const doesDataFenceMatchByName = dataFenceName === toCanCase(demandedDataFence.name) || dataFenceName === toCanCase(toManageCase(demandedDataFence.name));
@@ -290,11 +316,15 @@ const useIsAuthorized = _ref => {
   const actualPermissions = applicationShellConnectors.useApplicationContext(applicationContext => projectPermissions?.permissions ?? applicationContext.permissions);
   const actualActionRights = applicationShellConnectors.useApplicationContext(applicationContext => projectPermissions?.actionRights ?? applicationContext.actionRights);
   const actualDataFences = applicationShellConnectors.useApplicationContext(applicationContext => projectPermissions?.dataFences ?? applicationContext.dataFences);
-  if (hasDemandedAdministratorPermission) {
-    return isAdminOfAnyOrganization;
-  }
-  if (hasDemandedAdministratorOfCurrentProjectPermission) {
-    return isUserAdminOfCurrentProject ?? false;
+  const hasDemandedPermissions = isAuthorizedForDemandedPermissions({
+    demandedPermissions,
+    actualPermissions,
+    isAdminOfAnyOrganization,
+    isUserAdminOfCurrentProject,
+    shouldMatchSomePermissions
+  });
+  if (hasDemandedAdministratorPermission || hasDemandedAdministratorOfCurrentProjectPermission) {
+    return hasDemandedPermissions;
   }
 
   // if the user has no permissions and no dataFences assigned to them, they are not authorized
@@ -311,7 +341,6 @@ const useIsAuthorized = _ref => {
       selectDataFenceData
     });
   }
-  const hasDemandedPermissions = shouldMatchSomePermissions ? hasSomePermissions(demandedPermissions, actualPermissions) : hasEveryPermissions(demandedPermissions, actualPermissions);
   const hasDemandedActionRights = hasEveryActionRight(demandedActionRights || [], actualActionRights);
   return hasDemandedDataFences || hasDemandedPermissions && hasDemandedActionRights;
 };
@@ -442,5 +471,6 @@ exports.branchOnPermissions = branchOnPermissions;
 exports.hasEveryPermissions = hasEveryPermissions;
 exports.hasSomePermissions = hasSomePermissions;
 exports.injectAuthorized = injectAuthorized;
+exports.isAuthorizedForDemandedPermissions = isAuthorizedForDemandedPermissions;
 exports.useIsAuthorized = useIsAuthorized;
 exports.version = version;

package/dist/commercetools-frontend-permissions.cjs.prod.js

@@ -51,7 +51,7 @@ var _Object$entries__default = /*#__PURE__*/_interopDefault(_Object$entries);
 var upperFirst__default = /*#__PURE__*/_interopDefault(upperFirst);
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "27.13.0";
+var version = "27.15.0";
 
 // Permissions
 
@@ -148,6 +148,32 @@ const hasEveryActionRight = (demandedActionRights, actualActionRights) => _every
 // - actualPermissions:
 //     { canViewProducts: true, canManageOrders: false }
 const hasSomePermissions = (demandedPermissions, actualPermissions) => _someInstanceProperty__default["default"](demandedPermissions).call(demandedPermissions, permission => hasPermission(permission, actualPermissions));
+/**
+ * Pure permission check shared by `useIsAuthorized` and callers that cannot use
+ * the hook (e.g. OR-ing visibility across many navbar menus).
+ *
+ * Handles virtual permissions first:
+ * - `Administrator` → `isAdminOfAnyOrganization`
+ * - `AdministratorOfCurrentProject` → `isUserAdminOfCurrentProject`
+ * Then falls back to `hasSomePermissions` / `hasEveryPermissions`.
+ */
+const isAuthorizedForDemandedPermissions = _ref => {
+  let demandedPermissions = _ref.demandedPermissions,
+    actualPermissions = _ref.actualPermissions,
+    _ref$isAdminOfAnyOrga = _ref.isAdminOfAnyOrganization,
+    isAdminOfAnyOrganization = _ref$isAdminOfAnyOrga === void 0 ? false : _ref$isAdminOfAnyOrga,
+    _ref$isUserAdminOfCur = _ref.isUserAdminOfCurrentProject,
+    isUserAdminOfCurrentProject = _ref$isUserAdminOfCur === void 0 ? false : _ref$isUserAdminOfCur,
+    _ref$shouldMatchSomeP = _ref.shouldMatchSomePermissions,
+    shouldMatchSomePermissions = _ref$shouldMatchSomeP === void 0 ? false : _ref$shouldMatchSomeP;
+  if (_includesInstanceProperty__default["default"](demandedPermissions).call(demandedPermissions, 'Administrator')) {
+    return isAdminOfAnyOrganization;
+  }
+  if (_includesInstanceProperty__default["default"](demandedPermissions).call(demandedPermissions, 'AdministratorOfCurrentProject')) {
+    return Boolean(isUserAdminOfCurrentProject);
+  }
+  return shouldMatchSomePermissions ? hasSomePermissions(demandedPermissions, actualPermissions) : hasEveryPermissions(demandedPermissions, actualPermissions);
+};
 const getHasDemandedDataFence = options => {
   if (!options.selectDataFenceData) return false;
   const hasDemandedPermission = hasPermission(options.demandedDataFence.name, {
@@ -222,10 +248,10 @@ const hasSomeDataFence = options => {
     if (!actualDataFenceByTypeAndGroup) return false;
 
     // we try to find if the demanded dataFence is available inside the actual datafences
-    const specificActualDataFence = _findInstanceProperty__default["default"](_context3 = _Object$entries__default["default"](actualDataFenceByTypeAndGroup)).call(_context3, _ref => {
-      let _ref2 = _slicedToArray(_ref, 2),
-        dataFenceName = _ref2[0],
-        dataFenceValue = _ref2[1];
+    const specificActualDataFence = _findInstanceProperty__default["default"](_context3 = _Object$entries__default["default"](actualDataFenceByTypeAndGroup)).call(_context3, _ref2 => {
+      let _ref3 = _slicedToArray(_ref2, 2),
+        dataFenceName = _ref3[0],
+        dataFenceValue = _ref3[1];
       // Either the manage permission matches or the
       // a demanded view permission is implied by a manage permission.
       const doesDataFenceMatchByName = dataFenceName === toCanCase(demandedDataFence.name) || dataFenceName === toCanCase(toManageCase(demandedDataFence.name));
@@ -288,11 +314,15 @@ const useIsAuthorized = _ref => {
   const actualPermissions = applicationShellConnectors.useApplicationContext(applicationContext => projectPermissions?.permissions ?? applicationContext.permissions);
   const actualActionRights = applicationShellConnectors.useApplicationContext(applicationContext => projectPermissions?.actionRights ?? applicationContext.actionRights);
   const actualDataFences = applicationShellConnectors.useApplicationContext(applicationContext => projectPermissions?.dataFences ?? applicationContext.dataFences);
-  if (hasDemandedAdministratorPermission) {
-    return isAdminOfAnyOrganization;
-  }
-  if (hasDemandedAdministratorOfCurrentProjectPermission) {
-    return isUserAdminOfCurrentProject ?? false;
+  const hasDemandedPermissions = isAuthorizedForDemandedPermissions({
+    demandedPermissions,
+    actualPermissions,
+    isAdminOfAnyOrganization,
+    isUserAdminOfCurrentProject,
+    shouldMatchSomePermissions
+  });
+  if (hasDemandedAdministratorPermission || hasDemandedAdministratorOfCurrentProjectPermission) {
+    return hasDemandedPermissions;
   }
 
   // if the user has no permissions and no dataFences assigned to them, they are not authorized
@@ -309,7 +339,6 @@ const useIsAuthorized = _ref => {
       selectDataFenceData
     });
   }
-  const hasDemandedPermissions = shouldMatchSomePermissions ? hasSomePermissions(demandedPermissions, actualPermissions) : hasEveryPermissions(demandedPermissions, actualPermissions);
   const hasDemandedActionRights = hasEveryActionRight(demandedActionRights || [], actualActionRights);
   return hasDemandedDataFences || hasDemandedPermissions && hasDemandedActionRights;
 };
@@ -440,5 +469,6 @@ exports.branchOnPermissions = branchOnPermissions;
 exports.hasEveryPermissions = hasEveryPermissions;
 exports.hasSomePermissions = hasSomePermissions;
 exports.injectAuthorized = injectAuthorized;
+exports.isAuthorizedForDemandedPermissions = isAuthorizedForDemandedPermissions;
 exports.useIsAuthorized = useIsAuthorized;
 exports.version = version;

package/dist/commercetools-frontend-permissions.esm.js

@@ -26,7 +26,7 @@ import upperFirst from 'lodash/upperFirst';
 import { jsx, Fragment } from '@emotion/react/jsx-runtime';
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "27.13.0";
+var version = "27.15.0";
 
 // Permissions
 
@@ -123,6 +123,32 @@ const hasEveryActionRight = (demandedActionRights, actualActionRights) => _every
 // - actualPermissions:
 //     { canViewProducts: true, canManageOrders: false }
 const hasSomePermissions = (demandedPermissions, actualPermissions) => _someInstanceProperty(demandedPermissions).call(demandedPermissions, permission => hasPermission(permission, actualPermissions));
+/**
+ * Pure permission check shared by `useIsAuthorized` and callers that cannot use
+ * the hook (e.g. OR-ing visibility across many navbar menus).
+ *
+ * Handles virtual permissions first:
+ * - `Administrator` → `isAdminOfAnyOrganization`
+ * - `AdministratorOfCurrentProject` → `isUserAdminOfCurrentProject`
+ * Then falls back to `hasSomePermissions` / `hasEveryPermissions`.
+ */
+const isAuthorizedForDemandedPermissions = _ref => {
+  let demandedPermissions = _ref.demandedPermissions,
+    actualPermissions = _ref.actualPermissions,
+    _ref$isAdminOfAnyOrga = _ref.isAdminOfAnyOrganization,
+    isAdminOfAnyOrganization = _ref$isAdminOfAnyOrga === void 0 ? false : _ref$isAdminOfAnyOrga,
+    _ref$isUserAdminOfCur = _ref.isUserAdminOfCurrentProject,
+    isUserAdminOfCurrentProject = _ref$isUserAdminOfCur === void 0 ? false : _ref$isUserAdminOfCur,
+    _ref$shouldMatchSomeP = _ref.shouldMatchSomePermissions,
+    shouldMatchSomePermissions = _ref$shouldMatchSomeP === void 0 ? false : _ref$shouldMatchSomeP;
+  if (_includesInstanceProperty(demandedPermissions).call(demandedPermissions, 'Administrator')) {
+    return isAdminOfAnyOrganization;
+  }
+  if (_includesInstanceProperty(demandedPermissions).call(demandedPermissions, 'AdministratorOfCurrentProject')) {
+    return Boolean(isUserAdminOfCurrentProject);
+  }
+  return shouldMatchSomePermissions ? hasSomePermissions(demandedPermissions, actualPermissions) : hasEveryPermissions(demandedPermissions, actualPermissions);
+};
 const getHasDemandedDataFence = options => {
   if (!options.selectDataFenceData) return false;
   const hasDemandedPermission = hasPermission(options.demandedDataFence.name, {
@@ -197,10 +223,10 @@ const hasSomeDataFence = options => {
     if (!actualDataFenceByTypeAndGroup) return false;
 
     // we try to find if the demanded dataFence is available inside the actual datafences
-    const specificActualDataFence = _findInstanceProperty(_context3 = _Object$entries(actualDataFenceByTypeAndGroup)).call(_context3, _ref => {
-      let _ref2 = _slicedToArray(_ref, 2),
-        dataFenceName = _ref2[0],
-        dataFenceValue = _ref2[1];
+    const specificActualDataFence = _findInstanceProperty(_context3 = _Object$entries(actualDataFenceByTypeAndGroup)).call(_context3, _ref2 => {
+      let _ref3 = _slicedToArray(_ref2, 2),
+        dataFenceName = _ref3[0],
+        dataFenceValue = _ref3[1];
       // Either the manage permission matches or the
       // a demanded view permission is implied by a manage permission.
       const doesDataFenceMatchByName = dataFenceName === toCanCase(demandedDataFence.name) || dataFenceName === toCanCase(toManageCase(demandedDataFence.name));
@@ -264,11 +290,15 @@ const useIsAuthorized = _ref => {
   const actualPermissions = useApplicationContext(applicationContext => projectPermissions?.permissions ?? applicationContext.permissions);
   const actualActionRights = useApplicationContext(applicationContext => projectPermissions?.actionRights ?? applicationContext.actionRights);
   const actualDataFences = useApplicationContext(applicationContext => projectPermissions?.dataFences ?? applicationContext.dataFences);
-  if (hasDemandedAdministratorPermission) {
-    return isAdminOfAnyOrganization;
-  }
-  if (hasDemandedAdministratorOfCurrentProjectPermission) {
-    return isUserAdminOfCurrentProject ?? false;
+  const hasDemandedPermissions = isAuthorizedForDemandedPermissions({
+    demandedPermissions,
+    actualPermissions,
+    isAdminOfAnyOrganization,
+    isUserAdminOfCurrentProject,
+    shouldMatchSomePermissions
+  });
+  if (hasDemandedAdministratorPermission || hasDemandedAdministratorOfCurrentProjectPermission) {
+    return hasDemandedPermissions;
   }
 
   // if the user has no permissions and no dataFences assigned to them, they are not authorized
@@ -285,7 +315,6 @@ const useIsAuthorized = _ref => {
       selectDataFenceData
     });
   }
-  const hasDemandedPermissions = shouldMatchSomePermissions ? hasSomePermissions(demandedPermissions, actualPermissions) : hasEveryPermissions(demandedPermissions, actualPermissions);
   const hasDemandedActionRights = hasEveryActionRight(demandedActionRights || [], actualActionRights);
   return hasDemandedDataFences || hasDemandedPermissions && hasDemandedActionRights;
 };
@@ -410,4 +439,4 @@ const branchOnPermissions = function (demandedPermissions, FallbackComponent) {
   };
 };
 
-export { Authorized, RestrictedByPermissions, branchOnPermissions, hasEveryPermissions, hasSomePermissions, injectAuthorized, useIsAuthorized, version };
+export { Authorized, RestrictedByPermissions, branchOnPermissions, hasEveryPermissions, hasSomePermissions, injectAuthorized, isAuthorizedForDemandedPermissions, useIsAuthorized, version };

package/dist/declarations/src/index.d.ts

@@ -3,4 +3,4 @@ export { default as RestrictedByPermissions } from "./components/restricted-by-p
 export { default as branchOnPermissions } from "./components/branch-on-permissions/index.js";
 export { default as Authorized, injectAuthorized, } from "./components/authorized/index.js";
 export { default as useIsAuthorized } from "./hooks/use-is-authorized/index.js";
-export { hasEveryPermissions, hasSomePermissions, } from "./utils/has-permissions.js";
+export { hasEveryPermissions, hasSomePermissions, isAuthorizedForDemandedPermissions, } from "./utils/has-permissions.js";

package/dist/declarations/src/utils/has-permissions.d.ts

@@ -45,5 +45,22 @@ export declare const hasActionRight: (demandedActionRight: TDemandedActionRight,
 export declare const hasEveryPermissions: (demandedPermissions: TPermissionName[], actualPermissions: TPermissions | null) => boolean;
 export declare const hasEveryActionRight: (demandedActionRights: TDemandedActionRight[], actualActionRights: TActionRights | null) => boolean;
 export declare const hasSomePermissions: (demandedPermissions: TPermissionName[], actualPermissions: TPermissions | null) => boolean;
+type TIsAuthorizedForDemandedPermissionsOptions = {
+    demandedPermissions: TPermissionName[];
+    actualPermissions: TPermissions | null;
+    isAdminOfAnyOrganization?: boolean;
+    isUserAdminOfCurrentProject?: boolean | null;
+    shouldMatchSomePermissions?: boolean;
+};
+/**
+ * Pure permission check shared by `useIsAuthorized` and callers that cannot use
+ * the hook (e.g. OR-ing visibility across many navbar menus).
+ *
+ * Handles virtual permissions first:
+ * - `Administrator` → `isAdminOfAnyOrganization`
+ * - `AdministratorOfCurrentProject` → `isUserAdminOfCurrentProject`
+ * Then falls back to `hasSomePermissions` / `hasEveryPermissions`.
+ */
+export declare const isAuthorizedForDemandedPermissions: ({ demandedPermissions, actualPermissions, isAdminOfAnyOrganization, isUserAdminOfCurrentProject, shouldMatchSomePermissions, }: TIsAuthorizedForDemandedPermissionsOptions) => boolean;
 export declare const hasSomeDataFence: (options: TOptionsForAppliedDataFence) => boolean;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commercetools-frontend/permissions",
-  "version": "27.13.0",
+  "version": "27.15.0",
   "description": "React components to declaratively handle MC permissions",
   "bugs": "https://github.com/commercetools/merchant-center-application-kit/issues",
   "repository": {
@@ -38,8 +38,8 @@
     "prop-types": "15.8.1",
     "tiny-invariant": "1.3.3",
     "tiny-warning": "1.0.3",
-    "@commercetools-frontend/application-shell-connectors": "^27.13.0",
-    "@commercetools-frontend/sentry": "^27.13.0"
+    "@commercetools-frontend/application-shell-connectors": "^27.15.0",
+    "@commercetools-frontend/sentry": "^27.15.0"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",