@svadmin/simple-rest 0.9.3 → 0.9.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svadmin/simple-rest",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "Simple REST adapters — fetch-based DataProvider and JWT/Cookie AuthProvider",
   "type": "module",
   "sideEffects": false,
@@ -16,7 +16,9 @@
     }
   },
   "peerDependencies": {
-    "@svadmin/core": "^0.19.4"
+    "@svadmin/core": "^0.23.3",
+    "@refinedev/simple-rest": "^5.0.0",
+    "@svadmin/refine-adapter": "^0.9.3"
   },
   "license": "MIT",
   "author": "zuohuadong",
@@ -28,5 +30,16 @@
   "homepage": "https://github.com/zuohuadong/svadmin#readme",
   "bugs": {
     "url": "https://github.com/zuohuadong/svadmin/issues"
+  },
+  "peerDependenciesMeta": {
+    "@svadmin/core": {
+      "optional": true
+    },
+    "@refinedev/simple-rest": {
+      "optional": true
+    },
+    "@svadmin/refine-adapter": {
+      "optional": true
+    }
   }
 }

package/src/auth-provider.ts

@@ -14,7 +14,7 @@ export function createSimpleRestAuthProvider(opts: SimpleRestAuthOptions): AuthP
   const { tokenKey = 'auth_token' } = opts;
 
   function getAuthHeader(): Record<string, string> {
-    if (!tokenKey) return {};
+    if (!tokenKey || typeof window === 'undefined') return {};
     const token = localStorage.getItem(tokenKey);
     return token ? { Authorization: `Bearer ${token}` } : {};
   }
@@ -33,7 +33,7 @@ export function createSimpleRestAuthProvider(opts: SimpleRestAuthOptions): AuthP
           return { success: false, error: { message: error.message ?? 'Login failed' } };
         }
         const data = await response.json();
-        if (tokenKey && data.token) {
+        if (tokenKey && data.token && typeof window !== 'undefined') {
           localStorage.setItem(tokenKey, data.token);
         }
         return { success: true, redirectTo: '/' };
@@ -50,12 +50,12 @@ export function createSimpleRestAuthProvider(opts: SimpleRestAuthOptions): AuthP
           credentials: 'include',
         }).catch((e) => console.warn('[auth] logout request failed:', e));
       }
-      if (tokenKey) localStorage.removeItem(tokenKey);
+      if (tokenKey && typeof window !== 'undefined') localStorage.removeItem(tokenKey);
       return { success: true, redirectTo: '/login' };
     },
 
     async check(): Promise<CheckResult> {
-      if (tokenKey) {
+      if (tokenKey && typeof window !== 'undefined') {
         const token = localStorage.getItem(tokenKey);
         if (!token) return { authenticated: false, redirectTo: '/login', logout: true };
       }
@@ -71,6 +71,11 @@ export function createSimpleRestAuthProvider(opts: SimpleRestAuthOptions): AuthP
         return { authenticated: false, redirectTo: '/login', logout: true };
       }
 
+      if (!tokenKey) {
+        console.warn('[svadmin] Cookie-based auth without identityUrl: cannot verify session. Provide identityUrl for secure auth checking.');
+        return { authenticated: false, redirectTo: '/login', logout: true };
+      }
+
       return { authenticated: true };
     },
 

package/src/data-provider.ts

