@infuro/cms-core 1.0.47 → 1.0.50

package/README.md

@@ -278,22 +278,24 @@ Create `src/app/api/auth/[...nextauth]/route.ts`:
 
 ```ts
 import NextAuth from 'next-auth';
-import { getNextAuthOptions } from '@infuro/cms-core/auth';
+import { buildNextAuthOptions } from '@infuro/cms-core/auth';
 import { getDataSourceInitialized } from '@/lib/data-source';
-import { CMS_ENTITY_MAP } from '@infuro/cms-core';
+import { CMS_ENTITY_MAP, enrichUserWithVendorContext } from '@infuro/cms-core';
 import bcrypt from 'bcryptjs';
 
 async function getOptions() {
   const dataSource = await getDataSourceInitialized();
   const userRepo = dataSource.getRepository(CMS_ENTITY_MAP.users);
-  return getNextAuthOptions({
+  // Loads Google OAuth from Plugins → Authentication Provider (and GOOGLE_* env fallback)
+  return buildNextAuthOptions({
+    dataSource,
+    entityMap: CMS_ENTITY_MAP,
     getUserByEmail: async (email: string) => {
       const user = await userRepo.findOne({
         where: { email },
         relations: ['group', 'group.permissions'],
-        select: ['id', 'email', 'name', 'password', 'blocked', 'deleted', 'groupId', 'adminAccess'],
+        select: ['id', 'email', 'name', 'password', 'blocked', 'inviteStatus', '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)),
@@ -301,21 +303,29 @@ async function getOptions() {
   });
 }
 
-let handler: ReturnType<typeof NextAuth> | null = null;
-
-async function getHandler() {
-  if (!handler) handler = NextAuth(await getOptions());
-  return handler;
-}
+type NextAuthContext = { params: Promise<{ nextauth?: string[] }> };
 
-export async function GET(req: Request) {
-  return ((await getHandler()) as any).GET(req);
+export async function GET(req: Request, context: NextAuthContext) {
+  return NextAuth(await getOptions())(req, context);
 }
-export async function POST(req: Request) {
-  return ((await getHandler()) as any).POST(req);
+export async function POST(req: Request, context: NextAuthContext) {
+  return NextAuth(await getOptions())(req, context);
 }
 ```
 
+### Google sign-in (Authentication Provider)
+
+1. In Google Cloud Console, create a **Web** OAuth client.
+2. Add authorized redirect URI: `{NEXTAUTH_URL}/api/auth/callback/google` (e.g. `http://localhost:3000/api/auth/callback/google`).
+3. In admin → **Plugins → Authentication Provider**, enable Google, paste Client ID and Client Secret, save.
+4. Ensure `NEXTAUTH_URL` matches the redirect host.
+5. Invite or create the user with the same email as their Google account (existing users only).
+6. On `/admin/signin`, use **Continue with Google**.
+
+Optional env fallback (without Plugins UI): `GOOGLE_CLIENT_ID`, `GOOGLE_CLIENT_SECRET`, `GOOGLE_AUTH_ENABLED=true`.
+
+Host apps already using a cached `getNextAuthOptions` handler should switch to `buildNextAuthOptions` (as above) so plugin settings apply without a process restart.
+
 ### 9. Mount the admin panel
 
 Create `src/app/admin/layout.tsx`:
@@ -387,6 +397,7 @@ const cmsMiddleware = createCmsMiddleware({
     '/api/users/forgot-password': ['POST'],
     '/api/users/set-password': ['POST'],
     '/api/users/invite': ['POST'],
+    '/api/settings/auth_providers': ['GET'],
   },
 });
 
@@ -596,7 +607,7 @@ const service = cms.getPlugin<MyService>('my-plugin');
 |-------------|----------|
 | `@infuro/cms-core` | Entities, plugins, registry, utilities |
 | `@infuro/cms-core/api` | `createCmsApiHandler`, CRUD handlers, auth handlers |
-| `@infuro/cms-core/auth` | `createAuthHelpers`, `createCmsMiddleware`, `getNextAuthOptions` |
+| `@infuro/cms-core/auth` | `createAuthHelpers`, `createCmsMiddleware`, `getNextAuthOptions`, `buildNextAuthOptions`, Google auth helpers |
 | `@infuro/cms-core/admin` | Admin layout, pages, components (React, `'use client'`) |
 | `@infuro/cms-core/hooks` | `useIsMobile`, `useAnalytics`, `usePlugin` |
 
@@ -696,6 +707,9 @@ The CSS variables are injected by the admin layout at runtime. Your website's ow
 | `DATABASE_URL` | Yes | PostgreSQL connection string |
 | `NEXTAUTH_SECRET` | Yes | NextAuth JWT secret |
 | `NEXTAUTH_URL` | Yes | App base URL |
+| `GOOGLE_CLIENT_ID` | If Google login (env) | Web OAuth client ID (or set via Plugins → Authentication Provider) |
+| `GOOGLE_CLIENT_SECRET` | If Google login (env) | Web OAuth client secret |
+| `GOOGLE_AUTH_ENABLED` | No | When using env credentials, set `true` to enable Google (defaults on if both ID/secret set) |
 | `STORAGE_TYPE` | No | `s3` or `local` (default: local) |
 | `AWS_BUCKET_NAME` | If S3 | S3 bucket name |
 | `AWS_REGION` | If S3 | Default AWS region |