@cmssy/next 0.5.4 → 0.5.5

package/dist/index.cjs

@@ -4,12 +4,108 @@ var headers = require('next/headers');
 var navigation = require('next/navigation');
 var react = require('@cmssy/react');
 var client = require('@cmssy/react/client');
+var jose = require('jose');
 var jsxRuntime = require('react/jsx-runtime');
 var crypto$1 = require('crypto');
 var server = require('next/server');
-var jose = require('jose');
 
 // src/create-cmssy-page.tsx
+var CMSSY_SESSION_COOKIE = "cmssy_session";
+var SESSION_MAX_AGE_SECONDS = 30 * 24 * 60 * 60;
+var MIN_SESSION_SECRET_LENGTH = 32;
+var ACCESS_EXPIRY_SKEW_MS = 3e4;
+async function deriveSessionKey(secret) {
+  if (typeof secret !== "string" || secret.length < MIN_SESSION_SECRET_LENGTH) {
+    throw new Error(
+      `cmssy auth sessionSecret must be at least ${MIN_SESSION_SECRET_LENGTH} characters`
+    );
+  }
+  const digest = await crypto.subtle.digest(
+    "SHA-256",
+    new TextEncoder().encode(secret)
+  );
+  return new Uint8Array(digest);
+}
+async function sealSession(payload, secret, audience) {
+  const key = await deriveSessionKey(secret);
+  const jwt = new jose.EncryptJWT({ ...payload }).setProtectedHeader({ alg: "dir", enc: "A256GCM" }).setIssuedAt().setExpirationTime(`${SESSION_MAX_AGE_SECONDS}s`);
+  if (audience) jwt.setAudience(audience);
+  return jwt.encrypt(key);
+}
+async function openSession(token, secret, audience) {
+  const key = await deriveSessionKey(secret);
+  try {
+    const { payload } = await jose.jwtDecrypt(token, key, {
+      keyManagementAlgorithms: ["dir"],
+      contentEncryptionAlgorithms: ["A256GCM"],
+      ...audience ? { audience } : {}
+    });
+    const { accessToken, refreshToken, accessExpiresAt, user } = payload;
+    if (typeof accessToken !== "string" || typeof refreshToken !== "string" || !Number.isFinite(accessExpiresAt) || !user || typeof user !== "object" || typeof user.recordId !== "string" || typeof user.email !== "string") {
+      return null;
+    }
+    return {
+      accessToken,
+      refreshToken,
+      accessExpiresAt,
+      user: {
+        recordId: user.recordId,
+        email: user.email
+      }
+    };
+  } catch {
+    return null;
+  }
+}
+function isAccessExpired(payload, now = Date.now()) {
+  return payload.accessExpiresAt <= now + ACCESS_EXPIRY_SKEW_MS;
+}
+function sessionCookieOptions() {
+  return {
+    httpOnly: true,
+    secure: process.env.NODE_ENV !== "development",
+    sameSite: "lax",
+    path: "/",
+    maxAge: SESSION_MAX_AGE_SECONDS
+  };
+}
+
+// src/config.ts
+function assertAuthConfig(config) {
+  const auth = config.auth;
+  if (!auth || typeof auth.modelSlug !== "string" || !auth.modelSlug) {
+    throw new Error("cmssy: config.auth.modelSlug is required for auth routes");
+  }
+  if (typeof auth.sessionSecret !== "string" || auth.sessionSecret.length < MIN_SESSION_SECRET_LENGTH) {
+    throw new Error(
+      `cmssy: config.auth.sessionSecret must be at least ${MIN_SESSION_SECRET_LENGTH} characters`
+    );
+  }
+  return auth;
+}
+
+// src/auth-server.ts
+async function readValidSession(config) {
+  const auth = assertAuthConfig(config);
+  const jar = await headers.cookies();
+  const raw = jar.get(CMSSY_SESSION_COOKIE)?.value;
+  if (!raw) return null;
+  const session = await openSession(
+    raw,
+    auth.sessionSecret,
+    config.workspaceSlug
+  );
+  if (!session || isAccessExpired(session)) return null;
+  return session;
+}
+async function getCmssyUser(config) {
+  const session = await readValidSession(config);
+  return session?.user ?? null;
+}
+async function getCmssyAccessToken(config) {
+  const session = await readValidSession(config);
+  return session?.accessToken ?? null;
+}
 
 // src/csp.ts
 function toCspOrigin(origin) {
@@ -70,6 +166,7 @@ function createCmssyPage(config, blocks, options) {
     apiUrl: config.apiUrl,
     workspaceSlug: config.workspaceSlug
   };
+  const client$1 = react.createCmssyClient(clientConfig);
   return async function CmssyCatchAllPage({
     params,
     searchParams
@@ -131,6 +228,27 @@ function createCmssyPage(config, blocks, options) {
         }
       ) });
     }