@@ -1,137 +1,21 @@
-// Simple REST DataProvider — fetch-based, zero dependencies
-// Compatible with json-server, RESTful APIs, and any JSON backend
-
-import type {
-  DataProvider, GetListParams, GetListResult, GetOneParams, GetOneResult,
-  CreateParams, CreateResult, UpdateParams, UpdateResult, DeleteParams, DeleteResult,
-  GetManyParams, GetManyResult, CreateManyParams, CreateManyResult,
-  UpdateManyParams, UpdateManyResult, DeleteManyParams, DeleteManyResult,
-  CustomParams, CustomResult, BaseRecord
-} from '@svadmin/core';
-
-export interface SimpleRestOptions {
-  apiUrl: string;
-  headers?: Record<string, string> | (() => Record<string, string>);
-}
-
-function getHeaders(opts: SimpleRestOptions): Record<string, string> {
-  const base = { 'Content-Type': 'application/json' };
-  const extra = typeof opts.headers === 'function' ? opts.headers() : (opts.headers ?? {});
-  return { ...base, ...extra };
+import type { DataProvider } from '@svadmin/core';
+import { createRefineAdapter } from '@svadmin/refine-adapter';
+
+
+/**
+ * Creates a simple-rest data provider using the official @refinedev/simple-rest package.
+ * Requires `@refinedev/simple-rest` to be installed.
+ * 
+ * @param args Arguments required by @refinedev/simple-rest
+ * @returns A fully compatible svadmin DataProvider
+ */
+export async function createSimpleRestDataProvider(...args: any[]): Promise<DataProvider> {
+  // @ts-ignore
+  const pkg = await import('@refinedev/simple-rest');
+  const init = (pkg as any).default || (pkg as any).dataProvider || (pkg as any).DataProvider;
+  if (typeof init !== 'function') throw new Error('[svadmin] Failed to resolve @refinedev/simple-rest data provider. Ensure the package is installed correctly.');
+  const refineProvider = init(...args);
+  return createRefineAdapter(refineProvider);
 }
 
-export function createSimpleRestDataProvider(opts: SimpleRestOptions): DataProvider {
-  const { apiUrl } = opts;
-
-  async function request<T>(url: string, init?: RequestInit): Promise<T> {
-    const response = await fetch(url, { ...init, headers: { ...getHeaders(opts), ...init?.headers } });
-    if (!response.ok) throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-    return response.json();
-  }
-
-  return {
-    getApiUrl: () => apiUrl,
-
-    async getList<T extends BaseRecord = BaseRecord>({ resource, pagination, sorters, filters }: GetListParams): Promise<GetListResult<T>> {
-      const params = new URLSearchParams();
-      const { current = 1, pageSize = 10 } = pagination ?? {};
-      params.set('_page', String(current));
-      params.set('_limit', String(pageSize));
-
-      if (sorters?.length) {
-        params.set('_sort', sorters.map(s => s.field).join(','));
-        params.set('_order', sorters.map(s => s.order).join(','));
-      }
-
-      if (filters?.length) {
-        for (const f of filters) {
-          if (f.operator === 'eq') params.set(f.field, String(f.value));
-          else if (f.operator === 'contains') params.set(`${f.field}_like`, String(f.value));
-          else params.set(`${f.field}_${f.operator}`, String(f.value));
-        }
-      }
-
-      const url = `${apiUrl}/${resource}?${params.toString()}`;
-      const response = await fetch(url, { headers: getHeaders(opts) });
-      if (!response.ok) throw new Error(`HTTP ${response.status}`);
-
-      const data = await response.json() as unknown as unknown as T[];
-      const total = parseInt(response.headers.get('X-Total-Count') ?? String(data.length), 10);
-      return { data, total };
-    },
-
-    async getOne<T extends BaseRecord = BaseRecord>({ resource, id }: GetOneParams): Promise<GetOneResult<T>> {
-      const data = await request<unknown>(`${apiUrl}/${resource}/${id}`);
-      return { data: data as unknown as unknown as T };
-    },
-
-    async create<T extends BaseRecord = BaseRecord>({ resource, variables }: CreateParams): Promise<CreateResult<T>> {
-      const data = await request<unknown>(`${apiUrl}/${resource}`, {
-        method: 'POST',
-        body: JSON.stringify(variables),
-      });
-      return { data: data as unknown as unknown as T };
-    },
-
-    async update<T extends BaseRecord = BaseRecord>({ resource, id, variables }: UpdateParams): Promise<UpdateResult<T>> {
-      const data = await request<unknown>(`${apiUrl}/${resource}/${id}`, {
-        method: 'PATCH',
-        body: JSON.stringify(variables),
-      });
-      return { data: data as unknown as unknown as T };
-    },
-
-    async deleteOne<T extends BaseRecord = BaseRecord>({ resource, id }: DeleteParams): Promise<DeleteResult<T>> {
-      const data = await request<unknown>(`${apiUrl}/${resource}/${id}`, { method: 'DELETE' });
-      return { data: data as unknown as unknown as T };
-    },
-
-    async getMany<T extends BaseRecord = BaseRecord>({ resource, ids }: GetManyParams): Promise<GetManyResult<T>> {
-      const params = ids.map(id => `id=${id}`).join('&');
-      const data = await request<unknown[]>(`${apiUrl}/${resource}?${params}`);
-      return { data: data as unknown as unknown as T[] };
-    },
-
-    async createMany<T extends BaseRecord = BaseRecord>({ resource, variables }: CreateManyParams): Promise<CreateManyResult<T>> {
-      const results: T[] = [];
-      for (const vars of variables) {
-        const data = await request<unknown>(`${apiUrl}/${resource}`, {
-          method: 'POST',
-          body: JSON.stringify(vars),
-        });
-        results.push(data as unknown as T);
-      }
-      return { data: results };
-    },
-
-    async updateMany<T extends BaseRecord = BaseRecord>({ resource, ids, variables }: UpdateManyParams): Promise<UpdateManyResult<T>> {
-      const results: T[] = [];
-      for (const id of ids) {
-        const data = await request<unknown>(`${apiUrl}/${resource}/${id}`, {
-          method: 'PATCH',
-          body: JSON.stringify(variables),
-        });
-        results.push(data as unknown as T);
-      }
-      return { data: results };
-    },
-
-    async deleteMany<T extends BaseRecord = BaseRecord>({ resource, ids }: DeleteManyParams): Promise<DeleteManyResult<T>> {
-      const results: T[] = [];
-      for (const id of ids) {
-        const data = await request<unknown>(`${apiUrl}/${resource}/${id}`, { method: 'DELETE' });
-        results.push(data as unknown as T);
-      }
-      return { data: results };
-    },
-
-    async custom<T = unknown>({ url, method, payload, headers }: CustomParams): Promise<CustomResult<T>> {
-      const data = await request<unknown>(url, {
-        method: method.toUpperCase(),
-        headers,
-        body: payload ? JSON.stringify(payload) : undefined,
-      });
-      return { data: data as unknown as unknown as T };
-    },
-  };
-}
+export type SimpleRestOptions = any;