@payez/next-mvp 3.9.1 → 4.0.1

package/src/api-handlers/account/change-password.ts

@@ -1,8 +1,6 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { getToken } from 'next-auth/jwt';
-import { resolveNextAuthSecret } from '../../lib/nextauth-secret';
+import { getSession as getBetterAuthSession } from '../../server/auth';
 import { getSession } from '../../lib/session-store';
-import { getJwtCookieName } from '../../lib/app-slug';
 
 interface ChangePasswordRequest {
   current_password: string;
@@ -17,11 +15,10 @@ import { nanoid } from 'nanoid';
 export async function POST(req: NextRequest) {
   const requestId = nanoid();
   try {
-    // Get session token from NextAuth JWT
-    // Support both field names: sessionToken (auth.ts JWT) and redisSessionId (legacy)
-    const token = await getToken({ req, secret: process.env.NEXTAUTH_SECRET, cookieName: getJwtCookieName() });
-    const sessionToken = (token?.sessionToken || token?.redisSessionId) as string | undefined;
-    if (!token || typeof sessionToken !== 'string') {
+    // Get session from Better Auth
+    const betterAuthSession = await getBetterAuthSession(req);
+    const sessionToken = betterAuthSession?.session?.token as string | undefined;
+    if (!betterAuthSession || typeof sessionToken !== 'string') {
       return NextResponse.json({ success: false, message: 'Unauthorized' }, { status: 401 });
     }
     const sessionData = await getSession(sessionToken);

package/src/api-handlers/admin/analytics.ts

@@ -9,7 +9,7 @@
  */
 
 import { NextRequest, NextResponse } from 'next/server';
-import { getServerSession } from 'next-auth';
+import { getSession } from '../../server/auth';
 import { getStartupIDPConfig } from '../../lib/startup-init';
 import { ADMIN_ROLES, hasAnyRole } from '../../lib/roles';
 
@@ -18,9 +18,8 @@ interface VibeRequestOptions {
   body?: unknown;
 }
 
-async function checkAdminRole(getAuthOptions: () => Promise<any>): Promise<{ isAdmin: boolean; error?: NextResponse }> {
-  const authOptions = await getAuthOptions();
-  const session = await getServerSession(authOptions) as any;
+async function checkAdminRole(request: NextRequest): Promise<{ isAdmin: boolean; error?: NextResponse }> {
+  const session = await getSession(request) as any;
 
   if (!session?.user) {
     return {
@@ -110,7 +109,6 @@ function getCountryFlag(countryCode: string): string {
 }
 
 export interface AdminAnalyticsHandlerConfig {
-  getAuthOptions: () => Promise<any>;
 }
 
 /**
@@ -120,7 +118,7 @@ export interface AdminAnalyticsHandlerConfig {
 export function createAnalyticsHandler(config: AdminAnalyticsHandlerConfig) {
   return {
     async POST(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       const body = await request.json();

package/src/api-handlers/admin/audit.ts

@@ -8,7 +8,7 @@
  */
 
 import { NextRequest, NextResponse } from 'next/server';
-import { getServerSession } from 'next-auth';
+import { getSession } from '../../server/auth';
 import { getStartupIDPConfig } from '../../lib/startup-init';
 import { ADMIN_ROLES, hasAnyRole } from '../../lib/roles';
 
@@ -17,9 +17,8 @@ interface VibeRequestOptions {
   body?: unknown;
 }
 
-async function checkAdminRole(getAuthOptions: () => Promise<any>): Promise<{ isAdmin: boolean; error?: NextResponse }> {
-  const authOptions = await getAuthOptions();
-  const session = await getServerSession(authOptions) as any;
+async function checkAdminRole(request: NextRequest): Promise<{ isAdmin: boolean; error?: NextResponse }> {
+  const session = await getSession(request) as any;
 
   if (!session?.user) {
     return {
@@ -100,7 +99,6 @@ async function vibeServiceRequest<T = unknown>(
 }
 
 export interface AdminAuditHandlerConfig {
-  getAuthOptions: () => Promise<any>;
 }
 
 /**
@@ -110,7 +108,7 @@ export interface AdminAuditHandlerConfig {
 export function createAuditHandler(config: AdminAuditHandlerConfig) {
   return {
     async GET(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       const { searchParams } = new URL(request.url);
@@ -178,7 +176,7 @@ export function createAuditHandler(config: AdminAuditHandlerConfig) {
     },
 
     async POST(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       const body = await request.json();

package/src/api-handlers/admin/index.ts

@@ -8,9 +8,8 @@
  * ------
  * // In your app's API route (e.g., app/api/admin/vibe/data/[collection]/[table]/route.ts)
  * import { createGetTableDataHandler } from '@payez/next-mvp/api-handlers/admin';
- * import { getAuthOptions } from '@payez/next-mvp/auth/auth-options';
  *
- * export const GET = createGetTableDataHandler({ getAuthOptions });
+ * export const GET = createGetTableDataHandler({ ... });
  */
 
 export {

package/src/api-handlers/admin/redis-sessions.ts

@@ -12,21 +12,19 @@
  */
 
 import { NextRequest, NextResponse } from 'next/server';
-import { getServerSession } from 'next-auth';
+import { getSession } from '../../server/auth';
 import { getRedis } from '../../lib/redis';
 import { ADMIN_ROLES, hasAnyRole } from '../../lib/roles';
 
 export interface RedisSessionsHandlerConfig {
-  getAuthOptions: () => Promise<any>;
   appSlug?: string;
 }
 
 /**
  * Check if the current user has admin role
  */
-async function checkAdminRole(getAuthOptions: () => Promise<any>): Promise<{ isAdmin: boolean; userId?: number; error?: NextResponse }> {
-  const authOptions = await getAuthOptions();
-  const session = await getServerSession(authOptions) as any;
+async function checkAdminRole(request: NextRequest): Promise<{ isAdmin: boolean; userId?: number; error?: NextResponse }> {
+  const session = await getSession(request) as any;
 
   if (!session?.user) {
     return {
@@ -66,7 +64,7 @@ export function createRedisSessionsHandler(config: RedisSessionsHandlerConfig) {
 
   return {
     async GET(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       try {
@@ -140,7 +138,7 @@ export function createRedisSessionsHandler(config: RedisSessionsHandlerConfig) {
     },
 
     async DELETE(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       try {
@@ -196,7 +194,7 @@ export function createRedisSessionRevokeHandler(config: RedisSessionsHandlerConf
 
   return {
     async POST(request: NextRequest, { params }: { params: { sessionId: string } }) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       try {

package/src/api-handlers/admin/sessions.ts

@@ -9,7 +9,7 @@
  */
 
 import { NextRequest, NextResponse } from 'next/server';
-import { getServerSession } from 'next-auth';
+import { getSession } from '../../server/auth';
 import { getStartupIDPConfig } from '../../lib/startup-init';
 import { ADMIN_ROLES, hasAnyRole } from '../../lib/roles';
 
@@ -21,9 +21,8 @@ interface VibeRequestOptions {
 /**
  * Check if the current user has admin role
  */
-async function checkAdminRole(getAuthOptions: () => Promise<any>): Promise<{ isAdmin: boolean; userId?: number; error?: NextResponse }> {
-  const authOptions = await getAuthOptions();
-  const session = await getServerSession(authOptions) as any;
+async function checkAdminRole(request: NextRequest): Promise<{ isAdmin: boolean; userId?: number; error?: NextResponse }> {
+  const session = await getSession(request) as any;
 
   if (!session?.user) {
     return {
@@ -126,7 +125,6 @@ function getCountryFlag(countryCode: string): string {
 }
 
 export interface AdminSessionsHandlerConfig {
-  getAuthOptions: () => Promise<any>;
 }
 
 /**
@@ -136,7 +134,7 @@ export interface AdminSessionsHandlerConfig {
 export function createSessionsHandler(config: AdminSessionsHandlerConfig) {
   return {
     async GET(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       const { searchParams } = new URL(request.url);
@@ -201,7 +199,7 @@ export function createSessionsHandler(config: AdminSessionsHandlerConfig) {
     },
 
     async POST(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       const body = await request.json();

package/src/api-handlers/admin/site-logs.ts

@@ -13,14 +13,13 @@
  */
 
 import { NextRequest, NextResponse } from 'next/server';
-import { getServerSession } from 'next-auth';
+import { getSession } from '../../server/auth';
 import { getRedis } from '../../lib/redis';
 import { ADMIN_ROLES, hasAnyRole } from '../../lib/roles';
 const REDIS_SITE_LOG_KEY = 'vibe:site-logs:pending';
 const REDIS_LOG_TTL = 7 * 24 * 60 * 60; // 1 week
 
 export interface SiteLogsHandlerConfig {
-  getAuthOptions: () => Promise<any>;
   vibeApiUrl?: string;
   appSlug?: string;
   vibeClientId?: string;
@@ -29,9 +28,8 @@ export interface SiteLogsHandlerConfig {
 /**
  * Check if the current user has admin role
  */
-async function checkAdminRole(getAuthOptions: () => Promise<any>): Promise<{ isAdmin: boolean; userId?: number; accessToken?: string; clientId?: string; error?: NextResponse }> {
-  const authOptions = await getAuthOptions();
-  const session = await getServerSession(authOptions) as any;
+async function checkAdminRole(request: NextRequest): Promise<{ isAdmin: boolean; userId?: number; accessToken?: string; clientId?: string; error?: NextResponse }> {
+  const session = await getSession(request) as any;
 
   if (!session?.user) {
     return {
@@ -78,7 +76,7 @@ function getVibeApiUrl(config: SiteLogsHandlerConfig): string {
 export function createSiteLogsHandler(config: SiteLogsHandlerConfig) {
   return {
     async GET(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       const { searchParams } = new URL(request.url);
@@ -127,7 +125,7 @@ export function createSiteLogsHandler(config: SiteLogsHandlerConfig) {
     },
 
     async POST(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       try {
@@ -211,7 +209,7 @@ export function createSiteLogsHandler(config: SiteLogsHandlerConfig) {
 export function createSiteLogsStatsHandler(config: SiteLogsHandlerConfig) {
   return {
     async GET(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       const { searchParams } = new URL(request.url);
@@ -261,7 +259,7 @@ export function createSiteLogsStatsHandler(config: SiteLogsHandlerConfig) {
 export function createSiteLogsDrainHandler(config: SiteLogsHandlerConfig) {
   return {
     async POST(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       const { searchParams } = new URL(request.url);
@@ -310,7 +308,7 @@ export function createSiteLogsDrainHandler(config: SiteLogsHandlerConfig) {
 export function createSiteLogsQueueHandler(config: SiteLogsHandlerConfig) {
   return {
     async GET(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       try {

package/src/api-handlers/admin/stats.ts

@@ -9,7 +9,7 @@
  */
 
 import { NextRequest, NextResponse } from 'next/server';
-import { getServerSession } from 'next-auth';
+import { getSession } from '../../server/auth';
 import { getStartupIDPConfig } from '../../lib/startup-init';
 import { getRedis } from '../../lib/redis';
 import { ADMIN_ROLES } from '../../lib/roles';
@@ -19,9 +19,8 @@ interface VibeRequestOptions {
   body?: unknown;
 }
 
-async function checkAdminRole(getAuthOptions: () => Promise<any>): Promise<{ isAdmin: boolean; error?: NextResponse }> {
-  const authOptions = await getAuthOptions();
-  const session = await getServerSession(authOptions) as any;
+async function checkAdminRole(request: NextRequest): Promise<{ isAdmin: boolean; error?: NextResponse }> {
+  const session = await getSession(request) as any;
 
   if (!session?.user) {
     return {
@@ -101,7 +100,6 @@ async function vibeServiceRequest<T = unknown>(
 }
 
 export interface AdminStatsHandlerConfig {
-  getAuthOptions: () => Promise<any>;
   appSlug?: string;
 }
 
@@ -117,7 +115,7 @@ export function createStatsHandler(config: AdminStatsHandlerConfig) {
 
   return {
     async GET(_request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(_request);
       if (adminCheck.error) return adminCheck.error;
 
       try {

package/src/api-handlers/admin/users.ts

@@ -8,7 +8,7 @@
  */
 
 import { NextRequest, NextResponse } from 'next/server';
-import { getServerSession } from 'next-auth';
+import { getSession } from '../../server/auth';
 import { getStartupIDPConfig } from '../../lib/startup-init';
 import { ADMIN_ROLES, hasAnyRole } from '../../lib/roles';
 
@@ -17,9 +17,8 @@ interface VibeRequestOptions {
   body?: unknown;
 }
 
-async function checkAdminRole(getAuthOptions: () => Promise<any>): Promise<{ isAdmin: boolean; error?: NextResponse }> {
-  const authOptions = await getAuthOptions();
-  const session = await getServerSession(authOptions) as any;
+async function checkAdminRole(request: NextRequest): Promise<{ isAdmin: boolean; error?: NextResponse }> {
+  const session = await getSession(request) as any;
 
   if (!session?.user) {
     return {
@@ -100,7 +99,6 @@ async function vibeServiceRequest<T = unknown>(
 }
 
 export interface AdminUsersHandlerConfig {
-  getAuthOptions: () => Promise<any>;
 }
 
 /**
@@ -110,7 +108,7 @@ export interface AdminUsersHandlerConfig {
 export function createUsersHandler(config: AdminUsersHandlerConfig) {
   return {
     async GET(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       const { searchParams } = new URL(request.url);
@@ -175,7 +173,7 @@ export function createUsersHandler(config: AdminUsersHandlerConfig) {
     },
 
     async POST(request: NextRequest) {
-      const adminCheck = await checkAdminRole(config.getAuthOptions);
+      const adminCheck = await checkAdminRole(request);
       if (adminCheck.error) return adminCheck.error;
 
       const body = await request.json();

package/src/api-handlers/admin/vibe-data.ts

@@ -9,7 +9,7 @@
  */
 
 import { NextRequest, NextResponse } from 'next/server';
-import { getServerSession } from 'next-auth';
+import { getSession } from '../../server/auth';
 import { getStartupIDPConfig } from '../../lib/startup-init';
 import { ADMIN_ROLES, hasAnyRole } from '../../lib/roles';
 
@@ -21,9 +21,8 @@ interface VibeRequestOptions {
 /**
  * Check if the current user has admin role
  */
-async function checkAdminRole(getAuthOptions: () => Promise<any>): Promise<{ isAdmin: boolean; error?: NextResponse }> {
-  const authOptions = await getAuthOptions();
-  const session = await getServerSession(authOptions) as any;
+async function checkAdminRole(request: NextRequest): Promise<{ isAdmin: boolean; error?: NextResponse }> {
+  const session = await getSession(request) as any;
 
   if (!session?.user) {
     return {
@@ -125,7 +124,6 @@ async function vibeServiceRequest<T = unknown>(
 // =============================================================================
 
 export interface AdminVibeHandlerConfig {
-  getAuthOptions: () => Promise<any>;
 }
 
 /**
@@ -134,7 +132,7 @@ export interface AdminVibeHandlerConfig {
  */
 export function createGetCollectionsHandler(config: AdminVibeHandlerConfig) {
   return async function GET(request: NextRequest) {
-    const adminCheck = await checkAdminRole(config.getAuthOptions);
+    const adminCheck = await checkAdminRole(request);
     if (adminCheck.error) return adminCheck.error;
 
     const result = await vibeServiceRequest<any>('/v1/collections', { method: 'GET' });
@@ -160,7 +158,7 @@ export function createGetTablesHandler(config: AdminVibeHandlerConfig) {
     { params }: { params: Promise<{ collection: string }> }
   ) {
     const { collection } = await params;
-    const adminCheck = await checkAdminRole(config.getAuthOptions);
+    const adminCheck = await checkAdminRole(request);
     if (adminCheck.error) return adminCheck.error;
 
     const result = await vibeServiceRequest<any>(`/v1/collections/${collection}/tables`, { method: 'GET' });
@@ -186,7 +184,7 @@ export function createGetTableDataHandler(config: AdminVibeHandlerConfig) {
     { params }: { params: Promise<{ collection: string; table: string }> }
   ) {
     const { collection, table } = await params;
-    const adminCheck = await checkAdminRole(config.getAuthOptions);
+    const adminCheck = await checkAdminRole(request);
     if (adminCheck.error) return adminCheck.error;
 
     const searchParams = request.nextUrl.searchParams.toString();
@@ -220,7 +218,7 @@ export function createGetRecordHandler(config: AdminVibeHandlerConfig) {
     { params }: { params: Promise<{ collection: string; table: string; id: string }> }
   ) {
     const { collection, table, id } = await params;
-    const adminCheck = await checkAdminRole(config.getAuthOptions);
+    const adminCheck = await checkAdminRole(request);
     if (adminCheck.error) return adminCheck.error;
 
     const endpoint = `/v1/collections/${collection}/tables/${table}/${id}`;
@@ -248,7 +246,7 @@ export function createUpdateRecordHandler(config: AdminVibeHandlerConfig) {
     { params }: { params: Promise<{ collection: string; table: string; id: string }> }
   ) {
     const { collection, table, id } = await params;
-    const adminCheck = await checkAdminRole(config.getAuthOptions);
+    const adminCheck = await checkAdminRole(request);
     if (adminCheck.error) return adminCheck.error;
 
     const body = await request.json();
@@ -276,7 +274,7 @@ export function createDeleteRecordHandler(config: AdminVibeHandlerConfig) {
     { params }: { params: Promise<{ collection: string; table: string; id: string }> }
   ) {
     const { collection, table, id } = await params;
-    const adminCheck = await checkAdminRole(config.getAuthOptions);
+    const adminCheck = await checkAdminRole(request);
     if (adminCheck.error) return adminCheck.error;
 
     const endpoint = `/v1/collections/${collection}/tables/${table}/${id}`;
@@ -303,7 +301,7 @@ export function createQueryHandler(config: AdminVibeHandlerConfig) {
     { params }: { params: Promise<{ collection: string; table: string }> }
   ) {
     const { collection, table } = await params;
-    const adminCheck = await checkAdminRole(config.getAuthOptions);
+    const adminCheck = await checkAdminRole(request);
     if (adminCheck.error) return adminCheck.error;
 
     const body = await request.json();

package/src/api-handlers/auth/refresh.ts

@@ -15,10 +15,9 @@
  */
 
 import { NextRequest, NextResponse } from 'next/server';
-import { getToken } from 'next-auth/jwt';
+import { getSession as getBetterAuthSession } from '../../server/auth';
 import { getSession, updateSession, acquireRefreshLock, releaseRefreshLock, checkRefreshLock } from '../../lib/session-store';
 import { computeTokenExpiries } from '../../lib/token-expiry';
-import { getJwtCookieName } from '../../lib/app-slug';
 import { extractKidFromToken } from '../../auth/utils/token-utils';
 
 interface RefreshConfig {
@@ -52,12 +51,11 @@ export function createRefreshHandler(config: RefreshConfig) {
 
   return async function POST(req: NextRequest) {
     try {
-      // Extract session token from NextAuth JWT
-      const token = await getToken({ req, secret: nextAuthSecret, cookieName: getJwtCookieName() });
+      // Extract session from Better Auth
+      const betterAuthSession = await getBetterAuthSession(req);
 
-      // Support both field names: sessionToken (auth.ts JWT) and redisSessionId (legacy)
-      let sessionToken = (token?.sessionToken || token?.redisSessionId) as string | undefined;
-      let userId = token?.sub;
+      let sessionToken = (betterAuthSession?.session?.token) as string | undefined;
+      let userId = betterAuthSession?.user?.id;
 
       if (!sessionToken) {
         // Fallback: check for session token in header (for internal server-to-server calls)

package/src/api-handlers/auth/signout.ts

@@ -12,7 +12,7 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { cookies } from 'next/headers';
 import { deleteSession } from '../../lib/session-store';
-import { getToken } from 'next-auth/jwt';
+import { getSession } from '../../server/auth';
 import {
   getSessionCookieName,
   getSecureSessionCookieName,
@@ -116,13 +116,12 @@ export function createSignoutHandler(config: SignoutConfig) {
     // Decode NextAuth JWT to extract the Redis session UUID before deletion
     let redisSessionToken: string | null = null;
 
-    // First attempt: NextAuth getToken (verified + robust in most cases)
-    // Support both field names: sessionToken (auth.ts JWT) and redisSessionId (legacy)
+    // First attempt: Better Auth getSession
     try {
-      const token = await getToken({ req, secret: nextAuthSecret, cookieName: getJwtCookieName() });
-      redisSessionToken = (token as any)?.sessionToken || (token as any)?.redisSessionId || null;
+      const betterAuthSession = await getSession(req);
+      redisSessionToken = betterAuthSession?.session?.token || null;
     } catch (e) {
-      console.warn('[SIGNOUT] getToken() failed to extract session token (will try manual decode)');
+      console.warn('[SIGNOUT] getSession() failed to extract session token (will try manual decode)');
     }
 
     // Second attempt: manual decode of the session cookie JWT (no verification)

package/src/api-handlers/auth/status.ts

@@ -1,14 +1,11 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { getToken } from 'next-auth/jwt';
-import { resolveNextAuthSecret } from '../../lib/nextauth-secret';
+import { getSession } from '../../server/auth';
 import { getSession as getRedisSession } from '../../lib/session-store';
-import { getJwtCookieName } from '../../lib/app-slug';
 
 export async function GET(req: NextRequest) {
   try {
-    let token: any = await getToken({ req, secret: await resolveNextAuthSecret(), cookieName: getJwtCookieName() });
-    // Support both field names: sessionToken (auth.ts JWT) and redisSessionId (legacy)
-    const sessionToken = (token as any)?.sessionToken || (token as any)?.redisSessionId;
+    const betterAuthSession = await getSession(req);
+    const sessionToken = betterAuthSession?.session?.token;
     if (!sessionToken) {
       return NextResponse.json({ success: false, error: 'No session token' }, { status: 401 });
     }
@@ -16,7 +13,7 @@ export async function GET(req: NextRequest) {
     if (!sessionModel) {
       return NextResponse.json({ success: false, error: 'Session missing in Redis' }, { status: 401 });
     }
-    return NextResponse.json({ success: true, userId: (sessionModel as any).userId || null });
+    return NextResponse.json({ success: true, userId: betterAuthSession?.user?.id || (sessionModel as any).userId || null });
   } catch (err) {
     return NextResponse.json({ success: false, error: err instanceof Error ? err.message : 'Unknown error' }, { status: 500 });
   }