+    let auth;
+    if (config.auth) {
+      try {
+        const user = await getCmssyUser(config);
+        auth = {
+          isAuthenticated: !!user,
+          member: user ? { recordId: user.recordId, email: user.email } : null
+        };
+      } catch {
+        auth = void 0;
+      }
+    }
+    let workspace;
+    try {
+      workspace = {
+        id: await client$1.resolveWorkspaceId(),
+        slug: config.workspaceSlug
+      };
+    } catch {
+      workspace = void 0;
+    }
     return /* @__PURE__ */ jsxRuntime.jsx(client.CmssyLocaleProvider, { value: localeContext, children: /* @__PURE__ */ jsxRuntime.jsx(
       react.CmssyServerPage,
       {
@@ -139,7 +257,9 @@ function createCmssyPage(config, blocks, options) {
         locale,
         defaultLocale,
         enabledLocales,
-        forms
+        forms,
+        auth,
+        workspace
       }
     ) });
   };
@@ -509,79 +629,6 @@ function createCmssyLocaleMiddleware(config) {
     return server.NextResponse.next({ request: { headers: headers3 } });
   };
 }
-var CMSSY_SESSION_COOKIE = "cmssy_session";
-var SESSION_MAX_AGE_SECONDS = 30 * 24 * 60 * 60;
-var MIN_SESSION_SECRET_LENGTH = 32;
-var ACCESS_EXPIRY_SKEW_MS = 3e4;
-async function deriveSessionKey(secret) {
-  if (typeof secret !== "string" || secret.length < MIN_SESSION_SECRET_LENGTH) {
-    throw new Error(
-      `cmssy auth sessionSecret must be at least ${MIN_SESSION_SECRET_LENGTH} characters`
-    );
-  }
-  const digest = await crypto.subtle.digest(
-    "SHA-256",
-    new TextEncoder().encode(secret)
-  );
-  return new Uint8Array(digest);
-}
-async function sealSession(payload, secret, audience) {
-  const key = await deriveSessionKey(secret);
-  const jwt = new jose.EncryptJWT({ ...payload }).setProtectedHeader({ alg: "dir", enc: "A256GCM" }).setIssuedAt().setExpirationTime(`${SESSION_MAX_AGE_SECONDS}s`);
-  if (audience) jwt.setAudience(audience);
-  return jwt.encrypt(key);
-}
-async function openSession(token, secret, audience) {
-  const key = await deriveSessionKey(secret);
-  try {
-    const { payload } = await jose.jwtDecrypt(token, key, {
-      keyManagementAlgorithms: ["dir"],
-      contentEncryptionAlgorithms: ["A256GCM"],
-      ...audience ? { audience } : {}
-    });
-    const { accessToken, refreshToken, accessExpiresAt, user } = payload;
-    if (typeof accessToken !== "string" || typeof refreshToken !== "string" || !Number.isFinite(accessExpiresAt) || !user || typeof user !== "object" || typeof user.recordId !== "string" || typeof user.email !== "string") {
-      return null;
-    }
-    return {
-      accessToken,
-      refreshToken,
-      accessExpiresAt,
-      user: {
-        recordId: user.recordId,
-        email: user.email
-      }
-    };
-  } catch {
-    return null;
-  }
-}
-function isAccessExpired(payload, now = Date.now()) {
-  return payload.accessExpiresAt <= now + ACCESS_EXPIRY_SKEW_MS;
-}
-function sessionCookieOptions() {
-  return {
-    httpOnly: true,
-    secure: process.env.NODE_ENV !== "development",
-    sameSite: "lax",
-    path: "/",
-    maxAge: SESSION_MAX_AGE_SECONDS
-  };
-}
-
-// src/config.ts
-function assertAuthConfig(config) {
-  const auth = config.auth;
-  if (!auth || typeof auth.modelSlug !== "string" || !auth.modelSlug) {
-    throw new Error("cmssy: config.auth.modelSlug is required for auth routes");
-  }
-  if (typeof auth.sessionSecret !== "string" || auth.sessionSecret.length < MIN_SESSION_SECRET_LENGTH) {
-    throw new Error(
-      `cmssy: config.auth.sessionSecret must be at least ${MIN_SESSION_SECRET_LENGTH} characters`
-    );
-  }
-  return auth;
-}
 var LOGIN_MUTATION = `mutation SiteMemberLogin($input: SiteMemberLoginInput!) {
   siteMemberLogin(input: $input) {
     success message accessToken refreshToken accessTokenExpiresIn
@@ -1289,27 +1336,6 @@ function createCmssyCartRoute(config) {
     }
   };
 }
-async function readValidSession(config) {
-  const auth = assertAuthConfig(config);
-  const jar = await headers.cookies();
-  const raw = jar.get(CMSSY_SESSION_COOKIE)?.value;
-  if (!raw) return null;
-  const session = await openSession(
-    raw,
-    auth.sessionSecret,
-    config.workspaceSlug
-  );
-  if (!session || isAccessExpired(session)) return null;
-  return session;
-}
-async function getCmssyUser(config) {
-  const session = await readValidSession(config);
-  return session?.user ?? null;
-}
-async function getCmssyAccessToken(config) {
-  const session = await readValidSession(config);
-  return session?.accessToken ?? null;
-}
 function isPrefetch(request2) {
   return request2.headers.get("next-router-prefetch") !== null || request2.headers.get("purpose") === "prefetch" || (request2.headers.get("sec-purpose") ?? "").includes("prefetch");
 }

package/dist/index.js

@@ -1,13 +1,109 @@
 import { draftMode, headers, cookies } from 'next/headers';
 import { notFound, redirect } from 'next/navigation';
-import { resolveSiteLocales, splitLocaleFromPath, fetchPage, resolveForms, CmssyServerPage, fetchSiteConfig, fetchPageById, fetchPages, fetchPageMeta, normalizeSlug as normalizeSlug$1, resolveWorkspaceId, graphqlRequest } from '@cmssy/react';
+import { createCmssyClient, resolveSiteLocales, splitLocaleFromPath, fetchPage, resolveForms, CmssyServerPage, fetchSiteConfig, fetchPageById, fetchPages, fetchPageMeta, normalizeSlug as normalizeSlug$1, resolveWorkspaceId, graphqlRequest } from '@cmssy/react';
 import { CmssyLocaleProvider } from '@cmssy/react/client';
+import { EncryptJWT, jwtDecrypt } from 'jose';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { createHmac, createHash, timingSafeEqual } from 'crypto';
 import { NextResponse } from 'next/server';
-import { EncryptJWT, jwtDecrypt } from 'jose';
 
 // src/create-cmssy-page.tsx
+var CMSSY_SESSION_COOKIE = "cmssy_session";
+var SESSION_MAX_AGE_SECONDS = 30 * 24 * 60 * 60;
+var MIN_SESSION_SECRET_LENGTH = 32;
+var ACCESS_EXPIRY_SKEW_MS = 3e4;
+async function deriveSessionKey(secret) {
+  if (typeof secret !== "string" || secret.length < MIN_SESSION_SECRET_LENGTH) {
+    throw new Error(
+      `cmssy auth sessionSecret must be at least ${MIN_SESSION_SECRET_LENGTH} characters`
+    );
+  }
+  const digest = await crypto.subtle.digest(
+    "SHA-256",
+    new TextEncoder().encode(secret)
+  );
+  return new Uint8Array(digest);
+}
+async function sealSession(payload, secret, audience) {
+  const key = await deriveSessionKey(secret);
+  const jwt = new EncryptJWT({ ...payload }).setProtectedHeader({ alg: "dir", enc: "A256GCM" }).setIssuedAt().setExpirationTime(`${SESSION_MAX_AGE_SECONDS}s`);
+  if (audience) jwt.setAudience(audience);
+  return jwt.encrypt(key);
+}
+async function openSession(token, secret, audience) {
+  const key = await deriveSessionKey(secret);
+  try {
+    const { payload } = await jwtDecrypt(token, key, {
+      keyManagementAlgorithms: ["dir"],
+      contentEncryptionAlgorithms: ["A256GCM"],
+      ...audience ? { audience } : {}
+    });
+    const { accessToken, refreshToken, accessExpiresAt, user } = payload;
+    if (typeof accessToken !== "string" || typeof refreshToken !== "string" || !Number.isFinite(accessExpiresAt) || !user || typeof user !== "object" || typeof user.recordId !== "string" || typeof user.email !== "string") {
+      return null;
+    }
+    return {
+      accessToken,
+      refreshToken,
+      accessExpiresAt,
+      user: {
+        recordId: user.recordId,
+        email: user.email
+      }
+    };
+  } catch {
+    return null;
+  }
+}
+function isAccessExpired(payload, now = Date.now()) {
+  return payload.accessExpiresAt <= now + ACCESS_EXPIRY_SKEW_MS;
+}
+function sessionCookieOptions() {
+  return {
+    httpOnly: true,
+    secure: process.env.NODE_ENV !== "development",
+    sameSite: "lax",
+    path: "/",
+    maxAge: SESSION_MAX_AGE_SECONDS
+  };
+}
+
+// src/config.ts
+function assertAuthConfig(config) {
+  const auth = config.auth;
+  if (!auth || typeof auth.modelSlug !== "string" || !auth.modelSlug) {
+    throw new Error("cmssy: config.auth.modelSlug is required for auth routes");
+  }
+  if (typeof auth.sessionSecret !== "string" || auth.sessionSecret.length < MIN_SESSION_SECRET_LENGTH) {
+    throw new Error(
+      `cmssy: config.auth.sessionSecret must be at least ${MIN_SESSION_SECRET_LENGTH} characters`
+    );
+  }
+  return auth;
+}
+
+// src/auth-server.ts
+async function readValidSession(config) {
+  const auth = assertAuthConfig(config);
+  const jar = await cookies();
+  const raw = jar.get(CMSSY_SESSION_COOKIE)?.value;
+  if (!raw) return null;
+  const session = await openSession(
+    raw,
+    auth.sessionSecret,
+    config.workspaceSlug
+  );
+  if (!session || isAccessExpired(session)) return null;
+  return session;
+}
+async function getCmssyUser(config) {
+  const session = await readValidSession(config);
+  return session?.user ?? null;
+}
+async function getCmssyAccessToken(config) {
+  const session = await readValidSession(config);
+  return session?.accessToken ?? null;
+}
 
 // src/csp.ts
 function toCspOrigin(origin) {
@@ -68,6 +164,7 @@ function createCmssyPage(config, blocks, options) {
     apiUrl: config.apiUrl,
     workspaceSlug: config.workspaceSlug
   };
+  const client = createCmssyClient(clientConfig);
   return async function CmssyCatchAllPage({
     params,
     searchParams
@@ -129,6 +226,27 @@ function createCmssyPage(config, blocks, options) {
         }
       ) });
     }
+    let auth;
+    if (config.auth) {
+      try {
+        const user = await getCmssyUser(config);
+        auth = {
+          isAuthenticated: !!user,
+          member: user ? { recordId: user.recordId, email: user.email } : null
+        };
+      } catch {
+        auth = void 0;
+      }
+    }
+    let workspace;
+    try {
+      workspace = {
+        id: await client.resolveWorkspaceId(),
+        slug: config.workspaceSlug
+      };
+    } catch {
+      workspace = void 0;
+    }
     return /* @__PURE__ */ jsx(CmssyLocaleProvider, { value: localeContext, children: /* @__PURE__ */ jsx(
       CmssyServerPage,
       {
@@ -137,7 +255,9 @@ function createCmssyPage(config, blocks, options) {
         locale,
         defaultLocale,
         enabledLocales,
-        forms
+        forms,
+        auth,
+        workspace
       }
     ) });
   };
@@ -507,79 +627,6 @@ function createCmssyLocaleMiddleware(config) {
     return NextResponse.next({ request: { headers: headers3 } });
   };
 }
-var CMSSY_SESSION_COOKIE = "cmssy_session";
-var SESSION_MAX_AGE_SECONDS = 30 * 24 * 60 * 60;
-var MIN_SESSION_SECRET_LENGTH = 32;
-var ACCESS_EXPIRY_SKEW_MS = 3e4;
-async function deriveSessionKey(secret) {
-  if (typeof secret !== "string" || secret.length < MIN_SESSION_SECRET_LENGTH) {
-    throw new Error(
-      `cmssy auth sessionSecret must be at least ${MIN_SESSION_SECRET_LENGTH} characters`
-    );
-  }
-  const digest = await crypto.subtle.digest(
-    "SHA-256",
-    new TextEncoder().encode(secret)
-  );
-  return new Uint8Array(digest);
-}
-async function sealSession(payload, secret, audience) {
-  const key = await deriveSessionKey(secret);
-  const jwt = new EncryptJWT({ ...payload }).setProtectedHeader({ alg: "dir", enc: "A256GCM" }).setIssuedAt().setExpirationTime(`${SESSION_MAX_AGE_SECONDS}s`);
-  if (audience) jwt.setAudience(audience);
-  return jwt.encrypt(key);
-}
-async function openSession(token, secret, audience) {
-  const key = await deriveSessionKey(secret);
-  try {
-    const { payload } = await jwtDecrypt(token, key, {
-      keyManagementAlgorithms: ["dir"],
-      contentEncryptionAlgorithms: ["A256GCM"],
-      ...audience ? { audience } : {}
-    });
-    const { accessToken, refreshToken, accessExpiresAt, user } = payload;
-    if (typeof accessToken !== "string" || typeof refreshToken !== "string" || !Number.isFinite(accessExpiresAt) || !user || typeof user !== "object" || typeof user.recordId !== "string" || typeof user.email !== "string") {
-      return null;
-    }
-    return {
-      accessToken,
-      refreshToken,
-      accessExpiresAt,
-      user: {
-        recordId: user.recordId,
-        email: user.email
-      }
-    };
-  } catch {
-    return null;
-  }
-}
-function isAccessExpired(payload, now = Date.now()) {
-  return payload.accessExpiresAt <= now + ACCESS_EXPIRY_SKEW_MS;
-}
-function sessionCookieOptions() {
-  return {
-    httpOnly: true,
-    secure: process.env.NODE_ENV !== "development",
-    sameSite: "lax",
-    path: "/",
-    maxAge: SESSION_MAX_AGE_SECONDS
-  };
-}
-
-// src/config.ts
-function assertAuthConfig(config) {
-  const auth = config.auth;
-  if (!auth || typeof auth.modelSlug !== "string" || !auth.modelSlug) {
-    throw new Error("cmssy: config.auth.modelSlug is required for auth routes");
-  }
-  if (typeof auth.sessionSecret !== "string" || auth.sessionSecret.length < MIN_SESSION_SECRET_LENGTH) {
-    throw new Error(
-      `cmssy: config.auth.sessionSecret must be at least ${MIN_SESSION_SECRET_LENGTH} characters`
-    );
-  }
-  return auth;
-}
 var LOGIN_MUTATION = `mutation SiteMemberLogin($input: SiteMemberLoginInput!) {
   siteMemberLogin(input: $input) {
     success message accessToken refreshToken accessTokenExpiresIn
@@ -1287,27 +1334,6 @@ function createCmssyCartRoute(config) {
     }
   };
 }
