@strapi/admin 5.0.0-beta.2 → 5.0.0-beta.3

package/dist/admin/index.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const index = require('./index-tmvI3DXu.js');
-const Theme = require('./Theme-j7r62OPn.js');
-const admin = require('./admin-vcfA8Zox.js');
+const index = require('./index-dcaxfEDi.js');
+const rbac = require('./rbac-WZsv1761.js');
+const admin = require('./admin-vlKSOeHB.js');
 
 
 
@@ -29,15 +29,15 @@ exports.useGuidedTour = index.useGuidedTour;
 exports.useInjectReducer = index.useInjectReducer;
 exports.useQueryParams = index.useQueryParams;
 exports.useTable = index.useTable;
-exports.NotificationsProvider = Theme.NotificationsProvider;
-exports.Page = Theme.Page;
-exports.createContext = Theme.createContext;
-exports.useAPIErrorHandler = Theme.useAPIErrorHandler;
-exports.useAppInfo = Theme.useAppInfo;
-exports.useAuth = Theme.useAuth;
-exports.useNotification = Theme.useNotification;
-exports.useRBAC = Theme.useRBAC;
-exports.useStrapiApp = Theme.useStrapiApp;
-exports.useTracking = Theme.useTracking;
+exports.NotificationsProvider = rbac.NotificationsProvider;
+exports.Page = rbac.Page;
+exports.createContext = rbac.createContext;
+exports.useAPIErrorHandler = rbac.useAPIErrorHandler;
+exports.useAppInfo = rbac.useAppInfo;
+exports.useAuth = rbac.useAuth;
+exports.useNotification = rbac.useNotification;
+exports.useRBAC = rbac.useRBAC;
+exports.useStrapiApp = rbac.useStrapiApp;
+exports.useTracking = rbac.useTracking;
 exports.getFetchClient = admin.getFetchClient;
 //# sourceMappingURL=index.js.map

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-export { B as BackButton, G as Blocker, C as ConfirmDialog, E as DescriptionComponentRenderer, s as Filters, F as Form, I as InputRenderer, P as Pagination, S as SearchInput, T as Table, D as renderAdmin, e as translatedErrors, i as useAdminUsers, n as useFetchClient, v as useField, A as useFocusInputField, H as useForm, j as useGuidedTour, z as useInjectReducer, m as useQueryParams, J as useTable } from './index-PCKQWB49.mjs';
-export { N as NotificationsProvider, P as Page, t as createContext, f as useAPIErrorHandler, m as useAppInfo, a as useAuth, u as useNotification, k as useRBAC, n as useStrapiApp, d as useTracking } from './Theme-Gult7t3_.mjs';
-export { j as getFetchClient } from './admin-w3o7ePNm.mjs';
+export { B as BackButton, G as Blocker, C as ConfirmDialog, E as DescriptionComponentRenderer, s as Filters, F as Form, I as InputRenderer, P as Pagination, S as SearchInput, T as Table, D as renderAdmin, e as translatedErrors, i as useAdminUsers, n as useFetchClient, v as useField, A as useFocusInputField, H as useForm, j as useGuidedTour, z as useInjectReducer, m as useQueryParams, J as useTable } from './index-oBxjGftZ.mjs';
+export { N as NotificationsProvider, P as Page, t as createContext, f as useAPIErrorHandler, m as useAppInfo, a as useAuth, u as useNotification, k as useRBAC, n as useStrapiApp, d as useTracking } from './rbac-sYT_mXH0.mjs';
+export { k as getFetchClient } from './admin-DUKhYsmP.mjs';
 //# sourceMappingURL=index.mjs.map

package/dist/admin/{Theme-j7r62OPn.js → rbac-WZsv1761.js}

@@ -7,11 +7,11 @@ const reactIntl = require('react-intl');
 const designSystem = require('@strapi/design-system');
 const icons = require('@strapi/icons');
 const reactRouterDom = require('react-router-dom');
-const admin = require('./admin-vcfA8Zox.js');
+const ContextSelector = require('use-context-selector');
+const admin = require('./admin-vlKSOeHB.js');
 const v2 = require('@strapi/design-system/v2');
 const isEqual = require('lodash/isEqual');
 const axios = require('axios');
