@nuxt-customer-portal/planning 0.6.1 → 0.7.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.7.0
+
+### Patch Changes
+
+- 9ccc48d: Keep Google Calendar connection recovery available after expired or incomplete authorization, validate Calendar permissions before saving a connection, and retain saved availability with a warning when external busy times cannot load.
+- 1d0419c: Add scheduled product discounts and free offers, original catalog prices, and checkout price revalidation.
+- Updated dependencies [1d0419c]
+  - @nuxt-customer-portal/products@0.7.0
+  - @nuxt-customer-portal/core@0.7.0
+  - @nuxt-customer-portal/ui@0.7.0
+
 ## 0.6.1
 
 ### Patch Changes

package/README.md

@@ -115,3 +115,9 @@ Planning settings use separate components for the Team members, Booking policy,
 Personal connections and preferences are managed under My appointment settings (`/planning/settings`): Calendar settings contains Google connection, timezone, grace time, and calendar selection; Meeting settings contains the Zoom connection. Availability (`/availability`) contains only the availability editor and appointment blocks.
 
 Sandbox bookings use internal availability, holds, and appointments without requiring Google or Zoom connections or external calendar conflict checks. Live bookings still require healthy connections and configured calendars.
+
+### Google Calendar authorization recovery
+
+Google OAuth must use the **In production** publishing status for long-lived Calendar authorizations. External OAuth apps in **Testing** receive refresh tokens that expire after seven days when Calendar scopes are requested. After changing publishing status, reconnect and grant all requested Calendar permissions. Revocation or other Google account policies can still require reauthorization. Keep the portal encryption key stable across deployments.
+
+The portal validates Calendar permissions before replacing a connection. Calendar settings retain reconnect, disconnect and retry actions when Google is unavailable or authorization is incomplete. Availability continues showing saved windows and appointments with a warning when external busy times cannot be checked. This warning does not make external conflicts safe to ignore; booking checks still require working Calendar access.

package/app/components/PlanningPersonalCalendarSettings.vue

@@ -2,12 +2,15 @@
 import { providerSettingsSchema } from '../../shared/validation'
 
 const api = usePlanning(),
-  { t } = useI18n()
+  { t } = useI18n(),
+  route = useRoute()
 const calendars = ref<Array<{ id: string; summary: string; accessRole: string }>>([]),
   error = ref(''),
   busy = ref(false),
   ready = ref(false),
