@infuro/cms-core 1.0.30 → 1.0.33

package/README.md

@@ -173,21 +173,22 @@ import { getServerSession } from 'next-auth';
 import { createCmsApiHandler } from '@infuro/cms-core/api';
 import { CMS_ENTITY_MAP } from '@infuro/cms-core';
 import { getDataSourceInitialized } from '@/lib/data-source';
-import {
-  requireAuth,
-  requireAdminAccess,
-  requireEntityPermission,
-  getAuthenticatedUser,
-} from '@/lib/auth-helpers';
+import { createCmsAuthBundle } from '@infuro/cms-core/auth';
+import { authOptions } from '@/lib/auth-options';
 import { getCms } from '@/lib/cms';
 import bcrypt from 'bcryptjs';
 
 const baseUrl = process.env.NEXTAUTH_URL || 'http://localhost:3000';
 
+const auth = createCmsAuthBundle(
+  () => getServerSession(authOptions).then((s) => s ?? null),
+  NextResponse
+);
+
 async function requireAdminApiAuth(req: Request) {
-  const a = await requireAuth(req);
+  const a = await auth.requireAuth(req);
   if (a) return a;
-  return requireAdminAccess(req);
+  return auth.requireAdminAccess(req);
 }
 
 let handlerPromise: Promise<ReturnType<typeof createCmsApiHandler>> | null = null;
@@ -200,8 +201,9 @@ async function getHandler() {
         dataSource,
         entityMap: CMS_ENTITY_MAP,
         requireAuth: requireAdminApiAuth,
-        requireEntityPermission,
-        getSessionUser: getAuthenticatedUser,
+        requireEntityPermission: auth.requireEntityPermission,
+        getSessionUser: auth.getSessionUser,
+        getAuthenticatedUser: auth.getAuthenticatedUser,
         json: NextResponse.json.bind(NextResponse),
         getCms,
         userAuth: {
@@ -286,11 +288,13 @@ async function getOptions() {
   const userRepo = dataSource.getRepository(CMS_ENTITY_MAP.users);
   return getNextAuthOptions({
     getUserByEmail: async (email: string) => {
-      return userRepo.findOne({
+      const user = await userRepo.findOne({
         where: { email },
         relations: ['group', 'group.permissions'],
-        select: ['id', 'email', 'name', 'password', 'blocked', 'deleted', 'groupId'],
-      }) as any;
+        select: ['id', 'email', 'name', 'password', 'blocked', 'deleted', 'groupId', 'adminAccess'],
+      });
+      const { enrichUserWithVendorContext } = await import('@infuro/cms-core');
+      return enrichUserWithVendorContext(dataSource, user as any);
     },
     comparePassword: (plain, hash) => Promise.resolve(bcrypt.compareSync(plain, hash)),
     signInPage: '/admin/signin',
@@ -386,12 +390,13 @@ const cmsMiddleware = createCmsMiddleware({
   },
 });
 
-export function middleware(request: NextRequest) {
-  const result = cmsMiddleware({
+export async function middleware(request: NextRequest) {
+  const result = await cmsMiddleware({
     nextUrl: request.nextUrl,
     url: request.url,
     method: request.method,
     cookies: request.cookies,
+    req: request,
   });
 
   if (result.type === 'next') return NextResponse.next();