@goplusvn/core 0.1.27 → 0.1.28

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.1.28 — Auth Bridge: core hết khóa cứng NextAuth (nền cho Better Auth)
+
+`@goerp/core/ui` xuất `AuthBridgeProvider` + `useAuthBridge`/`useAuthSession`/
+`useSafeAuthSession` + `nextAuthBridgeClient` (mặc định). 4 component client
+từng import thẳng next-auth/react (SignInForm, UserDropdown,
+useRoleOperations, PermissionsVersionWatcher) nay đi qua bridge — KHÔNG mount
+provider thì fallback NextAuth y như cũ (zero behavior change). App migrate
+Better Auth chỉ cần mount provider với client map từ createAuthClient
+(useSession/signIn.email/signOut). Server-side proxy-gate vốn đã DI qua
+`options.getToken`. LƯU Ý: bridge client phải là hằng số suốt vòng đời app
+(rules of hooks).
+
 ## 0.1.27 — Live permissions + MultiSelect hết tràn badge
 
 Cơ chế "phiên bản bộ quyền" (đúc từ vinhhoa): admin sửa vai trò/phân quyền →

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@goplusvn/core",
   "description": "GoPlusVN Platform Kit - ERP kernel: layout, RBAC, CRUD, multi-tenant, system pages",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

package/src/rbac/hooks/use-role-operations.ts

@@ -1,6 +1,6 @@
 import { useCallback, useState } from "react";
 import { useRouter } from "next/navigation";
-import { useSession } from "next-auth/react";
+import { useSafeAuthSession } from "../../ui/auth/auth-bridge";
 import { toast } from "sonner";
 
 import { useTabContentCache } from "../../ui/layout/tab-content-cache";
@@ -9,18 +9,11 @@ import type { Role } from "../types";
 
 // Safe wrapper to prevent crashing when useSession is called outside of SessionProvider
 // This often happens during Error Boundary or Hydration failures.