-  googleConnected = ref(false)
+  googleConnected = ref(false),
+  hasConnection = ref(false),
+  calendarsLoaded = ref(false)
 const providerState = reactive({
   timezone: 'Europe/Amsterdam',
   graceMinutes: 0,
@@ -35,8 +38,11 @@ const additionalCalendarIds = computed({
 
 async function load() {
   error.value = ''
+  ready.value = false
+  calendarsLoaded.value = false
   try {
     const settings = await api.provider()
+    hasConnection.value = settings.connections.some((connection) => connection.provider === 'google')
     googleConnected.value = settings.connections.some(
       (connection) => connection.provider === 'google' && connection.healthy
     )
@@ -51,20 +57,30 @@ async function load() {
     if (googleConnected.value) {
       try {
         calendars.value = await api.calendars()
-      } catch (calendarError) {
+        calendarsLoaded.value = true
+      } catch {
         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
+        error.value = t(
+          connectionStillHealthy === false ? 'planning.googleReconnectRequired' : 'planning.googleCalendarUnavailable'
+        )
+        googleConnected.value = connectionStillHealthy !== false
         calendars.value = []
       }
     } else {
       calendars.value = []
     }
+    if (!googleConnected.value && hasConnection.value) {
+      error.value = t('planning.googleReconnectRequired')
+    }
+    const connectionResult = route.query.connection
+    if (connectionResult === 'permissions') {
+      error.value = t('planning.googlePermissionsRequired')
+    } else if (connectionResult === 'error') {
+      error.value = t('planning.googleConnectionError')
+    }
     ready.value = true
   } catch {
     error.value = t('planning.loadError')
@@ -72,6 +88,19 @@ async function load() {
 }
 await load()
 
+async function disconnectGoogle() {
+  busy.value = true
+  error.value = ''
+  try {
+    await api.disconnect('google')
+    await load()
+  } catch {
+    error.value = t('planning.actionError')
+  } finally {
+    busy.value = false
+  }
+}
+
 async function connectMainCalendar() {
   busy.value = true
   error.value = ''
@@ -103,6 +132,16 @@ async function saveSettings() {
   <div class="space-y-6">
     <UAlert v-if="error" :title="error" color="error" variant="outline" />
 
+    <div class="flex flex-wrap gap-2">
+      <UButton :loading="busy" variant="outline" @click="connectMainCalendar">{{ t('planning.connect') }}</UButton>
+      <UButton v-if="hasConnection" :disabled="busy" color="neutral" variant="outline" @click="disconnectGoogle">{{
+        t('planning.disconnect')
+      }}</UButton>
+      <UButton :disabled="busy" color="neutral" variant="ghost" @click="load">{{
+        t('planning.retryConnection')
+      }}</UButton>
+    </div>
+
     <UCard v-if="ready && !googleConnected">
       <template #header>
         <div class="flex items-center gap-3">
@@ -124,7 +163,7 @@ async function saveSettings() {
     </UCard>
 
     <UForm
-      v-else-if="ready"
+      v-else-if="ready && calendarsLoaded"
       :state="providerState"
       :schema="providerSettingsSchema"
       novalidate

package/app/pages/availability.vue

@@ -15,6 +15,7 @@ const api = usePlanning(),
   windows = ref<AvailabilityWindow[]>([]),
   appointments = ref<AppointmentListItem[]>([]),
   externalBusy = ref<CalendarBusyPeriod[]>([]),
+  calendarWarning = ref(''),
   error = ref(''),
   busy = ref(false),
   calendarNavigationDirection = ref<'previous' | 'next'>(),
@@ -227,8 +228,14 @@ async function fetchExternalBusy(targetDays: string[], timezone = calendarTimezo
     '00:00',
     timezone
   )
-  const periods = await api.calendarBusy({ from: from.toISOString(), to: to.toISOString() })
-  return Array.isArray(periods) ? periods : []
+  calendarWarning.value = ''
+  try {
+    const periods = await api.calendarBusy({ from: from.toISOString(), to: to.toISOString() })
+    return Array.isArray(periods) ? periods : []
+  } catch {
+    calendarWarning.value = t('planning.googleBusyUnavailable')
+    return []
+  }
 }
 // Suspend the page setup until the calendar and its external events are ready.
 // This ensures the all-day row has its final layout on the first rendered frame.
@@ -379,6 +386,13 @@ async function removeWindow() {
 <template>
   <div class="h-full min-h-0 overflow-hidden">
     <UContainer class="flex h-full min-h-0 flex-col gap-6 py-8">
+      <UAlert
+        v-if="calendarWarning"
+        :title="calendarWarning"
+        color="warning"
+        variant="outline"
+        :actions="[{ label: t('planning.myAppointmentSettings'), to: '/planning/settings' }]"
+      />
       <div class="flex flex-wrap items-center justify-between gap-3">
         <div class="flex items-start gap-3">
           <UIcon name="i-lucide-calendar-days" class="mt-1 size-6 shrink-0 text-primary" />

package/app/pages/booking/[slug].vue

@@ -88,13 +88,20 @@ useHead({ title: `${t('planning.bookNow')} — ${product.title}`, meta: [{ name:
           </p>
           <div class="order-price">
             <span>{{ t('products.total') }}</span
-            ><strong>{{
-              product.isFree
-                ? t('products.freeProduct')
-                : selectedPrice
-                  ? formatMoney(selectedPrice.amount, selectedPrice.currency, product.locale)
-                  : ''
-            }}</strong>
+            ><span
+              ><del
+                v-if="selectedPrice?.offer && selectedPrice.originalAmount > selectedPrice.amount"
+                class="mr-2 text-sm text-muted"
+                :aria-label="t('products.offers.originalPrice')"
+                >{{ formatMoney(selectedPrice.originalAmount, selectedPrice.currency, product.locale) }}</del
+              ><strong>{{
+                product.isFree
+                  ? t('products.freeProduct')
+                  : selectedPrice
+                    ? formatMoney(selectedPrice.amount, selectedPrice.currency, product.locale)
+                    : ''
+              }}</strong></span
+            >
           </div>
           <UFormField v-if="product.prices.length > 1" :label="t('products.price')" class="mt-5">
             <USelect

package/i18n/locales/en.json

@@ -165,7 +165,6 @@
     "status": "Status",
     "overridePolicySection": "Override this section",
     "time": "Time",
-    "timezone": "Timezone",
     "meetingUrl": "Meeting link",
     "meetingDetails": "Meeting details",
     "instructions": "Instructions after purchase",
@@ -258,6 +257,11 @@
       "past": "Past date",
       "loading": "Loading slots"
     },
-    "slotTimesTimezone": "Times shown in {timezone}"
+    "slotTimesTimezone": "Times shown in {timezone}",
+    "googleReconnectRequired": "Google Calendar access has expired or was revoked. Reconnect and allow all requested Calendar permissions.",
+    "googleCalendarUnavailable": "Google calendars could not be loaded. Retry, reconnect with all Calendar permissions, or disconnect the account.",
+    "googlePermissionsRequired": "Calendar permissions were not granted. Reconnect and allow all requested Calendar permissions. Your previous connection has not been replaced.",
+    "retryConnection": "Retry",
+    "googleBusyUnavailable": "Google Calendar busy times are unavailable. Saved availability is shown, but external conflicts cannot be checked. Open appointment settings to reconnect."
   }
 }

package/i18n/locales/nl.json

@@ -165,7 +165,6 @@
     "status": "Status",
     "overridePolicySection": "Deze sectie overschrijven",
     "time": "Tijd",
-    "timezone": "Tijdzone",
     "meetingUrl": "Vergaderlink",
     "meetingDetails": "Vergadergegevens",
     "instructions": "Instructies na aankoop",
@@ -258,6 +257,11 @@
       "past": "Datum verstreken",
       "loading": "Tijden laden"
     },
-    "slotTimesTimezone": "Tijden weergegeven in {timezone}"
+    "slotTimesTimezone": "Tijden weergegeven in {timezone}",
+    "googleReconnectRequired": "De toegang tot Google Agenda is verlopen of ingetrokken. Verbind opnieuw en geef alle gevraagde agendarechten.",
+    "googleCalendarUnavailable": "Google-agenda’s konden niet worden geladen. Probeer opnieuw, verbind opnieuw met alle agendarechten of verbreek de verbinding.",
+    "googlePermissionsRequired": "De agendarechten zijn niet verleend. Verbind opnieuw en geef alle gevraagde agendarechten. Je vorige verbinding is niet vervangen.",
+    "retryConnection": "Opnieuw proberen",
+    "googleBusyUnavailable": "Bezette tijden uit Google Agenda zijn niet beschikbaar. Je opgeslagen beschikbaarheid wordt getoond, maar externe conflicten kunnen niet worden gecontroleerd. Open je afspraakinstellingen om opnieuw te verbinden."
   }
 }

package/package.json

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

package/portal.manifest.mjs

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

package/server/api/planning/oauth/[provider]/callback.get.ts

@@ -3,16 +3,14 @@ import { finishOAuth, oauthProvider } from '../../../../utils/oauth'
 
 export default defineEventHandler(async (event) => {
   const query = getQuery(event)
+  const provider = oauthProvider(getRouterParam(event, 'provider'))
+  const tab = provider === 'google' ? 'calendar' : 'meeting'
   try {
-    await finishOAuth(
-      event,
-      oauthProvider(getRouterParam(event, 'provider')),
-      String(query.state || ''),
-      String(query.code || '')
-    )
-    return sendRedirect(event, '/planning/settings?tab=meeting&connection=connected', 303)
+    await finishOAuth(event, provider, String(query.state || ''), String(query.code || ''))
+    return sendRedirect(event, `/planning/settings?tab=${tab}&connection=connected`, 303)
   } catch (error) {
     console.error('Planning OAuth callback failed', error)
-    return sendRedirect(event, '/planning/settings?tab=meeting&connection=error', 303)
+    const reason = (error as { data?: { reason?: string } }).data?.reason === 'permissions' ? 'permissions' : 'error'
+    return sendRedirect(event, `/planning/settings?tab=${tab}&connection=${reason}`, 303)
   }
 })

package/server/utils/adapters.ts

@@ -9,6 +9,7 @@ export interface Credentials {
   access_token: string
   refresh_token: string
   expiresAt: number
+  scope?: string
 }
 export interface CalendarEvent {
   id: string
@@ -94,11 +95,17 @@ export async function exchange(provider: 'google' | 'zoom', params: Record<strin
   if (!response.ok) {
     throw new AuthorizationExchangeError(response.status)
   }
-  const value = (await response.json()) as { access_token: string; refresh_token?: string; expires_in: number }
+  const value = (await response.json()) as {
+    access_token: string
+    refresh_token?: string
+    expires_in: number
+    scope?: string
+  }
   if (!value.access_token || !value.expires_in) {
     throw new Error('Invalid authorization response')
   }
   return {
+    scope: value.scope,
     access_token: value.access_token,
     refresh_token: value.refresh_token || params.refresh_token || '',
     expiresAt: Date.now() + value.expires_in * 1000
@@ -174,7 +181,21 @@ async function api<T>(
     }
     let detail = ''
     try {
-      const payload = (await response.json()) as { error?: { message?: string }; message?: string }
+      const payload = (await response.json()) as {
+        error?: { message?: string; status?: string; errors?: Array<{ reason?: string }> }
+        message?: string
+      }
+      if (
+        provider === 'google' &&
+        response.status === 403 &&
+        ((payload.error?.status === 'PERMISSION_DENIED' && /insufficient.*scope/i.test(payload.error.message || '')) ||
+          payload.error?.errors?.some((item) => item.reason === 'insufficientPermissions'))
+      ) {
+        await rows(
+          'UPDATE planning.connection SET healthy=false,error=$4 WHERE store_id=$1 AND user_id=$2 AND provider=$3',
+          [storeId, userId, provider, 'Calendar permissions missing; reconnect']
+        )
+      }
       detail = String(payload.error?.message || payload.message || '')
         .replace(/\s+/g, ' ')
         .trim()

package/server/utils/booking.ts

@@ -6,7 +6,7 @@ import type { z } from 'zod'
 import { rows, transaction } from '@nuxt-customer-portal/products/server/utils/database'
 import { getStore } from '@nuxt-customer-portal/products/server/utils/access'
 import { developmentSandboxEffectsEnabled } from '@nuxt-customer-portal/products/server/utils/development'
-import { getProduct, selectCopy } from '@nuxt-customer-portal/products/server/utils/catalog'
+import { getEffectiveProduct, selectCopy } from '@nuxt-customer-portal/products/server/utils/catalog'
 import { defaultPlanningPolicy, effectivePolicy } from '@nuxt-customer-portal/products/shared/planning'
 import type { Order } from '@nuxt-customer-portal/products/shared/types'
 import type { checkoutSchema } from '@nuxt-customer-portal/products/shared/validation'
@@ -59,7 +59,7 @@ export async function bookingBusy(
   return calendarAdapter().busy(storeId, userId, calendarIds, from, to)
 }
 export async function providers(storeId: string, productId: string) {
-  const product = await getProduct(storeId, productId)
+  const product = await getEffectiveProduct(storeId, productId)
   if (!product.planning?.enabled || product.status !== 'published') {
     throw createError({ statusCode: 404, message: 'This product is not available for booking' })
   }

package/server/utils/oauth.ts

@@ -3,6 +3,7 @@ import { rows } from '@nuxt-customer-portal/products/server/utils/database'
 import { providerAccess } from './access'
 import { oauthConfig, exchange } from './adapters'
 import { digest, secret, encrypt } from './crypto'
+import { googleCalendarScopes, hasGoogleCalendarPermissions } from '../../shared/google-permissions'
 
 export function oauthProvider(value: string | undefined): 'google' | 'zoom' {
   if (value !== 'google' && value !== 'zoom') {
@@ -35,8 +36,7 @@ export async function startOAuth(event: H3Event, provider: 'google' | 'zoom') {
       ? {
           access_type: 'offline',
           prompt: 'consent',
-          scope:
-            'openid email https://www.googleapis.com/auth/calendar.events https://www.googleapis.com/auth/calendar.calendarlist.readonly https://www.googleapis.com/auth/calendar.freebusy'
+          scope: ['openid', 'email', ...googleCalendarScopes].join(' ')
         }
       : {})
   })
@@ -59,6 +59,9 @@ export async function finishOAuth(event: H3Event, provider: 'google' | 'zoom', s
     throw createError({ statusCode: 403, message: 'Authorization expired or belongs to another user' })
   }
   const credentials = await exchange(provider, { grant_type: 'authorization_code', code })
+  if (provider === 'google' && !hasGoogleCalendarPermissions(credentials.scope)) {
+    throw createError({ statusCode: 400, message: 'Calendar permissions required', data: { reason: 'permissions' } })
+  }
   if (!credentials.refresh_token) {
     throw createError({ statusCode: 400, message: 'Offline authorization required; reconnect with consent' })
   }

package/shared/google-permissions.ts

@@ -0,0 +1,16 @@
+const calendar = 'https://www.googleapis.com/auth/calendar'
+export const googleCalendarScopes = [`${calendar}.events`, `${calendar}.calendarlist.readonly`, `${calendar}.freebusy`]
+
+export function hasGoogleCalendarPermissions(scope: string | undefined) {
+  const granted = new Set((scope || '').split(/\s+/))
+  return (
+    granted.has(calendar) ||
+    (granted.has(`${calendar}.events`) &&
+      (granted.has(`${calendar}.calendarlist.readonly`) ||
+        granted.has(`${calendar}.calendarlist`) ||
+        granted.has(`${calendar}.readonly`)) &&
+      (granted.has(`${calendar}.freebusy`) ||
+        granted.has(`${calendar}.events.freebusy`) ||
+        granted.has(`${calendar}.readonly`)))
+  )
+}