@svadmin/supabase 0.11.5 → 0.11.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svadmin/supabase",
-  "version": "0.11.5",
+  "version": "0.11.8",
   "description": "Supabase adapters — DataProvider, AuthProvider, LiveProvider, AuditHandler",
   "type": "module",
   "sideEffects": false,
@@ -24,10 +24,10 @@
     }
   },
   "peerDependencies": {
-    "@svadmin/core": "^0.32.2",
-    "@supabase/supabase-js": "^2.0.0",
-    "@refinedev/supabase": "^5.0.0",
-    "@supacloud/js": "^0.12.0"
+    "@svadmin/core": "^0.34.2",
+    "@supabase/supabase-js": "^2.112.2",
+    "@refinedev/supabase": "^6.0.2",
+    "@supacloud/js": "^0.21.1"
   },
   "license": "MIT",
   "author": "zuohuadong",
@@ -55,9 +55,9 @@
     }
   },
   "dependencies": {
-    "@svadmin/refine-adapter": "^0.10.0"
+    "@svadmin/refine-adapter": "^0.10.1"
   },
   "devDependencies": {
-    "@supabase/supabase-js": "^2.110.7"
+    "@supabase/supabase-js": "^2.112.2"
   }
 }

package/src/auth-provider.ts

@@ -1,8 +1,21 @@
 // Supabase AuthProvider
-import type { SupabaseClient } from '@supabase/supabase-js';
+import type { SupabaseClient, User } from '@supabase/supabase-js';
 import type { AuthProvider, Identity, AuthActionResult, CheckResult } from '@svadmin/core';
 import { audit } from '@svadmin/core';
 
+export interface SupabasePermissionResolverContext {
+  client: SupabaseClient;
+  user: User;
+}
+
+export type SupabasePermissionResolver = (
+  context: SupabasePermissionResolverContext,
+) => Promise<unknown> | unknown;
+
+export interface SupabaseAuthProviderOptions {
+  getPermissions?: SupabasePermissionResolver;
+}
+
 const INVALID_REFRESH_TOKEN_MESSAGES = [
   'refresh token is not valid',
   'invalid refresh token',
@@ -23,7 +36,20 @@ async function clearInvalidSession(client: SupabaseClient): Promise<void> {
   await client.auth.signOut({ scope: 'local' });
 }
 
-export function createSupabaseAuthProvider(client: SupabaseClient): AuthProvider {
+async function currentPermissionUser(client: SupabaseClient): Promise<User | null> {
+  const { data: { user }, error } = await client.auth.getUser();
+  if (error && isInvalidRefreshTokenError(error)) {
+    await clearInvalidSession(client);
+    return null;
+  }
+  if (error) throw error;
+  return user ?? null;
+}
+
+export function createSupabaseAuthProvider(
+  client: SupabaseClient,
+  options: SupabaseAuthProviderOptions = {},
+): AuthProvider {
   return {
     async login({ email, password }: Record<string, unknown>): Promise<AuthActionResult> {
       const { data, error } = await client.auth.signInWithPassword({
@@ -90,12 +116,10 @@ export function createSupabaseAuthProvider(client: SupabaseClient): AuthProvider
     },
 
     async getPermissions(): Promise<unknown> {
-      const { data: { user }, error } = await client.auth.getUser();
-      if (error && isInvalidRefreshTokenError(error)) {
-        await clearInvalidSession(client);
-        return null;
-      }
-      return user?.user_metadata?.role ?? 'user';
+      if (!options.getPermissions) return null;
+      const user = await currentPermissionUser(client);
+      if (!user) return null;
+      return options.getPermissions({ client, user });
     },
 
     async register({ email, password, ...rest }: Record<string, unknown>): Promise<AuthActionResult> {

package/src/index.ts

@@ -2,6 +2,11 @@
 
 export { createSupabaseDataProvider } from './data-provider';
 export { createSupabaseAuthProvider } from './auth-provider';
+export type {
+  SupabaseAuthProviderOptions,
+  SupabasePermissionResolver,
+  SupabasePermissionResolverContext,
+} from './auth-provider';
 export { createSupabaseLiveProvider } from './live-provider';
 export { createSupabaseAuditHandler } from './audit-handler';
 export {