-function useSafeSession() {
-  try {
-    return useSession();
-  } catch (error) {
-    console.warn("[useSafeSession] Context error caught. Fallback to unauthenticated state.");
-    return { data: null, status: "unauthenticated" as const, update: async () => null };
-  }
-}
+
 
 export function useRoleOperations(mutate: () => void) {
   const router = useRouter();
-  const { update } = useSafeSession();
+  const { update } = useSafeAuthSession();
   const { clearAllCache } = useTabContentCache();
   const { clearTabs } = useTabNavigation();
 

package/src/ui/auth/auth-bridge.tsx

@@ -0,0 +1,104 @@
+"use client";
+
+// AUTH BRIDGE — lớp trừu tượng client-auth để core KHÔNG khóa cứng vào
+// NextAuth. Mặc định (không mount provider) = NextAuth y như cũ → mọi app
+// hiện tại không đổi hành vi. App migrate sang Better Auth chỉ cần mount:
+//
+//   <AuthBridgeProvider client={betterAuthBridgeClient}>
+//
+// với client map từ createAuthClient() của Better Auth (useSession /
+// signIn.email / signOut). LƯU Ý: client phải là hằng số suốt vòng đời app
+// (rules of hooks — useSession của bridge được gọi như một hook).
+
+import { createContext, useContext } from "react";
+import type { ReactNode } from "react";
+import {
+  signIn as nextAuthSignIn,
+  signOut as nextAuthSignOut,
+  useSession as nextAuthUseSession,
+} from "next-auth/react";
+
+export interface AuthSessionState {
+  /** Session object (shape do app quyết — core chỉ đọc user.id/permissions...) */
+  data: any;
+  status: "authenticated" | "unauthenticated" | "loading";
+  /** Ép làm mới session (NextAuth: jwt trigger="update"; Better Auth: refetch) */
+  update: () => Promise<unknown>;
+}
+
+export interface AuthBridgeClient {
+  /** Hook — phải gọi đúng luật hooks; bridge client không đổi lúc runtime. */
+  useSession: () => AuthSessionState;
+  /** Đăng nhập credentials. Trả { error } thay vì throw để form xử lý. */
+  signInWithCredentials: (credentials: {
+    email: string;
+    password: string;
+  }) => Promise<{ error?: string | null }>;
+  signOut: (options?: { callbackUrl?: string }) => Promise<void>;
+}
+
+/** Mặc định: NextAuth (v4) — các app chưa migrate dùng nguyên như cũ. */
+export const nextAuthBridgeClient: AuthBridgeClient = {
+  useSession: () => {
+    // eslint-disable-next-line react-hooks/rules-of-hooks -- được gọi trong hook useAuthSession
+    const s = nextAuthUseSession();
+    return {
+      data: s.data,
+      status: s.status,
+      update: () => s.update(),
+    };
+  },
+  signInWithCredentials: async ({ email, password }) => {
+    const result = await nextAuthSignIn("credentials", {
+      redirect: false,
+      email,
+      password,
+    });
+    return { error: result?.error ?? null };
+  },
+  signOut: async (options) => {
+    await nextAuthSignOut(options);
+  },
+};
+
+const AuthBridgeContext = createContext<AuthBridgeClient>(nextAuthBridgeClient);
+
+export function AuthBridgeProvider({
+  client,
+  children,
+}: {
+  client: AuthBridgeClient;
+  children: ReactNode;
+}) {
+  return (
+    <AuthBridgeContext.Provider value={client}>
+      {children}
+    </AuthBridgeContext.Provider>
+  );
+}
+
+export function useAuthBridge(): AuthBridgeClient {
+  return useContext(AuthBridgeContext);
+}
+
+/** Hook session qua bridge — thay cho useSession() của next-auth trong core. */
+export function useAuthSession(): AuthSessionState {
+  return useAuthBridge().useSession();
+}
+
+/**
+ * Bản "an toàn" — không crash khi thiếu SessionProvider (error boundary /
+ * hydration fail). Fallback unauthenticated.
+ */
+export function useSafeAuthSession(): AuthSessionState {
+  const bridge = useAuthBridge();
+  try {
+    return bridge.useSession();
+  } catch {
+    return {
+      data: null,
+      status: "unauthenticated",
+      update: async () => null,
+    };
+  }
+}

package/src/ui/auth/index.tsx

@@ -5,3 +5,4 @@ export * from "./oauth-links";
 export * from "./forgot-password-form";
 export * from "./new-password-form";
 export * from "./verify-email-form";
+export * from "./auth-bridge";

package/src/ui/auth/sign-in-form.tsx

@@ -5,7 +5,7 @@ import * as React from "react";
 import Link from "next/link";
 import { useParams, useRouter, useSearchParams } from "next/navigation";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { signIn } from "next-auth/react";
+import { useAuthBridge } from "./auth-bridge";
 import { useForm } from "react-hook-form";
 import { Eye, EyeOff } from "lucide-react";
 import type { z } from "zod"; // Add this import
@@ -37,6 +37,7 @@ import { OAuthLinks } from "./oauth-links";
 type SignInFormType = z.infer<typeof SignInSchema>;
 
 export function SignInForm() {
+  const { signInWithCredentials } = useAuthBridge();
   const params = useParams();
   const searchParams = useSearchParams();
   const router = useRouter();
@@ -67,11 +68,7 @@ export function SignInForm() {
     const { email, password } = data;
 
     try {
-      const result = await signIn("credentials", {
-        redirect: false,
-        email,
-        password,
-      });
+      const result = await signInWithCredentials({ email, password });
 
       if (result && result.error) {
         throw new Error(result.error);

package/src/ui/layout/user-dropdown.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import Link from "next/link";
-import { signOut, useSession } from "next-auth/react";
+import { useAuthBridge, useSafeAuthSession } from "../auth/auth-bridge";
 import { LogOut, User, UserCog } from "lucide-react";
 
 import type { DictionaryType } from "../../hooks";
@@ -15,15 +15,6 @@ import { Button } from "../primitives/button";
 import { useTabContentCache } from "./tab-content-cache";
 import { useTabNavigation } from "./tab-navigation-provider";
 
-// Safe wrapper to prevent crashing when useSession is called outside of SessionProvider
-// This often happens during Error Boundary or Hydration failures.
-function useSafeSession() {
-  try {
-    return useSession();
-  } catch (error) {
-    return { data: null, status: "unauthenticated" as const };
-  }
-}
 
 import {
   DropdownMenu,
@@ -62,7 +53,8 @@ export function UserDropdown({
   user: userProp,
   onSignOut,
 }: UserDropdownProps) {
-  const { data: session } = useSafeSession();
+  const { data: session } = useSafeAuthSession();
+  const { signOut } = useAuthBridge();
   const { clearAllCache } = useTabContentCache();
   const { clearTabs } = useTabNavigation();
 

package/src/ui/shared/permissions-version-watcher.tsx

@@ -16,9 +16,9 @@
 
 import { useCallback, useEffect, useRef } from "react";
 import { useRouter } from "next/navigation";
-import { useSession } from "next-auth/react";
 import { toast } from "sonner";
 
+import { useAuthSession } from "../auth/auth-bridge";
 import { useTabContentCache } from "../layout/tab-content-cache";
 
 export interface PermissionsVersionWatcherProps {
@@ -35,7 +35,7 @@ export function PermissionsVersionWatcher({
   pollMs = 60_000,
   silent = false,
 }: PermissionsVersionWatcherProps = {}) {
-  const { status, update } = useSession();
+  const { status, update } = useAuthSession();
   const router = useRouter();
   const { clearAllCache } = useTabContentCache();
   const lastSeenRef = useRef<string | null>(null);