-async function readValidSession(config) {
-  const auth = assertAuthConfig(config);
-  const jar = await cookies();
-  const raw = jar.get(CMSSY_SESSION_COOKIE)?.value;
-  if (!raw) return null;
-  const session = await openSession(
-    raw,
-    auth.sessionSecret,
-    config.workspaceSlug
-  );
-  if (!session || isAccessExpired(session)) return null;
-  return session;
-}
-async function getCmssyUser(config) {
-  const session = await readValidSession(config);
-  return session?.user ?? null;
-}
-async function getCmssyAccessToken(config) {
-  const session = await readValidSession(config);
-  return session?.accessToken ?? null;
-}
 function isPrefetch(request2) {
   return request2.headers.get("next-router-prefetch") !== null || request2.headers.get("purpose") === "prefetch" || (request2.headers.get("sec-purpose") ?? "").includes("prefetch");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/next",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Next.js App Router bindings for cmssy headless sites (createCmssyPage + draft preview)",
   "keywords": [
     "cmssy",
@@ -41,7 +41,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@cmssy/react": "^0.5.4",
+    "@cmssy/react": "^0.5.5",
     "next": ">=15",
     "react": "^18.2.0 || ^19.0.0",
     "react-dom": "^18.2.0 || ^19.0.0"
@@ -54,7 +54,7 @@
     "tsup": "^8.3.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0",
-    "@cmssy/react": "0.5.4"
+    "@cmssy/react": "0.5.5"
   },
   "dependencies": {
     "jose": "^6.2.3"