-const ContextSelector = require('use-context-selector');
 const defaultsDeep = require('lodash/defaultsDeep');
 const reactRedux = require('react-redux');
 const styled = require('styled-components');
@@ -38,9 +38,9 @@ function _interopNamespace(e) {
 }
 
 const React__namespace = /*#__PURE__*/_interopNamespace(React);
+const ContextSelector__namespace = /*#__PURE__*/_interopNamespace(ContextSelector);
 const isEqual__default = /*#__PURE__*/_interopDefault(isEqual);
 const axios__default = /*#__PURE__*/_interopDefault(axios);
-const ContextSelector__namespace = /*#__PURE__*/_interopNamespace(ContextSelector);
 const defaultsDeep__default = /*#__PURE__*/_interopDefault(defaultsDeep);
 
 function createContext(rootComponentName, defaultContext) {
@@ -64,6 +64,8 @@ const useTypedStore = reactRedux.useStore;
 const useTypedSelector = reactRedux.useSelector;
 const createTypedSelector = (selector) => toolkit.createSelector((state) => state, selector);
 
+const [StrapiAppProvider, useStrapiApp] = createContext("StrapiApp");
+
 const THEME_LOCAL_STORAGE_KEY = "STRAPI_THEME";
 const LANGUAGE_LOCAL_STORAGE_KEY = "strapi-admin-language";
 const adminSlice = toolkit.createSlice({
@@ -291,6 +293,8 @@ const STORAGE_KEYS = {
 };
 const AuthProvider = ({ children, _defaultPermissions = [] }) => {
   const dispatch = useTypedDispatch();
+  const runRbacMiddleware = useStrapiApp("AuthProvider", (state) => state.rbac.run);
+  const location = reactRouterDom.useLocation();
   const [token, setToken] = React__namespace.useState(() => {
     const token2 = localStorage.getItem(STORAGE_KEYS.TOKEN) ?? sessionStorage.getItem(STORAGE_KEYS.TOKEN);
     if (typeof token2 === "string") {
@@ -298,7 +302,7 @@ const AuthProvider = ({ children, _defaultPermissions = [] }) => {
     }
     return null;
   });
-  const { data: user } = useGetMeQuery(void 0, {
+  const { data: user, isLoading: isLoadingUser } = useGetMeQuery(void 0, {
     /**
      * If there's no token, we don't try to fetch
      * the user data because it will fail.
@@ -308,7 +312,8 @@ const AuthProvider = ({ children, _defaultPermissions = [] }) => {
   const {
     data: userPermissions = _defaultPermissions,
     refetch,
-    isUninitialized
+    isUninitialized,
+    isLoading: isLoadingPermissions
   } = useGetMyPermissionsQuery(void 0, {
     skip: !token
   });
@@ -385,22 +390,32 @@ const AuthProvider = ({ children, _defaultPermissions = [] }) => {
   const [checkPermissions] = useLazyCheckPermissionsQuery();
   const checkUserHasPermissions = React__namespace.useCallback(
     async (permissions, passedPermissions) => {
-      if (!permissions || !permissions.length) {
-        return true;
+      if (!permissions || permissions.length === 0) {
+        return [{ action: "", subject: "" }];
       }
-      const matchingPermissions = permissions.filter(
-        (permission) => (passedPermissions || userPermissions).findIndex(
+      const actualUserPermissions = passedPermissions ?? userPermissions;
+      const matchingPermissions = actualUserPermissions.filter(
+        (permission) => permissions.findIndex(
           (perm) => perm.action === permission.action && perm.subject === permission.subject
         ) >= 0
       );
-      const shouldCheckConditions = matchingPermissions.some(
+      const middlewaredPermissions = await runRbacMiddleware(
+        {
+          user,
+          permissions: userPermissions,
+          pathname: location.pathname,
+          search: location.search.split("?")[1] ?? ""
+        },
+        matchingPermissions
+      );
+      const shouldCheckConditions = middlewaredPermissions.some(
         (perm) => Array.isArray(perm.conditions) && perm.conditions.length > 0
       );
       if (!shouldCheckConditions) {
-        return matchingPermissions.length > 0;
+        return middlewaredPermissions;
       }
       const { data, error } = await checkPermissions({
-        permissions: matchingPermissions.map((perm) => ({
+        permissions: middlewaredPermissions.map((perm) => ({
           action: perm.action,
           subject: perm.subject
         }))
@@ -408,11 +423,12 @@ const AuthProvider = ({ children, _defaultPermissions = [] }) => {
       if (error) {
         throw error;
       } else {
-        return data?.data.every((v) => v === true) ?? false;
+        return middlewaredPermissions.filter((_, index) => data?.data[index] === true);
       }
     },
-    [checkPermissions, userPermissions]
+    [checkPermissions, location.pathname, location.search, runRbacMiddleware, user, userPermissions]
   );
+  const isLoading = isLoadingUser || isLoadingPermissions;
   return /* @__PURE__ */ jsxRuntime.jsx(
     Provider,
     {
@@ -424,6 +440,7 @@ const AuthProvider = ({ children, _defaultPermissions = [] }) => {
       checkUserHasPermissions,
       refetchPermissions,
       setToken,
+      isLoading,
       children
     }
   );
@@ -829,6 +846,20 @@ const Page = {
   Title
 };
 
+const once = (fn) => {
+  const func = fn;
+  let called = false;
+  if (typeof func !== "function") {
+    throw new TypeError(`once requires a function parameter`);
+  }
+  return (...args) => {
+    if (!called && process.env.NODE_ENV === "development") {
+      func(...args);
+      called = true;
+    }
+  };
+};
+
 const capitalise = (str) => str.charAt(0).toUpperCase() + str.slice(1);
 
 const usePrev = (value) => {
@@ -839,54 +870,78 @@ const usePrev = (value) => {
   return ref.current;
 };
 
-const useRBAC = (permissionsToCheck = {}, passedPermissions) => {
-  const userPermissions = useAuth("useRBAC", (state) => state.permissions);
+const useRBAC = (permissionsToCheck = [], passedPermissions) => {
+  const isLoadingAuth = useAuth("useRBAC", (state) => state.isLoading);
   const [isLoading, setIsLoading] = React.useState(true);
   const [error, setError] = React.useState();
   const [data, setData] = React.useState();
-  const defaultAllowedActions = React.useMemo(
-    () => Object.keys(permissionsToCheck).reduce(
-      (acc, name) => ({
+  const warnOnce = React.useMemo(() => once(console.warn), []);
+  const actualPermissionsToCheck = React.useMemo(() => {
+    if (Array.isArray(permissionsToCheck)) {
+      return permissionsToCheck;
+    } else {
+      warnOnce(
+        "useRBAC: The first argument should be an array of permissions, not an object. This will be deprecated in the future."
+      );
+      return Object.values(permissionsToCheck).flat();
+    }
+  }, [permissionsToCheck, warnOnce]);
+  const defaultAllowedActions = React.useMemo(() => {
+    return actualPermissionsToCheck.reduce((acc, permission) => {
+      return {
         ...acc,
-        [name]: false
-      }),
-      {}
-    ),
-    [permissionsToCheck]
-  );
+        [getActionName(permission)]: false
+      };
+    }, {});
+  }, [actualPermissionsToCheck]);
   const checkUserHasPermissions = useAuth("useRBAC", (state) => state.checkUserHasPermissions);
-  const permssionsChecked = usePrev(permissionsToCheck);
+  const permssionsChecked = usePrev(actualPermissionsToCheck);
   React.useEffect(() => {
-    if (!isEqual__default.default(permssionsChecked, permissionsToCheck)) {
+    if (!isEqual__default.default(permssionsChecked, actualPermissionsToCheck)) {
       setIsLoading(true);
       setData(void 0);
       setError(void 0);
-      const permissionEntries = Object.entries(permissionsToCheck);
-      for (const [name, permissions] of permissionEntries) {
-        checkUserHasPermissions(permissions, passedPermissions).then((res) => {
-          if (res) {
-            setData((s) => ({
-              ...s,
-              [name]: res
-            }));
-          }
-        }).catch((err) => {
-          setError(err);
-        }).finally(() => {
-          setIsLoading(false);
-        });
-      }
+      checkUserHasPermissions(actualPermissionsToCheck, passedPermissions).then((res) => {
+        if (res) {
+          setData(
+            res.reduce((acc, permission) => {
+              return {
+                ...acc,
+                [getActionName(permission)]: true
+              };
+            }, {})
+          );
+        }
+      }).catch((err) => {
+        setError(err);
+      }).finally(() => {
+        setIsLoading(false);
+      });
     }
-  }, [checkUserHasPermissions, passedPermissions, permissionsToCheck, permssionsChecked]);
-  const actions = {
+  }, [
+    actualPermissionsToCheck,
+    checkUserHasPermissions,
+    passedPermissions,
+    permissionsToCheck,
+    permssionsChecked
+  ]);
+  const allowedActions = Object.entries({
     ...defaultAllowedActions,
     ...data
-  };
-  const allowedActions = Object.entries(actions).reduce((acc, [name, allowed]) => {
+  }).reduce((acc, [name, allowed]) => {
     acc[`can${capitalise(name)}`] = allowed;
     return acc;
   }, {});
-  return { allowedActions, isLoading: isLoading || userPermissions.length === 0, error };
+  return {
+    allowedActions,
+    permissions: actualPermissionsToCheck,
+    isLoading: isLoading || isLoadingAuth,
+    error
+  };
+};
+const getActionName = (permission) => {
+  const [action = ""] = permission.action.split(".").slice(-1);
+  return action.split("-").map(capitalise).join("");
 };
 
 const [AppInfoProvider, useAppInfo] = createContext("AppInfo", {});
@@ -1071,8 +1126,6 @@ const ConfigurationProvider = ({
   );
 };
 
-const [StrapiAppProvider, useStrapiApp] = createContext("StrapiApp");
-
 const LanguageProvider = ({ children, messages }) => {
   const locale = useTypedSelector((state) => state.admin_app.language.locale);
   const appMessages = defaultsDeep__default.default(messages[locale], messages.en);
@@ -1117,6 +1170,30 @@ const GlobalStyle = styled.createGlobalStyle`
   }
 `;
 
+class RBAC {
+  middlewares = [];
+  constructor() {
+  }
+  use(middleware) {
+    if (Array.isArray(middleware)) {
+      this.middlewares.push(...middleware);
+    } else {
+      this.middlewares.push(middleware);
+    }
+  }
+  run = async (ctx, permissions) => {
+    let index = 0;
+    const middlewaresToRun = this.middlewares.map((middleware) => middleware(ctx));
+    const next = async (permissions2) => {
+      if (index < this.middlewares.length) {
+        return middlewaresToRun[index++](next)(permissions2);
+      }
+      return permissions2;
+    };
+    return next(permissions);
+  };
+}
+
 exports.AppInfoProvider = AppInfoProvider;
 exports.AuthProvider = AuthProvider;
 exports.ConfigurationContextProvider = ConfigurationContextProvider;
@@ -1125,6 +1202,7 @@ exports.LANGUAGE_LOCAL_STORAGE_KEY = LANGUAGE_LOCAL_STORAGE_KEY;
 exports.LanguageProvider = LanguageProvider;
 exports.NotificationsProvider = NotificationsProvider;
 exports.Page = Page;
+exports.RBAC = RBAC;
 exports.StrapiAppProvider = StrapiAppProvider;
 exports.THEME_LOCAL_STORAGE_KEY = THEME_LOCAL_STORAGE_KEY;
 exports.Theme = Theme;
@@ -1156,4 +1234,4 @@ exports.useTypedSelector = useTypedSelector;
 exports.useTypedStore = useTypedStore;
 exports.useUpdateMeMutation = useUpdateMeMutation;
 exports.useUpdateProviderOptionsMutation = useUpdateProviderOptionsMutation;
-//# sourceMappingURL=Theme-j7r62OPn.js.map
+//# sourceMappingURL=rbac-WZsv1761.js.map