Merge pull request #241 from cipherstash/nextjs-fix-1

feat(nextjs): Remove node api calls which are incompatible with Next.…

Author: calvinbrewer

.changeset/sparkly-breads-tap.md

@@ -0,0 +1,5 @@
+---
+"@cipherstash/nextjs": minor
+---
+
+Remove node api calls which are incompatible with Next.js middleware.

packages/nextjs/src/cts/index.ts

@@ -1,12 +1,40 @@
 import { NextResponse } from 'next/server'
-import { loadWorkSpaceId } from '../../../utils/config'
 import { logger } from '../../../utils/logger'
 import {
   CS_COOKIE_NAME,
   type CtsToken,
   type GetCtsTokenResponse,
 } from '../index'
 
+/**
+ * Extracts the workspace ID from a CRN string.
+ * CRN format: crn:region.aws:ID
+ *
+ * @param crn The CRN string to extract from
+ * @returns The workspace ID portion of the CRN
+ */
+function extractWorkspaceIdFromCrn(crn: string): string {
+  const match = crn.match(/crn:[^:]+:([^:]+)$/)
+  if (!match) {
+    throw new Error('Invalid CRN format')
+  }
+  return match[1]
+}
+
+export function loadWorkSpaceId(suppliedCrn?: string): string {
+  if (suppliedCrn) {
+    return extractWorkspaceIdFromCrn(suppliedCrn)
+  }
+
+  if (!process.env.CS_WORKSPACE_CRN) {
+    throw new Error(
+      'You have not defined a workspace CRN in your config file, or the CS_WORKSPACE_CRN environment variable.',
+    )
+  }
+
+  return extractWorkspaceIdFromCrn(process.env.CS_WORKSPACE_CRN)
+}
+
 // Can be used independently of the Next.js middleware
 export const fetchCtsToken = async (oidcToken: string): GetCtsTokenResponse => {
   const workspaceId = loadWorkSpaceId()

packages/protect/__tests__/lock-context.test.ts

@@ -1,7 +1,8 @@
 import 'dotenv/config'
 import { csColumn, csTable } from '@cipherstash/schema'
 import { beforeAll, describe, expect, it } from 'vitest'
-import { LockContext, protect } from '../src'
+import { protect } from '../src'
+import { LockContext } from '../src/identify'
 
 const users = csTable('users', {
   email: csColumn('email').freeTextSearch().equality().orderAndRange(),

pnpm-workspace.yaml

@@ -12,5 +12,5 @@ catalogs:
 
   security:
     '@clerk/nextjs': 6.31.2
-    next: 15.4.7
+    next: 15.4.8
     vite: 6.4.1