@taruvi/refine-providers 1.1.8 → 1.2.0

package/dist/index.js

@@ -1,32 +1,51 @@
-import { Graph, Database, Storage, Functions, Analytics, App, User, Auth, Policy } from '@taruvi/sdk';
-import DataLoader2 from 'dataloader';
+import { Graph, Database, Storage, Functions, Analytics, App, Secrets, User, Auth, Policy } from '@taruvi/sdk';
+import DataLoader from 'dataloader';
 
 // src/dataProvider.ts
-var REFINE_TO_SDK_OPERATOR = {
-  eq: "eq",
+
+// src/utils.ts
+var REFINE_OPERATOR_MAP = {
+  // Equality
+  eq: "",
+  // exact match (no suffix)
   ne: "ne",
+  // Comparison
   lt: "lt",
   gt: "gt",
   lte: "lte",
   gte: "gte",
+  // String operations (case-sensitive)
   contains: "contains",
-  containss: "icontains",
-  // case-insensitive
+  ncontains: "ncontains",
   startswith: "startswith",
-  startswiths: "istartswith",
+  nstartswith: "nstartswith",
   endswith: "endswith",
+  nendswith: "nendswith",
+  // String operations (case-insensitive)
+  containss: "icontains",
+  ncontainss: "nicontains",
+  startswiths: "istartswith",
+  nstartswiths: "nistartswith",
   endswiths: "iendswith",
+  nendswiths: "niendswith",
+  // Array operations
   in: "in",
   nin: "nin",
-  null: "isnull"
+  // Null checks
+  null: "null",
+  nnull: "nnull",
+  // Range
+  between: "between",
+  nbetween: "nbetween"
 };
-function applyFilters(query, filters) {
-  if (!filters || filters.length === 0) return query;
-  let result = query;
+function convertRefineFilters(filters) {
+  if (!filters || filters.length === 0) return {};
+  const params = {};
   for (const filter of filters) {
     if ("operator" in filter && (filter.operator === "and" || filter.operator === "or")) {
       if (filter.value && Array.isArray(filter.value)) {
-        result = applyFilters(result, filter.value);
+        const nested = convertRefineFilters(filter.value);
+        Object.assign(params, nested);
       }
       continue;
     }
@@ -35,22 +54,104 @@ function applyFilters(query, filters) {
       if (value === void 0 || value === null && operator !== "null") {
         continue;
       }
-      const sdkOperator = REFINE_TO_SDK_OPERATOR[operator];
-      if (!sdkOperator) {
+      const suffix = REFINE_OPERATOR_MAP[operator];
+      if (suffix === void 0) {
         console.warn(`Unknown Refine operator: ${operator}`);
         continue;
       }
-      let sdkValue;
+      const paramKey = suffix ? `${field}__${suffix}` : String(field);
       if (operator === "in" || operator === "nin") {
-        sdkValue = Array.isArray(value) ? value : [value];
+        params[paramKey] = Array.isArray(value) ? value.join(",") : String(value);
+      } else if (operator === "between" || operator === "nbetween") {
+        params[paramKey] = Array.isArray(value) ? value.join(",") : String(value);
       } else if (operator === "null" || operator === "nnull") {
-        sdkValue = true;
-      } else if (typeof value === "boolean" || typeof value === "number") {
-        sdkValue = value;
+        params[paramKey] = "true";
       } else {
-        sdkValue = String(value);
+        params[paramKey] = String(value);
       }
-      result = result.filter(String(field), sdkOperator, sdkValue);
+    }
+  }
+  return params;
+}
+function convertRefineSorters(sorters) {
+  if (!sorters || sorters.length === 0) return void 0;
+  return sorters.map((sort) => sort.order === "desc" ? `-${sort.field}` : sort.field).join(",");
+}
+function convertRefinePagination(pagination) {
+  if (!pagination) return {};
+  const { currentPage, pageSize, mode } = pagination;
+  if (mode === "off") return {};
+  return {
+    page: currentPage ?? 1,
+    // Default to page 1 if currentPage is undefined
+    page_size: pageSize
+  };
+}
+function buildRefineQueryParams(options) {
+  const { filters, sorters, pagination, meta } = options;
+  const params = {
+    ...convertRefineFilters(filters),
+    ...convertRefinePagination(pagination)
+  };
+  const ordering = convertRefineSorters(sorters);
+  if (ordering) {
+    params.ordering = ordering;
+  }
+  if (meta?.populate) {
+    params.populate = Array.isArray(meta.populate) ? meta.populate.join(",") : meta.populate;
+  }
+  return params;
+}
+function buildQueryString(params) {
+  if (!params || Object.keys(params).length === 0) return "";
+  const searchParams = new URLSearchParams();
+  for (const [key, value] of Object.entries(params)) {
+    if (value !== void 0 && value !== null) {
+      searchParams.append(key, String(value));
+    }
+  }
+  const queryString = searchParams.toString();
+  return queryString ? `?${queryString}` : "";
+}
+function handleError(error) {
+  if (error instanceof Error) {
+    throw error;
+  }
+  if (typeof error === "object" && error !== null && "message" in error) {
+    throw new Error(String(error.message));
+  }
+  throw new Error("Unknown error occurred");
+}
+
+// src/dataProvider.ts
+function applyFilters(query, filters) {
+  if (!filters || filters.length === 0) return query;
+  let result = query;
+  for (const filter of filters) {
+    if ("operator" in filter && (filter.operator === "and" || filter.operator === "or")) {
+      if (filter.value && Array.isArray(filter.value)) {
+        result = applyFilters(result, filter.value);
+      }
+      continue;
+    }
+    if ("field" in filter && filter.field && filter.operator) {
+      const { field, operator, value } = filter;
+      if (value === void 0 || value === null && operator !== "null") continue;
+      const suffix = REFINE_OPERATOR_MAP[operator];
+      if (suffix === void 0) {
+        console.warn(`Unknown Refine operator: ${operator}`);
+        continue;
+      }
+      const paramKey = suffix ? `${field}__${suffix}` : String(field);
+      let paramValue;
+      if (operator === "in" || operator === "nin" || operator === "between" || operator === "nbetween") {
+        paramValue = Array.isArray(value) ? value.join(",") : String(value);
+      } else if (operator === "null" || operator === "nnull") {
+        paramValue = "true";
+      } else {
+        paramValue = String(value);
+      }
+      result = result.filter(paramKey, "eq", paramValue);
     }
   }
   return result;
@@ -59,20 +160,15 @@ function applySorters(query, sorters) {
   if (!sorters || sorters.length === 0) return query;
   let result = query;
   for (const sorter of sorters) {
-    const order = sorter.order === "desc" ? "desc" : "asc";
-    result = result.sort(sorter.field, order);
+    result = result.sort(sorter.field, sorter.order === "desc" ? "desc" : "asc");
   }
   return result;
 }
 function applyPagination(query, pagination) {
   if (!pagination || pagination.mode === "off") return query;
   let result = query;
-  if (pagination.currentPage) {
-    result = result.page(pagination.currentPage);
-  }
-  if (pagination.pageSize) {
-    result = result.pageSize(pagination.pageSize);
-  }
+  if (pagination.currentPage) result = result.page(pagination.currentPage);
+  if (pagination.pageSize) result = result.pageSize(pagination.pageSize);
   return result;
 }
 function applyPopulate(query, meta) {
@@ -94,7 +190,7 @@ function buildGraphQuery(client, tableName, meta, recordId) {
 }
 function dataProvider(client) {
   const config = client.getConfig();
-  const baseApiUrl = `${config.baseUrl}/api/apps/${config.appSlug}`;
+  const baseApiUrl = `${config.apiUrl}/api/apps/${config.appSlug}`;
   const getIdColumn = (meta) => meta?.idColumnName ?? "id";
   const getTableName = (resource, meta) => meta?.tableName ?? resource;
   return {
@@ -125,9 +221,9 @@ function dataProvider(client) {
         const data = Array.isArray(response2) ? response2[0] : response2?.data?.[0] ?? response2;
         return { data };
       }
-      let query = new Database(client).from(tableName);
+      let query = new Database(client).from(tableName).get(String(id));
       query = applyPopulate(query, taruviMeta);
-      const response = await query.get(String(id)).execute();
+      const response = await query.execute();
       return { data: response.data };
     },
     getMany: async (params) => {
@@ -155,11 +251,11 @@ function dataProvider(client) {
       const taruviMeta = meta;
       const tableName = getTableName(resource, taruviMeta);
       if (isGraphQuery(taruviMeta)) {
-        const data2 = await new Graph(client).from(tableName).createEdge(variables).execute();
-        return { data: data2 };
+        const response2 = await new Graph(client).from(tableName).create(variables).execute();
+        return { data: response2.data };
       }
-      const data = await new Database(client).from(tableName).create(variables).execute();
-      return { data };
+      const response = await new Database(client).from(tableName).create(variables).execute();
+      return { data: response.data };
     },
     createMany: async (params) => {
       const { resource, variables, meta } = params;
@@ -167,7 +263,8 @@ function dataProvider(client) {
       const tableName = getTableName(resource, taruviMeta);
       const data = await Promise.all(
         variables.map(async (vars) => {
-          return new Database(client).from(tableName).create(vars).execute();
+          const response = await new Database(client).from(tableName).create(vars).execute();
+          return response.data;
         })
       );
       return { data };
@@ -177,11 +274,11 @@ function dataProvider(client) {
       const taruviMeta = meta;
       const tableName = getTableName(resource, taruviMeta);
       if (isGraphQuery(taruviMeta)) {
-        const data2 = await new Graph(client).from(tableName).updateEdge(String(id), variables).execute();
-        return { data: data2 };
+        const response2 = await new Graph(client).from(tableName).update(String(id), variables).execute();
+        return { data: response2.data };
       }
-      const data = await new Database(client).from(tableName).get(String(id)).update(variables).execute();
-      return { data };
+      const response = await new Database(client).from(tableName).get(String(id)).update(variables).execute();
+      return { data: response.data };
     },
     updateMany: async (params) => {
       const { resource, ids, variables, meta } = params;
@@ -189,7 +286,8 @@ function dataProvider(client) {
       const tableName = getTableName(resource, taruviMeta);
       const data = await Promise.all(
         ids.map(async (id) => {
-          return new Database(client).from(tableName).get(String(id)).update(variables).execute();
+          const response = await new Database(client).from(tableName).get(String(id)).update(variables).execute();
+          return response.data;
         })
       );
       return { data };
@@ -199,46 +297,51 @@ function dataProvider(client) {
       const taruviMeta = meta;
       const tableName = getTableName(resource, taruviMeta);
       if (isGraphQuery(taruviMeta)) {
-        const data2 = await new Graph(client).from(tableName).deleteEdge([String(id)]).execute();
-        return { data: data2 };
+        const response = await new Graph(client).from(tableName).delete([Number(id)]).execute();
+        return { data: response.data };
       }
-      const data = await new Database(client).from(tableName).delete(String(id)).execute();
-      return { data };
+      await new Database(client).from(tableName).delete(String(id)).execute();
+      return { data: { id } };
     },
     deleteMany: async (params) => {
       const { resource, ids, meta } = params;
       const taruviMeta = meta;
       const tableName = getTableName(resource, taruviMeta);
       if (isGraphQuery(taruviMeta)) {
-        const data2 = await new Graph(client).from(tableName).deleteEdge(ids.map(String)).execute();
-        return { data: [data2] };
+        const response = await new Graph(client).from(tableName).delete(ids.map(Number)).execute();
+        return { data: [response.data] };
       }
-      const data = await Promise.all(
-        ids.map((id) => new Database(client).from(tableName).delete(String(id)).execute())
+      await Promise.all(
+        ids.map(async (id) => {
+          await new Database(client).from(tableName).delete(String(id)).execute();
+        })
       );
-      return { data };
+      return { data: ids.map((id) => ({ id })) };
     },
     custom: async (params) => {
       const { url, method, payload, query } = params;
-      let fullUrl = `api/apps/${config.appSlug}/datatables/${url}`;
+      let endpoint = `api/apps/${config.appSlug}/datatables/${url}`;
       let data;
       switch (method.toLowerCase()) {
         case "get": {
           if (query && Object.keys(query).length > 0) {
             const queryString = new URLSearchParams(query).toString();
-            fullUrl = `${fullUrl}${fullUrl.includes("?") ? "&" : "?"}${queryString}`;
+            endpoint = `${endpoint}${endpoint.includes("?") ? "&" : "?"}${queryString}`;
           }
-          data = await client.httpClient.get(fullUrl);
+          data = await client.httpClient.get(endpoint);
           break;
         }
         case "post":
-          data = await client.httpClient.post(fullUrl, payload);
+          data = await client.httpClient.post(endpoint, payload);
           break;
         case "put":
-          data = await client.httpClient.put(fullUrl, payload);
+          data = await client.httpClient.put(endpoint, payload);
+          break;
+        case "patch":
+          data = await client.httpClient.patch(endpoint, payload);
           break;
         case "delete":
-          data = await client.httpClient.delete(fullUrl);
+          data = await client.httpClient.delete(endpoint);
           break;
         default:
           throw new Error(`Unsupported HTTP method: ${method}`);
@@ -248,131 +351,9 @@ function dataProvider(client) {
     getApiUrl: () => baseApiUrl
   };
 }
-
-// src/utils.ts
-var REFINE_OPERATOR_MAP = {
-  // Equality
-  eq: "",
-  // exact match (no suffix)
-  ne: "ne",
-  // Comparison
-  lt: "lt",
-  gt: "gt",
-  lte: "lte",
-  gte: "gte",
-  // String operations (case-sensitive)
-  contains: "contains",
-  ncontains: "ncontains",
-  startswith: "startswith",
-  nstartswith: "nstartswith",
-  endswith: "endswith",
-  nendswith: "nendswith",
-  // String operations (case-insensitive)
-  containss: "icontains",
-  ncontainss: "nicontains",
-  startswiths: "istartswith",
-  nstartswiths: "nistartswith",
-  endswiths: "iendswith",
-  nendswiths: "niendswith",
-  // Array operations
-  in: "in",
-  nin: "nin",
-  // Null checks
-  null: "null",
-  nnull: "nnull",
-  // Range
-  between: "between",
-  nbetween: "nbetween"
-};
-function convertRefineFilters(filters) {
-  if (!filters || filters.length === 0) return {};
-  const params = {};
-  for (const filter of filters) {
-    if ("operator" in filter && (filter.operator === "and" || filter.operator === "or")) {
-      if (filter.value && Array.isArray(filter.value)) {
-        const nested = convertRefineFilters(filter.value);
-        Object.assign(params, nested);
-      }
-      continue;
-    }
-    if ("field" in filter && filter.field && filter.operator) {
-      const { field, operator, value } = filter;
-      if (value === void 0 || value === null && operator !== "null") {
-        continue;
-      }
-      const suffix = REFINE_OPERATOR_MAP[operator];
-      if (suffix === void 0) {
-        console.warn(`Unknown Refine operator: ${operator}`);
-        continue;
-      }
-      const paramKey = suffix ? `${field}__${suffix}` : String(field);
-      if (operator === "in" || operator === "nin") {
-        params[paramKey] = Array.isArray(value) ? value.join(",") : String(value);
-      } else if (operator === "between" || operator === "nbetween") {
-        params[paramKey] = Array.isArray(value) ? value.join(",") : String(value);
-      } else if (operator === "null" || operator === "nnull") {
-        params[paramKey] = "true";
-      } else {
-        params[paramKey] = String(value);
-      }
-    }
-  }
-  return params;
-}
-function convertRefineSorters(sorters) {
-  if (!sorters || sorters.length === 0) return void 0;
-  return sorters.map((sort) => sort.order === "desc" ? `-${sort.field}` : sort.field).join(",");
-}
-function convertRefinePagination(pagination) {
-  if (!pagination) return {};
-  const { currentPage, pageSize, mode } = pagination;
-  if (mode === "off") return {};
-  return {
-    page: currentPage ?? 1,
-    // Default to page 1 if currentPage is undefined
-    page_size: pageSize
-  };
-}
-function buildRefineQueryParams(options) {
-  const { filters, sorters, pagination, meta } = options;
-  const params = {
-    ...convertRefineFilters(filters),
-    ...convertRefinePagination(pagination)
-  };
-  const ordering = convertRefineSorters(sorters);
-  if (ordering) {
-    params.ordering = ordering;
-  }
-  if (meta?.populate) {
-    params.populate = Array.isArray(meta.populate) ? meta.populate.join(",") : meta.populate;
-  }
-  return params;
-}
-function buildQueryString(params) {
-  if (!params || Object.keys(params).length === 0) return "";
-  const searchParams = new URLSearchParams();
-  for (const [key, value] of Object.entries(params)) {
-    if (value !== void 0 && value !== null) {
-      searchParams.append(key, String(value));
-    }
-  }
-  const queryString = searchParams.toString();
-  return queryString ? `?${queryString}` : "";
-}
-function handleError(error) {
-  if (error instanceof Error) {
-    throw error;
-  }
-  if (typeof error === "object" && error !== null && "message" in error) {
-    throw new Error(String(error.message));
-  }
-  throw new Error("Unknown error occurred");
-}
-
-// src/storageDataProvider.ts
 function storageDataProvider(client) {
   const config = client.getConfig();
-  const baseApiUrl = `${config.baseUrl}/api/apps/${config.appSlug}`;
+  const baseApiUrl = `${config.apiUrl}/api/apps/${config.appSlug}`;
   const getBucketName = (resource, meta) => meta?.bucketName ?? resource;
   const buildFilters = (params) => {
     const filters = {
@@ -389,17 +370,15 @@ function storageDataProvider(client) {
       const taruviMeta = meta;
       const bucket = getBucketName(resource, taruviMeta);
       const storageFilters = buildFilters({ filters, sorters, pagination});
-      const response = await new Storage(client, {}).from(bucket).filter(storageFilters).execute();
+      const response = await new Storage(client).from(bucket).filter(storageFilters).execute();
       return { data: response.data, total: response.total };
     },
     getOne: async (params) => {
       const { resource, id: path, meta } = params;
       const taruviMeta = meta;
       const bucket = getBucketName(resource, taruviMeta);
-      const encodedPath = encodeURIComponent(String(path));
-      const url = `${baseApiUrl}/storage/buckets/${bucket}/objects/${encodedPath}`;
-      const data = url;
-      return { data };
+      const response = await new Storage(client).from(bucket).download(String(path)).execute();
+      return { data: response.data };
     },
     create: async (params) => {
       const { resource, variables, meta } = params;
@@ -408,25 +387,25 @@ function storageDataProvider(client) {
       const { files, paths = [], metadatas = [] } = variables;
       const filePaths = files.map((file, i) => paths[i] || file.name);
       const fileMetadatas = files.map((_, i) => metadatas[i] || {});
-      const data = await new Storage(client, {}).from(bucket).upload({ files, paths: filePaths, metadatas: fileMetadatas }).execute();
-      return { data };
+      const response = await new Storage(client).from(bucket).upload({ files, paths: filePaths, metadatas: fileMetadatas }).execute();
+      const firstUploaded = response.data?.successful?.[0]?.object;
+      return { data: firstUploaded ?? response.data };
     },
     update: async (params) => {
       const { resource, id: path, variables, meta } = params;
       const taruviMeta = meta;
       const bucket = getBucketName(resource, taruviMeta);
-      const data = await new Storage(client, {}).from(bucket).update(String(path), variables).execute();
-      return { data };
+      const response = await new Storage(client).from(bucket).update(String(path), variables).execute();
+      return { data: response.data };
     },
     deleteOne: async (params) => {
       const { resource, id: path, meta } = params;
       const taruviMeta = meta;
       const bucket = getBucketName(resource, taruviMeta);
-      const data = await new Storage(client, {}).from(bucket).delete([String(path)]).execute();
-      return { data };
+      await new Storage(client).from(bucket).delete([String(path)]).execute();
+      return { data: { id: path } };
     },
     getApiUrl: () => baseApiUrl,
-    // Not applicable for storage - return empty array
     getMany: async () => ({ data: [] }),
     createMany: async (params) => {
       const { resource, variables, meta } = params;
@@ -435,15 +414,16 @@ function storageDataProvider(client) {
       const { files, paths = [], metadatas = [] } = variables;
       const filePaths = files.map((file, i) => paths[i] || file.name);
       const fileMetadatas = files.map((_, i) => metadatas[i] || {});
-      const data = await new Storage(client, {}).from(bucket).upload({ files, paths: filePaths, metadatas: fileMetadatas }).execute();
-      return { data };
+      const response = await new Storage(client).from(bucket).upload({ files, paths: filePaths, metadatas: fileMetadatas }).execute();
+      const uploaded = response.data?.successful?.map((s) => s.object) ?? [];
+      return { data: uploaded.length > 0 ? uploaded[0] : response.data };
     },
     deleteMany: async (params) => {
       const { resource, ids, meta } = params;
       const taruviMeta = meta;
       const bucket = getBucketName(resource, taruviMeta);
-      const data = await new Storage(client, {}).from(bucket).delete(ids.map(String)).execute();
-      return { data: [data] };
+      await new Storage(client).from(bucket).delete(ids.map(String)).execute();
+      return { data: ids.map((id) => ({ id })) };
     },
     custom: async (params) => {
       const { url, method, payload, query } = params;
@@ -464,6 +444,9 @@ function storageDataProvider(client) {
         case "put":
           data = await client.httpClient.put(fullUrl, payload);
           break;
+        case "patch":
+          data = await client.httpClient.patch(fullUrl, payload);
+          break;
         case "delete":
           data = await client.httpClient.delete(fullUrl);
           break;
@@ -478,12 +461,12 @@ function storageDataProvider(client) {
 }
 function appDataProvider(client) {
   const config = client.getConfig();
-  const baseApiUrl = `${config.baseUrl}/api/apps/${config.appSlug}`;
+  const baseApiUrl = `${config.apiUrl}/api/apps/${config.appSlug}`;
   const functions = new Functions(client);
   const analytics = new Analytics(client);
   return {
     getList: async (params) => {
-      const { resource } = params;
+      const { resource, meta } = params;
       if (resource === "roles") {
         const app = new App(client);
         const response = await app.roles().execute();
@@ -492,18 +475,40 @@ function appDataProvider(client) {
           total: response.total ?? (Array.isArray(response) ? response.length : response.data?.length ?? 0)
         };
       }
-      throw new Error(`Unknown app resource: ${resource}. Supported resources: roles`);
+      if (resource === "secrets") {
+        const keys = meta?.keys;
+        if (!keys || keys.length === 0) {
+          throw new Error("secrets resource requires meta.keys array");
+        }
+        const secrets = new Secrets(client);
+        const response = await secrets.list(keys, {
+          app: meta?.app,
+          includeMetadata: meta?.includeMetadata
+        });
+        const raw = response.data || response;
+        const data = Array.isArray(raw) ? raw : Object.entries(raw).map(([key, value]) => ({ key, value }));
+        return { data, total: data.length };
+      }
+      throw new Error(`Unknown app resource: ${resource}. Supported resources: roles, secrets`);
     },
     getOne: async (params) => {
-      const { resource } = params;
+      const { resource, id, meta } = params;
       if (resource === "settings") {
         const app = new App(client);
         const response = await app.settings().execute();
         return {
-          data: response
+          data: response.data
         };
       }
-      throw new Error(`Unknown app resource for getOne: ${resource}. Supported resources: settings`);
+      if (resource === "secrets") {
+        const secrets = new Secrets(client);
+        const response = await secrets.get(String(id), {
+          app: meta?.app,
+          tags: meta?.tags
+        }).execute();
+        return { data: response.data ?? response };
+      }
+      throw new Error(`Unknown app resource for getOne: ${resource}. Supported resources: settings, secrets`);
     },
     custom: async (params) => {
       const { url: slug, payload, meta } = params;
@@ -592,7 +597,7 @@ function buildUserListFilters(filters, sorters, pagination) {
 }
 function userDataProvider(client) {
   const config = client.getConfig();
-  const baseApiUrl = `${config.baseUrl}/api/apps/${config.appSlug}`;
+  const baseApiUrl = `${config.apiUrl}/api/apps/${config.appSlug}`;
   return {
     getList: async (params) => {
       const { resource, pagination, filters, sorters, meta } = params;
@@ -612,20 +617,41 @@ function userDataProvider(client) {
         }
         const user = new User(client);
         const response = await user.getUser(username);
-        const roles = response.roles || [];
+        const roles = response.data?.roles || response.roles || [];
         return {
           data: roles,
           total: roles.length
         };
       }
-      throw new Error(`Unknown user resource for getList: ${resource}. Supported: users, roles`);
+      if (resource === "apps") {
+        const username = meta?.username;
+        if (!username) {
+          throw new Error("apps resource requires meta.username");
+        }
+        const user = new User(client);
+        const response = await user.getUserApps(username);
+        const apps = response.data || response;
+        return {
+          data: apps,
+          total: Array.isArray(apps) ? apps.length : 0
+        };
+      }
+      throw new Error(`Unknown user resource for getList: ${resource}. Supported: users, roles, apps`);
     },
     getOne: async (params) => {
       const { resource, id } = params;
       if (resource === "users") {
         const user = new User(client);
+        if (String(id) === "me") {
+          const auth = new Auth(client);
+          const response2 = await auth.getCurrentUser();
+          const data = response2 ? response2.data ?? response2 : null;
+          return { data };
+        }
         const response = await user.getUser(String(id));
-        return { data: response };
+        return {
+          data: response.data
+        };
       }
       throw new Error(`Unknown user resource for getOne: ${resource}. Supported: users`);
     },
@@ -637,7 +663,7 @@ function userDataProvider(client) {
         const userData = variables;
         const response = await user.createUser(userData);
         return {
-          data: response
+          data: response.data
         };
       }
       throw new Error(`Unknown user resource for create: ${resource}. Supported resources: users`);
@@ -650,7 +676,7 @@ function userDataProvider(client) {
         const updateData = variables;
         const response = await user.updateUser(username, updateData);
         return {
-          data: response
+          data: response.data
         };
       }
       throw new Error(`Unknown user resource for update: ${resource}. Supported resources: users`);
@@ -687,7 +713,7 @@ function userDataProvider(client) {
 }
 function functionsDataProvider(client) {
   const config = client.getConfig();
-  const baseApiUrl = `${config.baseUrl}/api/apps/${config.appSlug}`;
+  const baseApiUrl = `${config.apiUrl}/api/apps/${config.appSlug}`;
   const functions = new Functions(client);
   return {
     /**
@@ -761,7 +787,7 @@ function functionsDataProvider(client) {
 }
 function analyticsDataProvider(client) {
   const config = client.getConfig();
-  const baseApiUrl = `${config.baseUrl}/api/apps/${config.appSlug}`;
+  const baseApiUrl = `${config.apiUrl}/api/apps/${config.appSlug}`;
   const analytics = new Analytics(client);
   return {
     /**
@@ -856,7 +882,7 @@ function authProvider(client) {
     },
     logout: async (params = {}) => {
       const { callbackUrl } = params;
-      auth.logout(callbackUrl);
+      await auth.logout(callbackUrl);
       return {
         success: true,
         redirectTo: callbackUrl || "/login"
@@ -926,14 +952,18 @@ function authProvider(client) {
       };
     },
     getIdentity: async () => {
-      const user = await auth.getCurrentUser();
-      if (!user) {
+      const response = await auth.getCurrentUser();
+      if (!response) {
         return null;
       }
-      return user;
+      return response.data ?? response;
     },
     getPermissions: async () => {
-      const user = await auth.getCurrentUser();
+      const response = await auth.getCurrentUser();
+      if (!response) {
+        return null;
+      }
+      const user = response.data ?? response;
       if (!user) {
         return null;
       }
@@ -951,9 +981,10 @@ function accessControlProvider(client, options) {
   const policy = new Policy(client);
   const auth = new Auth(client);
   const { batchDelayMs = 50 } = options ?? {};
-  const permissionLoader = new DataLoader2(
+  const permissionLoader = new DataLoader(
     async (checks) => {
-      const user = await auth.getCurrentUser();
+      const response = await auth.getCurrentUser();
+      const user = response ? response.data ?? response : null;
       if (!user) {
         return checks.map(() => ({
           can: false,
@@ -1020,7 +1051,7 @@ function accessControlProvider(client, options) {
       if (!resource) {
         return { can: false, reason: "Resource not specified" };
       }
-      const entityType = params?.resource?.meta?.entityType;
+      const entityType = params?.entityType ?? params?.resource?.meta?.entityType;
       return permissionLoader.load({
         resource,
         action,