@taruvi/refine-providers 1.2.8 → 1.2.9

package/dist/index.js

@@ -5,7 +5,7 @@ import DataLoader from 'dataloader';
 
 // package.json
 var package_default = {
-  version: "1.2.7"};
+  version: "1.2.8"};
 
 // src/utils.ts
 var REFINE_OPERATOR_MAP = {
@@ -911,6 +911,7 @@ function analyticsDataProvider(client) {
     }
   };
 }
+var _cachedUser = null;
 function authProvider(client) {
   const auth = new Auth(client);
   return {
@@ -938,6 +939,7 @@ function authProvider(client) {
     },
     logout: async (params = {}) => {
       const { callbackUrl } = params;
+      _cachedUser = null;
       await auth.logout(callbackUrl);
       return {
         success: true,
@@ -948,14 +950,7 @@ 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;
@@ -978,16 +973,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 +1001,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 +1022,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 +1030,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 +1042,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 +1074,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 +1095,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