@nuxt-customer-portal/planning 0.4.1 → 0.4.3

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 0.4.3
+
+### Patch Changes
+
+- eb2a85c: Add a single base64-encoded `PORTAL_ENCRYPTION_KEY` that derives isolated keys for credentials saved by Portal Core, Products, and Planning. Existing module-specific keys remain supported as overrides and can decrypt their legacy ciphertext formats.
+- Keep planning date and identifier validation compatible with the Zod runtime resolved by Nuxt production bundles.
+- Updated dependencies [eb2a85c]
+  - @nuxt-customer-portal/core@0.4.3
+  - @nuxt-customer-portal/products@0.4.3
+  - @nuxt-customer-portal/ui@0.4.3
+
+## 0.4.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @nuxt-customer-portal/core@0.4.2
+  - @nuxt-customer-portal/products@0.4.2
+  - @nuxt-customer-portal/ui@0.4.2
+
 ## 0.4.1
 
 ### Patch Changes

package/README.md

@@ -24,14 +24,16 @@ Run Nitro's scheduled tasks every minute in production. HTTP deployments need a
 Use dedicated Google and Zoom OAuth applications, separate from portal sign-in applications:
 
 ```dotenv
-PLANNING_ENCRYPTION_KEY=<base64-encoded 32-byte random key>
+PORTAL_ENCRYPTION_KEY=<base64-encoded 32-byte random key>
 PLANNING_GOOGLE_CLIENT_ID=
 PLANNING_GOOGLE_CLIENT_SECRET=
 PLANNING_ZOOM_CLIENT_ID=
 PLANNING_ZOOM_CLIENT_SECRET=
 ```
 
-Generate the encryption key with `openssl rand -base64 32`. Keep this key stable and backed up with the encrypted database. OAuth tokens are encrypted with AES-256-GCM and never returned through setup APIs.
+Generate the encryption key with `openssl rand -base64 32`. Keep this key stable, identical across application instances, and backed up with the encrypted database. Planning derives its own purpose-specific AES-256-GCM key from it. OAuth tokens are never returned through setup APIs.
+
+Existing deployments may retain `PLANNING_ENCRYPTION_KEY` as a module-specific override. Keep it configured while legacy OAuth credentials encrypted with it remain in the database. Reconnecting providers writes the versioned format; removing the override still requires reconnecting under the portal-wide key first.
 
 Register redirect URLs using the portal's configured public origin:
 

package/app/pages/availability.vue

@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { z } from 'zod'
 import { localParts, wallInstant } from '../../shared/availability'
-import { availabilitySchema } from '../../shared/validation'
+import type { availabilitySchema } from '../../shared/validation'
+import { availabilityShape, validateAvailability } from '../../shared/validation'
 import type { AvailabilityWindow } from '../../shared/types'
 import type { ProviderConfiguration, AppointmentListItem, CalendarBusyPeriod } from '../composables/usePlanning'
 
