@nuxt-customer-portal/planning 0.4.6 → 0.4.8

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.4.8
+
+### Patch Changes
+
+- Control Google Calendar availability synchronization with a provider appointment preference instead of the store environment.
+  - @nuxt-customer-portal/core@0.4.8
+  - @nuxt-customer-portal/products@0.4.8
+  - @nuxt-customer-portal/ui@0.4.8
+
+## 0.4.7
+
+### Patch Changes
+
+- Keep Google Calendar settings recoverable when stored authorization expires, and offer reconnection after a rejected token refresh.
+  - @nuxt-customer-portal/core@0.4.7
+  - @nuxt-customer-portal/products@0.4.7
+  - @nuxt-customer-portal/ui@0.4.7
+
 ## 0.4.6
 
 ### Patch Changes

package/app/components/PlanningPersonalCalendarSettings.vue

@@ -11,6 +11,7 @@ const calendars = ref<Array<{ id: string; summary: string; accessRole: string }>
 const providerState = reactive({
   timezone: 'Europe/Amsterdam',
   graceMinutes: 0,
+  availabilitySyncEnabled: true,
   availabilityCalendarTitle: 'Portal availability',
   busyCalendarIds: [] as string[],
   writeCalendarId: ''
@@ -42,11 +43,28 @@ async function load() {
     Object.assign(providerState, {
       timezone: settings.timezone,
       graceMinutes: settings.graceMinutes,
+      availabilitySyncEnabled: settings.availabilitySyncEnabled,
       availabilityCalendarTitle: settings.availabilityCalendarTitle,
       busyCalendarIds: settings.busyCalendarIds,
       writeCalendarId: settings.writeCalendarId || ''
     })
-    calendars.value = googleConnected.value ? await api.calendars() : []
+    if (googleConnected.value) {
+      try {
+        calendars.value = await api.calendars()
+      } catch (calendarError) {
+        const refreshedSettings = await api.provider().catch(() => null)
+        const connectionStillHealthy = refreshedSettings?.connections.some(
+          (connection) => connection.provider === 'google' && connection.healthy
+        )
+        if (connectionStillHealthy !== false) {
+          throw calendarError
+        }
+        googleConnected.value = false
+        calendars.value = []
+      }
+    } else {
+      calendars.value = []
+    }
     ready.value = true
   } catch {
     error.value = t('planning.loadError')
@@ -182,6 +200,14 @@ async function saveSettings() {
           ><h2 class="font-semibold">{{ t('planning.schedulingPreferences') }}</h2></template
         >
         <div class="grid gap-4 sm:grid-cols-2">
+          <UFormField
+            name="availabilitySyncEnabled"
+            :label="t('planning.availabilitySyncEnabled')"
+            :description="t('planning.availabilitySyncEnabledDescription')"
+            class="sm:col-span-2"
+          >
+            <USwitch v-model="providerState.availabilitySyncEnabled" />
+          </UFormField>
           <UFormField
             name="availabilityCalendarTitle"
             :label="t('planning.availabilityCalendarTitle')"

package/app/composables/usePlanning.ts

@@ -38,6 +38,7 @@ export interface ProviderConfiguration {
   enabled: boolean
   timezone: string
   graceMinutes: number
+  availabilitySyncEnabled: boolean
   availabilityCalendarTitle: string
   busyCalendarIds: string[]
   writeCalendarId: string | null

package/i18n/locales/en.json

@@ -95,6 +95,8 @@
     "setMainCalendar": "Set main calendar",
     "calendarSettings": "Calendar settings",
     "graceMinutes": "Grace time after portal appointments (minutes)",
+    "availabilitySyncEnabled": "Sync availability to Google Calendar",
+    "availabilitySyncEnabledDescription": "Create and maintain calendar events for your portal availability. Turning this off removes existing availability events; appointments remain synchronized.",
     "availabilityCalendarTitle": "Availability calendar event title",
     "availabilityCalendarTitleDescription": "Shown as the title of availability events in your main calendar.",
     "busyCalendars": "Calendars that block availability",

package/i18n/locales/nl.json

@@ -95,6 +95,8 @@
     "setMainCalendar": "Hoofdagenda instellen",
     "calendarSettings": "Agenda-instellingen",
     "graceMinutes": "Rusttijd na portaalafspraken (minuten)",
+    "availabilitySyncEnabled": "Beschikbaarheid synchroniseren met Google Agenda",
+    "availabilitySyncEnabledDescription": "Maak en onderhoud agendagebeurtenissen voor je beschikbaarheid in het portaal. Als je dit uitschakelt, worden bestaande beschikbaarheidsgebeurtenissen verwijderd; afspraken blijven gesynchroniseerd.",
     "availabilityCalendarTitle": "Titel van beschikbaarheid in agenda",
     "availabilityCalendarTitleDescription": "Wordt als titel getoond bij beschikbaarheid in je hoofdagenda.",
     "busyCalendars": "Agenda’s die beschikbaarheid blokkeren",

package/migrations/0005_availability_sync_enabled.sql

@@ -0,0 +1,2 @@
+ALTER TABLE planning.provider
+ADD COLUMN availability_sync_enabled boolean NOT NULL DEFAULT true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt-customer-portal/planning",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "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/core": "^0.4.6",
-    "@nuxt-customer-portal/products": "^0.4.6",
-    "@nuxt-customer-portal/ui": "^0.4.6"
+    "@nuxt-customer-portal/core": "^0.4.8",
+    "@nuxt-customer-portal/ui": "^0.4.8",
+    "@nuxt-customer-portal/products": "^0.4.8"
   },
   "peerDependencies": {
     "nuxt": "^4.5.1",

package/portal.manifest.mjs

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

package/server/db/schema/planning.ts

@@ -38,6 +38,7 @@ export const provider = schema.table(
     enabled: boolean('enabled').notNull().default(false),
     timezone: text('timezone').notNull().default('Europe/Amsterdam'),
     graceMinutes: integer('grace_minutes').notNull().default(0),
+    availabilitySyncEnabled: boolean('availability_sync_enabled').notNull().default(true),
     availabilityCalendarTitle: text('availability_calendar_title').notNull().default('Portal availability'),
     busyCalendarIds: text('busy_calendar_ids')
       .array()

package/server/utils/adapters.ts

@@ -54,6 +54,14 @@ export interface MeetingAdapter {
   ): Promise<{ id: string; url: string }>
   remove(storeId: string, userId: string, id: string): Promise<void>
 }
+class AuthorizationExchangeError extends Error {
+  constructor(
+    public readonly status: number,
+    message = `Calendar/meeting authorization failed (${status})`
+  ) {
+    super(message)
+  }
+}
 export function oauthConfig(provider: 'google' | 'zoom') {
   const prefix = `PLANNING_${provider.toUpperCase()}`
   const clientId = process.env[`${prefix}_CLIENT_ID`],
@@ -84,7 +92,7 @@ export async function exchange(provider: 'google' | 'zoom', params: Record<strin
     }
   )
   if (!response.ok) {
-    throw new Error(`Calendar/meeting authorization failed (${response.status})`)
+    throw new AuthorizationExchangeError(response.status)
   }
   const value = (await response.json()) as { access_token: string; refresh_token?: string; expires_in: number }
   if (!value.access_token || !value.expires_in) {
@@ -111,7 +119,21 @@ async function accessToken(storeId: string, userId: string, provider: 'google' |
     }
     let credentials = decrypt<Credentials>(connection.credentials)
     if (credentials.expiresAt < Date.now() + 60000) {
-      credentials = await exchange(provider, { grant_type: 'refresh_token', refresh_token: credentials.refresh_token })
+      try {
+        credentials = await exchange(provider, {
+          grant_type: 'refresh_token',
+          refresh_token: credentials.refresh_token
+        })
+      } catch (error) {
+        if (error instanceof AuthorizationExchangeError && [400, 401].includes(error.status)) {
+          await rows(
+            'UPDATE planning.connection SET healthy=false,error=$4 WHERE store_id=$1 AND user_id=$2 AND provider=$3',
+            [storeId, userId, provider, 'Authorization expired; reconnect'],
+            client
+          )
+        }
+        throw error
+      }
       await rows(
         'UPDATE planning.connection SET credentials=$4,error=NULL WHERE store_id=$1 AND user_id=$2 AND provider=$3',
         [storeId, userId, provider, encrypt(credentials)],

package/server/utils/jobs.ts

@@ -11,7 +11,6 @@ import {
 } from '@nuxt-customer-portal/products/server/utils/orders'
 import { stripeProvider } from '@nuxt-customer-portal/products/server/utils/payments'
 import { baseUrl } from '@nuxt-customer-portal/products/server/utils/access'
-import { developmentSandboxEffectsEnabled } from '@nuxt-customer-portal/products/server/utils/development'
 import type { Appointment, AvailabilityWindow, Reservation } from '../../shared/types'
 import { calendarInvitation } from '../../shared/invitation'
 import { calendarWallDateTime, wallInstant } from '../../shared/availability'
@@ -274,20 +273,19 @@ async function availabilityEffects(id: string) {
   if (!window) {
     return
   }
-  const [store] = await rows<{ mode: string }>('SELECT mode FROM products.store WHERE organization_id=$1', [
-    window.store_id
-  ])
-  if (store?.mode === 'sandbox' && !developmentSandboxEffectsEnabled()) {
-    return
-  }
   const eventId = window.calendar_event_id || `a${id.replace(/-/g, '')}`
-  const [provider] = await rows<{ write_calendar_id: string; availability_calendar_title: string }>(
-    'SELECT write_calendar_id,availability_calendar_title FROM planning.provider WHERE store_id=$1 AND user_id=$2',
+  const [provider] = await rows<{
+    write_calendar_id: string
+    availability_calendar_title: string
+    availability_sync_enabled: boolean
+  }>(
+    'SELECT write_calendar_id,availability_calendar_title,availability_sync_enabled FROM planning.provider WHERE store_id=$1 AND user_id=$2',
     [window.store_id, window.user_id]
   )
-  if (window.deleted) {
+  if (window.deleted || !provider?.availability_sync_enabled) {
     if (window.calendar_id) {
       await calendarAdapter().remove(window.store_id, window.user_id, window.calendar_id, eventId)
+      await rows('UPDATE planning.availability SET calendar_event_id=NULL,calendar_id=NULL WHERE id=$1', [id])
     }
     return
   }

package/server/utils/management.ts

@@ -7,7 +7,7 @@ import { stripeProvider } from '@nuxt-customer-portal/products/server/utils/paym
 import { reconcileCheckout, getOrder } from '@nuxt-customer-portal/products/server/utils/orders'
 import { getProduct } from '@nuxt-customer-portal/products/server/utils/catalog'
 import { productPlanningSchema, planningPolicySchema } from '@nuxt-customer-portal/products/shared/planning'
-import { canChange, changeFee, refundAmount } from '../../shared/availability'
+import { canChange, changeFee, refundAmount, localParts } from '../../shared/availability'
 import { availabilityEditSchema, providerSettingsSchema } from '../../shared/validation'
 import type { Appointment, ProviderSettings, AvailabilityWindow } from '../../shared/types'
 import { planningAdmin, providerAccess, appointmentAccess } from './access'
@@ -18,7 +18,7 @@ import { auditLock } from './jobs'
 export async function listProviders(event: H3Event): Promise<ProviderSettings[]> {
   const context = await planningAdmin(event)
   return rows<ProviderSettings>(
-    `SELECT u.id AS "userId",u.name,u.image,COALESCE(p.enabled,false) AS enabled,COALESCE(p.timezone,u.timezone,os.timezone,'Europe/Amsterdam') AS timezone,COALESCE(p.grace_minutes,0) AS "graceMinutes",COALESCE(p.busy_calendar_ids,'{}') AS "busyCalendarIds",p.write_calendar_id AS "writeCalendarId",EXISTS(SELECT 1 FROM planning.connection c WHERE c.store_id=m.organization_id AND c.user_id=u.id AND c.provider='google' AND c.healthy) AS "googleConnected",EXISTS(SELECT 1 FROM planning.connection c WHERE c.store_id=m.organization_id AND c.user_id=u.id AND c.provider='zoom' AND c.healthy) AS "zoomConnected" FROM public.member m JOIN public."user" u ON u.id=m.user_id LEFT JOIN planning.provider p ON p.store_id=m.organization_id AND p.user_id=u.id LEFT JOIN public.organization_settings os ON os.organization_id=m.organization_id WHERE m.organization_id=$1 ORDER BY u.name`,
+    `SELECT u.id AS "userId",u.name,u.image,COALESCE(p.enabled,false) AS enabled,COALESCE(p.timezone,u.timezone,os.timezone,'Europe/Amsterdam') AS timezone,COALESCE(p.grace_minutes,0) AS "graceMinutes",COALESCE(p.availability_sync_enabled,true) AS "availabilitySyncEnabled",COALESCE(p.busy_calendar_ids,'{}') AS "busyCalendarIds",p.write_calendar_id AS "writeCalendarId",EXISTS(SELECT 1 FROM planning.connection c WHERE c.store_id=m.organization_id AND c.user_id=u.id AND c.provider='google' AND c.healthy) AS "googleConnected",EXISTS(SELECT 1 FROM planning.connection c WHERE c.store_id=m.organization_id AND c.user_id=u.id AND c.provider='zoom' AND c.healthy) AS "zoomConnected" FROM public.member m JOIN public."user" u ON u.id=m.user_id LEFT JOIN planning.provider p ON p.store_id=m.organization_id AND p.user_id=u.id LEFT JOIN public.organization_settings os ON os.organization_id=m.organization_id WHERE m.organization_id=$1 ORDER BY u.name`,
     [context.organizationId]
   )
 }
@@ -48,6 +48,7 @@ export async function ownSettings(event: H3Event) {
     enabled: boolean
     timezone: string
     grace_minutes: number
+    availability_sync_enabled: boolean
     availability_calendar_title: string
     busy_calendar_ids: string[]
     write_calendar_id: string | null
@@ -69,6 +70,7 @@ export async function ownSettings(event: H3Event) {
     enabled: p!.enabled,
     timezone: p!.timezone,
     graceMinutes: p!.grace_minutes,
+    availabilitySyncEnabled: p!.availability_sync_enabled,
     availabilityCalendarTitle: p!.availability_calendar_title,
     busyCalendarIds: p!.busy_calendar_ids,
     writeCalendarId: p!.write_calendar_id,
@@ -89,7 +91,7 @@ export async function saveOwnSettings(event: H3Event, body: unknown) {
   await transaction(async (tx) => {
     await lockProvider(tx, userId)
     await tx.query(
-      'UPDATE planning.provider SET timezone=$3,grace_minutes=$4,busy_calendar_ids=$5,write_calendar_id=$6,availability_calendar_title=$7 WHERE store_id=$1 AND user_id=$2',
+      'UPDATE planning.provider SET timezone=$3,grace_minutes=$4,busy_calendar_ids=$5,write_calendar_id=$6,availability_calendar_title=$7,availability_sync_enabled=$8 WHERE store_id=$1 AND user_id=$2',
       [
         storeId,
         userId,
@@ -97,12 +99,21 @@ export async function saveOwnSettings(event: H3Event, body: unknown) {
         input.graceMinutes,
         [...new Set([...input.busyCalendarIds, input.writeCalendarId])],
         input.writeCalendarId,
-        input.availabilityCalendarTitle
+        input.availabilityCalendarTitle,
+        input.availabilitySyncEnabled
       ]
     )
+    const today = localParts(new Date(), input.timezone).date
     const windows = await rows<{ id: string; revision: number }>(
-      "UPDATE planning.availability SET data=jsonb_set(data,'{timezone}',to_jsonb($3::text)),revision=revision+1 WHERE store_id=$1 AND user_id=$2 RETURNING id,revision",
-      [storeId, userId, input.timezone],
+      `UPDATE planning.availability
+       SET data=jsonb_set(data,'{timezone}',to_jsonb($3::text)),revision=revision+1
+       WHERE store_id=$1 AND user_id=$2
+         AND ($4::boolean IS FALSE OR (NOT deleted AND (
+           data->>'date'>=$5 OR
+           (data->>'recurring'='true' AND (data->>'endDate' IS NULL OR data->>'endDate'>=$5))
+         )))
+       RETURNING id,revision`,
+      [storeId, userId, input.timezone, input.availabilitySyncEnabled, today],
       tx
     )
     for (const w of windows) {

package/shared/types.ts

@@ -80,6 +80,7 @@ export interface ProviderSettings {
   enabled: boolean
   timezone: string
   graceMinutes: number
+  availabilitySyncEnabled: boolean
   availabilityCalendarTitle: string
   busyCalendarIds: string[]
   writeCalendarId: string | null

package/shared/validation.ts

@@ -35,6 +35,7 @@ export const availabilitySchema = z.object(availabilityShape).superRefine(valida
 export const providerSettingsSchema = z.object({
   timezone: timezoneSchema,
   graceMinutes: z.number().int().min(0).max(1440),
+  availabilitySyncEnabled: z.boolean().default(true),
   availabilityCalendarTitle: z.string().trim().min(1).max(100),
   busyCalendarIds: z.array(z.string().min(1).max(500)).max(20),
   writeCalendarId: z.string().min(1).max(500)