@nuxt-customer-portal/planning 0.4.5 → 0.4.7

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 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
+
+- Allow authenticated Google Calendar channel notifications through the public webhook boundary, retain provider-returned availability event IDs, expose those IDs in synchronization diagnostics, and remove the planning policy lint warning.
+- Updated dependencies
+  - @nuxt-customer-portal/core@0.4.6
+  - @nuxt-customer-portal/products@0.4.6
+  - @nuxt-customer-portal/ui@0.4.6
+
 ## 0.4.5
 
 ### Patch Changes

package/app/components/PlanningPersonalCalendarSettings.vue

@@ -46,7 +46,23 @@ async function load() {
       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')

package/app/components/PlanningPolicyFields.vue

@@ -10,17 +10,16 @@ const props = withDefaults(defineProps<{ prefix?: string; currencies?: string[];
   compact: false
 })
 const { t } = useI18n()
-const numeric = [
-  'reservationMinutes',
-  'slotIntervalMinutes',
-  'displayIntervalMinutes',
-  'bookingHorizonDays',
-  'minimumNoticeMinutes',
-  'freeChanges',
-  'rescheduleCutoffMinutes',
-  'cancellationCutoffMinutes',
-  'refundPercentage'
-] as const
+type NumericPolicyKey =
+  | 'reservationMinutes'
+  | 'slotIntervalMinutes'
+  | 'displayIntervalMinutes'
+  | 'bookingHorizonDays'
+  | 'minimumNoticeMinutes'
+  | 'freeChanges'
+  | 'rescheduleCutoffMinutes'
+  | 'cancellationCutoffMinutes'
+  | 'refundPercentage'
 const groups = [
   {
     key: 'schedule',
@@ -70,7 +69,7 @@ if (overrides.value !== undefined) {
   }
   overrides.value = next
 }
-function setNumber(key: (typeof numeric)[number], value: number | null | undefined) {
+function setNumber(key: NumericPolicyKey, value: number | null | undefined) {
   state.value = { ...state.value, [key]: value ?? 0 }
 }
 function setFee(currency: string, value: number | null | undefined) {

package/app/components/PlanningSettingsSynchronization.vue

@@ -375,6 +375,11 @@ useAutoPagination({
               <UIcon name="i-lucide-calendar" class="size-4 shrink-0" />
               <span class="truncate">{{ job.entity.calendarId || t('planning.noDestinationCalendar') }}</span>
             </p>
+            <p v-if="job.entity.calendarEventId" class="flex min-w-0 items-center gap-2 sm:col-span-2">
+              <UIcon name="i-lucide-fingerprint" class="size-4 shrink-0" />
+              <span class="shrink-0">{{ t('planning.calendarEventId') }}:</span>
+              <code class="truncate text-xs" :title="job.entity.calendarEventId">{{ job.entity.calendarEventId }}</code>
+            </p>
           </div>
           <div
             v-else-if="job.entity?.type === 'appointment'"

package/app/composables/usePlanning.ts

@@ -99,6 +99,7 @@ export interface PlanningJobListItem {
         providerName: string
         providerEmail: string
         calendarId: string | null
+        calendarEventId: string | null
         date: string
         endDate: string | null
         startTime: string

package/i18n/locales/en.json

@@ -146,6 +146,7 @@
     "jobAllProducts": "All products",
     "noProducts": "No products",
     "noDestinationCalendar": "No destination calendar selected",
+    "calendarEventId": "Google event ID",
     "synchronizationPages": "Synchronization task pages",
     "jobKinds": {
       "appointment": "Appointment synchronization",

package/i18n/locales/nl.json

@@ -146,6 +146,7 @@
     "jobAllProducts": "Alle producten",
     "noProducts": "Geen producten",
     "noDestinationCalendar": "Geen doelagenda geselecteerd",
+    "calendarEventId": "Google-afspraak-ID",
     "synchronizationPages": "Pagina's met synchronisatietaken",
     "jobKinds": {
       "appointment": "Afspraaksynchronisatie",

package/package.json

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

package/portal.manifest.mjs

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

package/server/api/planning/admin/jobs.get.ts

@@ -130,6 +130,7 @@ export default defineEventHandler(async (event) => {
       providerName: string
       providerEmail: string
       calendarId: string | null
+      calendarEventId: string | null
       data: {
         date: string
         endDate: string | null
@@ -142,7 +143,7 @@ export default defineEventHandler(async (event) => {
       productTitles: string[]
     }>(
       `SELECT a.id::text AS id,u.name AS "providerName",u.email AS "providerEmail",
-        p.write_calendar_id AS "calendarId",a.data,
+        COALESCE(a.calendar_id,p.write_calendar_id) AS "calendarId",a.calendar_event_id AS "calendarEventId",a.data,
         COALESCE((
           SELECT array_agg(COALESCE(NULLIF(product.data->'content'->'en'->>'title',''),product.data->'content'->'nl'->>'title',product.id) ORDER BY product.id)
           FROM products.product product
@@ -175,6 +176,7 @@ export default defineEventHandler(async (event) => {
         providerName: entity.providerName,
         providerEmail: entity.providerEmail,
         calendarId: entity.calendarId,
+        calendarEventId: entity.calendarEventId,
         date: entity.data.date,
         endDate: entity.data.endDate,
         startTime: entity.data.startTime,

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

@@ -353,9 +353,18 @@ async function availabilityEffects(id: string) {
   }
   await rows('UPDATE planning.availability SET calendar_event_id=$2,calendar_id=$3 WHERE id=$1', [
     id,
-    eventId,
+    written?.id || eventId,
     provider.write_calendar_id
   ])
+  if (written?.wasMissing || written?.externalChangeKey) {
+    console.info('Planning availability synchronized', {
+      availabilityId: id,
+      calendarId: provider.write_calendar_id,
+      calendarEventId: written.id,
+      revision: window.revision,
+      result: written.externalChangeKey ? 'external-change-repaired' : 'event-created'
+    })
+  }
 }
 async function refund(orderId: string, amount: number, key: string) {
   const order = await getOrder(orderId)