@@ -65,15 +66,18 @@ const windowState = reactive<z.infer<typeof availabilitySchema>>({
   exceptions: []
 })
 const windowFormSchema = computed(() =>
-  availabilitySchema.safeExtend({
-    productIds: z
-      .array(z.string().min(1).max(100))
-      .min(1, t('planning.selectAtLeastOneProduct'))
-      .max(100)
-      .nullable()
-      .default(null),
-    endDate: z.union([availabilitySchema.shape.endDate, z.literal('')]).transform((v) => v || null)
-  })
+  z
+    .object({
+      ...availabilityShape,
+      productIds: z
+        .array(z.string().min(1).max(100))
+        .min(1, t('planning.selectAtLeastOneProduct'))
+        .max(100)
+        .nullable()
+        .default(null),
+      endDate: z.union([availabilityShape.endDate, z.literal('')]).transform((v) => v || null)
+    })
+    .superRefine(validateAvailability)
 )
 const allProducts = computed({
   get: () => windowState.productIds === null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt-customer-portal/planning",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "license": "MIT",
   "homepage": "https://nuxt-customer-portal.com",
   "repository": {
@@ -40,9 +40,9 @@
     "drizzle-orm": "^0.45.2",
     "pg": "^8.22.0",
     "zod": "^4.4.3",
-    "@nuxt-customer-portal/ui": "^0.4.1",
-    "@nuxt-customer-portal/products": "^0.4.1",
-    "@nuxt-customer-portal/core": "^0.4.1"
+    "@nuxt-customer-portal/core": "^0.4.3",
+    "@nuxt-customer-portal/ui": "^0.4.3",
+    "@nuxt-customer-portal/products": "^0.4.3"
   },
   "peerDependencies": {
     "nuxt": "^4.5.1",

package/portal.manifest.mjs

@@ -1,6 +1,6 @@
 export default {
   id: 'planning',
-  version: '0.4.1',
+  version: '0.4.3',
   source: '@nuxt-customer-portal/planning',
   dependsOn: ['core', 'ui', 'products'],
   schema: './server/db/schema/planning.ts',

package/server/api/planning/calendar-busy.get.ts

@@ -6,7 +6,7 @@ import { providerAccess } from '@nuxt-customer-portal/planning/server/utils/acce
 import { externalBusyDetails } from '@nuxt-customer-portal/planning/server/utils/adapters'
 
 const querySchema = z
-  .object({ from: z.iso.datetime({ offset: true }), to: z.iso.datetime({ offset: true }) })
+  .object({ from: z.string().datetime({ offset: true }), to: z.string().datetime({ offset: true }) })
   .refine(
     ({ from, to }) => Date.parse(to) > Date.parse(from) && Date.parse(to) - Date.parse(from) <= 14 * 86400000,
     'Choose a range of at most 14 days'

package/server/utils/crypto.ts

@@ -1,23 +1,23 @@
-import { createCipheriv, createDecipheriv, randomBytes, createHash } from 'node:crypto'
+import { randomBytes, createHash } from 'node:crypto'
+import {
+  decryptLegacyBinarySecret,
+  decryptPortalSecret,
+  encryptPortalSecret,
+  isPortalSecretCiphertext
+} from '@nuxt-customer-portal/core/server/utils/portal-encryption'
 
 export const digest = (value: string) => createHash('sha256').update(value).digest('hex')
 export const secret = () => randomBytes(32).toString('base64url')
-function key() {
-  const value = Buffer.from(process.env.PLANNING_ENCRYPTION_KEY || '', 'base64')
-  if (value.length !== 32) {
-    throw new Error('Configure PLANNING_ENCRYPTION_KEY with a base64-encoded 32-byte key')
-  }
-  return value
+const planningEncryption = {
+  purpose: 'planning/oauth',
+  overrides: [{ env: 'PLANNING_ENCRYPTION_KEY', format: 'base64-32' as const }]
 }
 export function encrypt(value: unknown) {
-  const iv = randomBytes(12),
-    cipher = createCipheriv('aes-256-gcm', key(), iv)
-  const ciphertext = Buffer.concat([cipher.update(JSON.stringify(value)), cipher.final()])
-  return Buffer.concat([iv, cipher.getAuthTag(), ciphertext]).toString('base64')
+  return encryptPortalSecret(JSON.stringify(value), planningEncryption)
 }
 export function decrypt<T>(value: string): T {
-  const bytes = Buffer.from(value, 'base64'),
-    cipher = createDecipheriv('aes-256-gcm', key(), bytes.subarray(0, 12))
-  cipher.setAuthTag(bytes.subarray(12, 28))
-  return JSON.parse(Buffer.concat([cipher.update(bytes.subarray(28)), cipher.final()]).toString()) as T
+  const decrypted = isPortalSecretCiphertext(value)
+    ? decryptPortalSecret(value, planningEncryption)
+    : decryptLegacyBinarySecret(value, planningEncryption.overrides)
+  return JSON.parse(decrypted) as T
 }

package/shared/validation.ts

@@ -8,27 +8,30 @@ const date = z
   .regex(/^\d{4}-\d{2}-\d{2}$/)
   .refine((v) => Number.isFinite(Date.parse(v)) && new Date(v).toISOString().slice(0, 10) === v, 'Invalid date')
 const time = z.string().regex(/^(?:[01]\d|2[0-3]):[0-5]\d$/)
-export const availabilitySchema = z
-  .object({
-    date,
-    endDate: date.nullable().default(null),
-    startTime: time,
-    endTime: z
-      .string()
-      .transform((value) => (value === '00:00' ? '24:00' : value))
-      .pipe(z.union([time, z.literal('24:00')])),
-    recurring: z.boolean().default(false),
-    productIds: z.array(z.string().min(1).max(100)).min(1).max(100).nullable().default(null),
-    exceptions: z.array(date).max(365).default([])
-  })
-  .superRefine((v, c) => {
-    if (v.endTime <= v.startTime) {
-      c.addIssue({ code: 'custom', path: ['endTime'], message: 'End must follow start on the same day' })
-    }
-    if (v.endDate && v.endDate < v.date) {
-      c.addIssue({ code: 'custom', path: ['endDate'], message: 'End date must follow start date' })
-    }
-  })
+export const availabilityShape = {
+  date,
+  endDate: date.nullable().default(null),
+  startTime: time,
+  endTime: z
+    .string()
+    .transform((value) => (value === '00:00' ? '24:00' : value))
+    .pipe(z.union([time, z.literal('24:00')])),
+  recurring: z.boolean().default(false),
+  productIds: z.array(z.string().min(1).max(100)).min(1).max(100).nullable().default(null),
+  exceptions: z.array(date).max(365).default([])
+}
+export const validateAvailability = (
+  v: z.infer<ReturnType<typeof z.object<typeof availabilityShape>>>,
+  c: z.RefinementCtx
+) => {
+  if (v.endTime <= v.startTime) {
+    c.addIssue({ code: 'custom', path: ['endTime'], message: 'End must follow start on the same day' })
+  }
+  if (v.endDate && v.endDate < v.date) {
+    c.addIssue({ code: 'custom', path: ['endDate'], message: 'End date must follow start date' })
+  }
+}
+export const availabilitySchema = z.object(availabilityShape).superRefine(validateAvailability)
 export const providerSettingsSchema = z.object({
   timezone: timezoneSchema,
   graceMinutes: z.number().int().min(0).max(1440),
@@ -38,8 +41,8 @@ export const providerSettingsSchema = z.object({
 })
 export const availabilityQuerySchema = z
   .object({
-    from: z.iso.datetime({ offset: true }),
-    to: z.iso.datetime({ offset: true }),
+    from: z.string().datetime({ offset: true }),
+    to: z.string().datetime({ offset: true }),
     providerUserId: z.string().max(100).optional()
   })
   .refine(
@@ -49,16 +52,18 @@ export const availabilityQuerySchema = z
 export const holdSchema = z.object({
   productId: z.string().min(1).max(100),
   providerUserId: z.string().min(1).max(100),
-  start: z.iso.datetime({ offset: true }),
+  start: z.string().datetime({ offset: true }),
   customerTimezone: timezoneSchema,
   currency: z.string().regex(/^[A-Z]{3}$/),
   locale: z.enum(['en', 'nl']).default('en'),
-  replacesId: z.uuid().optional(),
+  replacesId: z.string().uuid().optional(),
   previousHoldToken: z.string().min(32).max(200).optional()
 })
 export const holdCredentialSchema = z.object({ holdToken: z.string().min(32).max(200) })
 
-export const availabilityEditSchema = availabilitySchema.safeExtend({ occurrenceDate: date.optional() })
+export const availabilityEditSchema = z
+  .object({ ...availabilityShape, occurrenceDate: date.optional() })
+  .superRefine(validateAvailability)
 
 export const appointmentListSchema = z.object({
   search: z.string().trim().max(200).default(''),
@@ -71,7 +76,7 @@ export const appointmentListSchema = z.object({
 })
 export const staffRescheduleSchema = z.object({
   providerUserId: z.string().min(1).max(100),
-  start: z.iso.datetime({ offset: true }),
+  start: z.string().datetime({ offset: true }),
   customerTimezone: timezoneSchema,
   revision: z.number().int().min(0)
 })