@taruvi/refine-providers 1.2.8 → 1.3.0

package/dist/index.js

@@ -5,7 +5,7 @@ import DataLoader from 'dataloader';
 
 // package.json
 var package_default = {
-  version: "1.2.7"};
+  version: "1.3.0"};
 
 // src/utils.ts
 var REFINE_OPERATOR_MAP = {
@@ -225,6 +225,10 @@ function applyPopulate(query, meta) {
   const populateArray = Array.isArray(meta.populate) ? meta.populate : meta.populate.split(",").map((s) => s.trim());
   return query.populate(populateArray);
 }
+function applyAllowedActions(query, meta) {
+  if (!meta?.allowedActions?.length) return query;
+  return query.allowedActions(meta.allowedActions);
+}
 function isGraphQuery(meta) {
   return !!(meta?.format || meta?.graph_types || meta?.include || meta?.depth);
 }
@@ -249,7 +253,9 @@ function dataProvider(client) {
       const taruviMeta = meta;
       const tableName = getTableName(resource, taruviMeta);
       if (isGraphQuery(taruviMeta)) {
-        const response2 = await buildGraphQuery(client, tableName, taruviMeta).execute();
+        let graphQuery = buildGraphQuery(client, tableName, taruviMeta);
+        graphQuery = applyAllowedActions(graphQuery, taruviMeta);
+        const response2 = await graphQuery.execute();
         const data = Array.isArray(response2) ? response2 : response2?.data ?? [];
         const total = response2?.total ?? data.length;
         return { data, total };
@@ -260,6 +266,7 @@ function dataProvider(client) {
       query = applyPagination(query, pagination);
       query = applyPopulate(query, taruviMeta);
       query = applyAggregations(query, taruviMeta);
+      query = applyAllowedActions(query, taruviMeta);
       const response = await query.execute();
       return { data: response.data, total: response.total };
     },
@@ -911,6 +918,7 @@ function analyticsDataProvider(client) {
     }
   };
 }
+var _cachedUser = null;
 function authProvider(client) {
   const auth = new Auth(client);
   return {
@@ -938,6 +946,7 @@ function authProvider(client) {
     },
     logout: async (params = {}) => {
       const { callbackUrl } = params;
+      _cachedUser = null;
       await auth.logout(callbackUrl);
       return {
         success: true,
@@ -948,24 +957,20 @@ function authProvider(client) {
       if (!auth.isUserAuthenticated()) {
         return { authenticated: false, redirectTo: "/login" };
       }
-      try {
-        const user = await auth.getCurrentUser();
-        if (user) {
-          return { authenticated: true };
-        }
-      } catch {
-      }
-      return { authenticated: false, redirectTo: "/login" };
+      return { authenticated: true };
     },
     onError: async (error) => {
       const status = error?.statusCode || error?.status || error?.response?.status;
-      if (status === 401 || status === 403) {
+      if (status === 401) {
         return {
           logout: true,
           redirectTo: "/login",
           error
         };
       }
+      if (status === 403) {
+        return { error };
+      }
       return { error };
     },
     register: async (params = {}) => {
@@ -978,16 +983,15 @@ function authProvider(client) {
     getIdentity: async () => {
       const response = await auth.getCurrentUser();
       if (!response) {
+        _cachedUser = null;
         return null;
       }
-      return response.data ?? response;
+      const user = response.data ?? response;
+      _cachedUser = user;
+      return user;
     },
     getPermissions: async () => {
-      const response = await auth.getCurrentUser();
-      if (!response) {
-        return null;
-      }
-      const user = response.data ?? response;
+      const user = _cachedUser;
       if (!user) {
         return null;
       }
@@ -1007,9 +1011,16 @@ function accessControlProvider(client, options) {
   const { batchDelayMs = 50 } = options ?? {};
   const permissionLoader = new DataLoader(
     async (checks) => {
-      const response = await auth.getCurrentUser();
-      const user = response ? response.data ?? response : null;
-      if (!user) {
+      let currentUser = _cachedUser;
+      if (!currentUser) {
+        try {
+          const response = await auth.getCurrentUser();
+          currentUser = response ? response.data ?? response : null;
+        } catch {
+          currentUser = null;
+        }
+      }
+      if (!currentUser) {
         return checks.map(() => ({
           can: false,
           reason: "User not authenticated"
@@ -1021,8 +1032,7 @@ function accessControlProvider(client, options) {
         const key = `${check.resource}:${recordId}`;
         if (!uniqueResources.has(key)) {
           uniqueResources.set(key, {
-            entityType: check.entityType,
-            tableName: check.resource,
+            resource: check.resource,
             recordId,
             attributes: check.params || {},
             actions: /* @__PURE__ */ new Set()
@@ -1030,10 +1040,9 @@ function accessControlProvider(client, options) {
         }
         uniqueResources.get(key).actions.add(check.action);
       }
-      const batchPayload = Array.from(uniqueResources.values()).map((entry) => ({
-        entityType: entry.entityType ?? entry.tableName,
-        // Default to tableName if entityType not specified
-        tableName: entry.tableName,
+      const uniqueEntries = Array.from(uniqueResources.values());
+      const batchPayload = uniqueEntries.map((entry) => ({
+        resource: entry.resource,
         recordId: entry.recordId,
         attributes: entry.attributes,
         actions: Array.from(entry.actions)
@@ -1043,7 +1052,7 @@ function accessControlProvider(client, options) {
         const resultsByResource = /* @__PURE__ */ new Map();
         result?.results?.forEach((r, index) => {
           const payload = batchPayload[index];
-          const key = `${payload.tableName}:${payload.recordId}`;
+          const key = `${payload.resource}:${payload.recordId}`;
           resultsByResource.set(key, r.actions || {});
         });
         return checks.map((check) => {
@@ -1075,12 +1084,10 @@ function accessControlProvider(client, options) {
       if (!resource) {
         return { can: false, reason: "Resource not specified" };
       }
-      const entityType = params?.entityType ?? params?.resource?.meta?.entityType;
       return permissionLoader.load({
         resource,
         action,
-        params,
-        entityType
+        params
       });
     },
     options: {
@@ -1098,6 +1105,6 @@ function accessControlProvider(client, options) {
   };
 }
 
-export { REFINE_OPERATOR_MAP, accessControlProvider, analyticsDataProvider, appDataProvider, authProvider, buildQueryString, buildRefineQueryParams, convertRefineFilters, convertRefinePagination, convertRefineSorters, dataProvider, functionsDataProvider, handleError, storageDataProvider, userDataProvider };
+export { REFINE_OPERATOR_MAP, _cachedUser, accessControlProvider, analyticsDataProvider, appDataProvider, authProvider, buildQueryString, buildRefineQueryParams, convertRefineFilters, convertRefinePagination, convertRefineSorters, dataProvider, functionsDataProvider, handleError, storageDataProvider, userDataProvider };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map