@nextsparkjs/core 0.1.0-beta.128 → 0.1.0-beta.129

package/dist/templates/app/api/v1/billing/cancel/route.ts

@@ -51,7 +51,7 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
 
   // 3. Permission check using MembershipService
   const membership = await MembershipService.get(authResult.user.id, teamId)
-  const actionResult = membership.canPerformAction('billing.cancel')
+  const actionResult = membership.canPerformAction('team.billing.manage')
 
   if (!actionResult.allowed) {
     return NextResponse.json(

package/dist/templates/app/api/v1/billing/change-plan/route.ts

@@ -49,7 +49,7 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
 
   // 3. Permission check using MembershipService
   const membership = await MembershipService.get(authResult.user.id, teamId)
-  const actionResult = membership.canPerformAction('billing.change-plan')
+  const actionResult = membership.canPerformAction('team.billing.manage')
 
   if (!actionResult.allowed) {
     return NextResponse.json(

package/dist/templates/app/api/v1/billing/check-action/route.ts

@@ -11,7 +11,7 @@
 
 import { NextRequest, NextResponse } from 'next/server'
 import { authenticateRequest, createAuthError } from '@nextsparkjs/core/lib/api/auth/dual-auth'
-import { MembershipService } from '@nextsparkjs/core/lib/services'
+import { SubscriptionService } from '@nextsparkjs/core/lib/services'
 import { z } from 'zod'
 import { withRateLimitTier } from '@nextsparkjs/core/lib/api/rate-limit'
 
@@ -69,11 +69,12 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
     )
   }
 
-  // 4. Check action permission using MembershipService
-  // Note: MembershipService.get() does NOT throw for non-members
-  // It returns TeamMembership with role: null
-  const membership = await MembershipService.get(authResult.user.id, teamId)
-  const result = membership.canPerformAction(action)
+  // 4. Check action using SubscriptionService (RBAC + features + quotas)
+  const result = await SubscriptionService.canPerformAction(
+    authResult.user.id,
+    teamId,
+    action
+  )
 
   return NextResponse.json({
     success: true,

package/dist/templates/app/api/v1/billing/checkout/route.ts

@@ -69,7 +69,7 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
 
   // 4. Permission check using MembershipService
   const membership = await MembershipService.get(authResult.user.id, teamId)
-  const actionResult = membership.canPerformAction('billing.checkout')
+  const actionResult = membership.canPerformAction('team.billing.manage')
 
   if (!actionResult.allowed) {
     return NextResponse.json(
@@ -83,16 +83,44 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
     )
   }
 
-  // 5. Check existing subscription for customer ID
+  // 5. Check existing subscription
   try {
-    const subscription = await SubscriptionService.getActive(teamId)
+    const subscription = await SubscriptionService.getActive(teamId, authResult.user.id)
 
-    // Build URLs
+    // If already subscribed with an active provider subscription,
+    // use changePlan (immediate proration) instead of creating a new checkout.
+    // This prevents double-billing by updating the existing subscription in Stripe.
+    if (subscription?.externalSubscriptionId) {
+      const result = await SubscriptionService.changePlan(
+        teamId,
+        planSlug,
+        billingPeriod,
+        authResult.user.id
+      )
+
+      if (!result.success) {
+        return NextResponse.json(
+          { success: false, error: result.error },
+          { status: 400 }
+        )
+      }
+
+      // No redirect needed — plan changed immediately via API
+      return NextResponse.json({
+        success: true,
+        data: {
+          changed: true,
+          subscription: result.subscription,
+          warnings: result.downgradeWarnings,
+        }
+      })
+    }
+
+    // No existing provider subscription — create a new checkout session
     const appUrl = process.env.NEXT_PUBLIC_APP_URL || 'http://localhost:5173'
     const successUrl = `${appUrl}/dashboard/settings/billing?success=true`
     const cancelUrl = `${appUrl}/dashboard/settings/billing?canceled=true`
 
-    // Create checkout session via billing gateway
     const session = await getBillingGateway().createCheckoutSession({
       teamId,
       planSlug,
@@ -111,11 +139,11 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
       }
     })
   } catch (error) {
-    console.error('[checkout] Error creating checkout session:', error)
+    console.error('[checkout] Error:', error)
     return NextResponse.json(
       {
         success: false,
-        error: error instanceof Error ? error.message : 'Failed to create checkout session'
+        error: error instanceof Error ? error.message : 'Failed to process checkout'
       },
       { status: 500 }
     )

package/dist/templates/app/api/v1/billing/portal/route.ts

@@ -38,7 +38,7 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
 
   // 3. Permission check using MembershipService
   const membership = await MembershipService.get(authResult.user.id, teamId)
-  const actionResult = membership.canPerformAction('billing.portal')
+  const actionResult = membership.canPerformAction('team.billing.manage')
 
   if (!actionResult.allowed) {
     return NextResponse.json(

package/dist/templates/app/dashboard/settings/billing/page.tsx

@@ -18,6 +18,7 @@ import { sel } from '@nextsparkjs/core/selectors'
 import { useTranslations } from 'next-intl'
 import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
 import { useInvoices } from '@nextsparkjs/core/hooks/useInvoices'
+import { useSubscription } from '@nextsparkjs/core/hooks/useSubscription'
 import { InvoicesTable } from '@nextsparkjs/core/components/billing'
 import { usePermission } from '@nextsparkjs/core/lib/permissions/hooks'
 import type { Permission } from '@nextsparkjs/core/lib/permissions/types'
@@ -25,9 +26,11 @@ import type { Permission } from '@nextsparkjs/core/lib/permissions/types'
 function BillingPage() {
   const router = useRouter()
   const canAccessBilling = usePermission('settings.billing' as Permission)
+  const { planSlug, plan, isActive, isReady } = useSubscription()
   const [statusMessage, setStatusMessage] = useState('')
-  const [invoicesLimit, setInvoicesLimit] = useState(3) // Start with 3, load 10 more each time
+  const [invoicesLimit, setInvoicesLimit] = useState(3)
   const t = useTranslations('settings')
+  const tb = useTranslations('billing')
 
   // Fetch invoices for current team (must be before early return)
   const {
@@ -107,7 +110,9 @@ function BillingPage() {
                   {t('billing.currentPlan.description')}
                 </CardDescription>
               </div>
-              <Badge variant="secondary">{t('billing.currentPlan.free')}</Badge>
+              <Badge variant={isActive ? 'default' : 'secondary'}>
+                {isReady && planSlug ? tb(`plans.${planSlug}.name`) : t('billing.currentPlan.free')}
+              </Badge>
             </div>
           </CardHeader>
           <CardContent>
@@ -136,7 +141,7 @@ function BillingPage() {
                     {t('billing.upgrade.description')}
                   </p>
                 </div>
-                  <Link href="/pricing">
+                  <Link href="/dashboard/settings/plans">
                     <Button
                       onClick={handleUpgrade}
                       data-cy={sel('settings.billing.currentPlan.upgradeButton')}
@@ -263,7 +268,7 @@ function BillingPage() {
                 </p>
               </div>
               <div className="flex gap-3">
-                <Link href="/pricing">
+                <Link href="/dashboard/settings/plans">
                   <Button variant="outline">
                     {t('billing.upgrade.viewPricing')}
                   </Button>

package/dist/templates/app/dashboard/settings/plans/page.tsx

@@ -1,10 +1,11 @@
 'use client'
 
-import { useCallback } from 'react'
+import { useCallback, useState } from 'react'
 import { useTranslations } from 'next-intl'
 import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
 import { PricingTable } from '@nextsparkjs/core/components/billing'
-import { useRouter } from 'next/navigation'
+import { fetchWithTeam } from '@nextsparkjs/core/lib/api/entities'
+import { toast } from 'sonner'
 
 /**
  * Plans Settings Page
@@ -14,12 +15,33 @@ import { useRouter } from 'next/navigation'
  */
 function PlansPage() {
   const t = useTranslations('settings')
-  const router = useRouter()
+  const [loading, setLoading] = useState<string | null>(null)
 
-  const handleSelectPlan = useCallback((planSlug: string) => {
-    // Redirect to checkout API with selected plan
-    router.push(`/api/v1/billing/checkout?plan=${planSlug}`)
-  }, [router])
+  const handleSelectPlan = useCallback(async (planSlug: string) => {
+    setLoading(planSlug)
+    try {
+      const res = await fetchWithTeam('/api/v1/billing/checkout', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ planSlug, billingPeriod: 'monthly' }),
+      })
+      const data = await res.json()
+      if (data.success && data.data?.url) {
+        // New subscription — redirect to provider checkout
+        window.location.href = data.data.url
+      } else if (data.success && data.data?.changed) {
+        // Plan changed via proration (existing subscription)
+        toast.success('Plan changed successfully')
+        window.location.reload()
+      } else {
+        toast.error(data.error || 'Failed to process plan change')
+      }
+    } catch {
+      toast.error('Failed to start checkout')
+    } finally {
+      setLoading(null)
+    }
+  }, [])
 
   return (
     <div className="max-w-6xl" data-cy="plans-settings-main">

package/dist/templates/blocks/hero/component.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { Button } from '@/core/components/ui/button'
 import { cn } from '@/core/lib/utils'
-import { buildSectionClasses } from '@/core/types/blocks'
+import { buildSectionClasses, resolveMediaUrl } from '@/core/types/blocks'
 import type { HeroBlockProps } from './schema'
 
 /**
@@ -43,6 +43,9 @@ export function HeroBlock({
   // Handle legacy subtitle/description props for backward compatibility
   const displayContent = content || legacyProps.subtitle || legacyProps.description
 
+  // Resolve media ref to URL (handles both legacy string and new object format)
+  const backgroundImageUrl = resolveMediaUrl(backgroundImage)
+
   // Build section classes with background and custom className
   const sectionClasses = buildSectionClasses(
     cn(
@@ -55,11 +58,11 @@ export function HeroBlock({
   return (
     <section id={id} className={sectionClasses} data-cy="block-hero">
       {/* Background Image */}
-      {backgroundImage && (
+      {backgroundImageUrl && (
         <div
           className="absolute inset-0 z-0"
           style={{
-            backgroundImage: `url(${backgroundImage})`,
+            backgroundImage: `url(${backgroundImageUrl})`,
             backgroundSize: 'cover',
             backgroundPosition: 'center',
           }}

package/dist/templates/blocks/hero/schema.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import {
   baseBlockSchema,
+  mediaRefSchema,
   type BaseBlockProps,
 } from '@/core/types/blocks'
 
@@ -16,7 +17,7 @@ import {
  */
 export const heroSpecificSchema = z.object({
   // Hero-specific design fields
-  backgroundImage: z.string().url('Must be a valid URL').optional(),
+  backgroundImage: mediaRefSchema.optional(),
   textColor: z.enum(['light', 'dark']).default('light'),
 })
 

package/dist/templates/blocks/testimonials/component.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { Quote } from 'lucide-react'
 import { Avatar, AvatarFallback, AvatarImage } from '@/core/components/ui/avatar'
 import { cn } from '@/core/lib/utils'
-import { buildSectionClasses } from '@/core/types/blocks'
+import { buildSectionClasses, resolveMediaUrl } from '@/core/types/blocks'
 import type { TestimonialsBlockProps, TestimonialItem } from './schema'
 
 /**
@@ -77,7 +77,7 @@ export function TestimonialsBlock({
 
               <div className="flex items-center gap-3">
                 <Avatar>
-                  <AvatarImage src={item.avatar} alt={item.author} />
+                  <AvatarImage src={resolveMediaUrl(item.avatar)} alt={item.author} />
                   <AvatarFallback>
                     {item.author.split(' ').map((n: string) => n[0]).join('')}
                   </AvatarFallback>

package/dist/templates/blocks/testimonials/schema.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { baseBlockSchema } from '@/core/types/blocks'
+import { baseBlockSchema, mediaRefSchema } from '@/core/types/blocks'
 
 /**
  * Testimonial Item Schema
@@ -9,7 +9,7 @@ const testimonialItemSchema = z.object({
   quote: z.string().min(1, 'Quote is required').max(500),
   author: z.string().min(1, 'Author name is required').max(100),
   role: z.string().max(100).optional(),
-  avatar: z.string().url('Must be a valid URL').optional(),
+  avatar: mediaRefSchema.optional(),
 })
 
 export type TestimonialItem = z.infer<typeof testimonialItemSchema>

package/dist/templates/features/pages/blocks/hero/component.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { Button } from '@nextsparkjs/core/components/ui/button'
 import { cn } from '@nextsparkjs/core/lib/utils'
-import { buildSectionClasses } from '@nextsparkjs/core/types/blocks'
+import { buildSectionClasses, resolveMediaUrl } from '@nextsparkjs/core/types/blocks'
 import { sel } from '../../lib/selectors'
 import type { HeroBlockProps } from './schema'
 
@@ -45,6 +45,9 @@ export function HeroBlock({
   // Handle legacy subtitle/description props for backward compatibility
   const displayContent = content || legacyProps.subtitle || legacyProps.description
 
+  // Resolve media ref to URL (handles both legacy string and new object format)
+  const backgroundImageUrl = resolveMediaUrl(backgroundImage)
+
   // Alignment classes mapping
   const alignmentClasses = {
     left: 'text-left items-start',
@@ -64,11 +67,11 @@ export function HeroBlock({
   return (
     <section id={id} className={sectionClasses} data-cy={sel('blocks.hero.container')}>
       {/* Background Image */}
-      {backgroundImage && (
+      {backgroundImageUrl && (
         <div
           className="absolute inset-0 z-0"
           style={{
-            backgroundImage: `url(${backgroundImage})`,
+            backgroundImage: `url(${backgroundImageUrl})`,
             backgroundSize: 'cover',
             backgroundPosition: 'center',
           }}

package/dist/templates/features/pages/blocks/hero/schema.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import {
   baseBlockSchema,
+  mediaRefSchema,
   type BaseBlockProps,
 } from '@nextsparkjs/core/types/blocks'
 
@@ -17,7 +18,7 @@ import {
  */
 export const heroSpecificSchema = z.object({
   // Hero-specific design fields
-  backgroundImage: z.string().url('Must be a valid URL').optional(),
+  backgroundImage: mediaRefSchema.optional(),
   textColor: z.enum(['light', 'dark']).default('light'),
   alignment: z.enum(['left', 'center', 'right']).default('center'),
 })

package/dist/types/blocks.d.ts

@@ -5,6 +5,30 @@
  * Supports WordPress/Webflow-style page building with reusable blocks.
  */
 import { z } from 'zod';
+/**
+ * Media Reference Schema
+ *
+ * Blocks can store media references in two formats:
+ * - Legacy: plain URL string (backward compatible)
+ * - New: object with mediaId + url (enables future URL re-resolution)
+ *
+ * Use `resolveMediaUrl()` in components to safely extract the URL from either format.
+ */
+export declare const mediaRefObjectSchema: z.ZodObject<{
+    mediaId: z.ZodString;
+    url: z.ZodString;
+}, z.core.$strip>;
+export declare const mediaRefSchema: z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+    mediaId: z.ZodString;
+    url: z.ZodString;
+}, z.core.$strip>]>;
+export type MediaRef = z.infer<typeof mediaRefSchema>;
+export type MediaRefObject = z.infer<typeof mediaRefObjectSchema>;
+/**
+ * Resolve a MediaRef value to a plain URL string.
+ * Handles both legacy string URLs and new { mediaId, url } objects.
+ */
+export declare function resolveMediaUrl(ref: MediaRef | null | undefined): string | undefined;
 /**
  * CTA (Call-to-Action) Schema
  * Used for buttons/links in Content tab

package/dist/types/blocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../src/types/blocks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../src/types/blocks.ts"],"names":[],"mappings":"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"}

package/dist/types/blocks.js

@@ -1,4 +1,17 @@
 import { z } from "zod";
+const mediaRefObjectSchema = z.object({
+  mediaId: z.string(),
+  url: z.string()
+});
+const mediaRefSchema = z.union([
+  z.string(),
+  mediaRefObjectSchema
+]);
+function resolveMediaUrl(ref) {
+  if (!ref) return void 0;
+  if (typeof ref === "string") return ref || void 0;
+  return ref.url || void 0;
+}
 const ctaSchema = z.object({
   text: z.string().min(1, "CTA text is required"),
   link: z.string().url("Must be a valid URL").or(z.string().startsWith("/")),
@@ -199,5 +212,8 @@ export {
   getBackgroundClasses,
   getSectionAttributes,
   isBlockConfig,
-  isBlockInstance
+  isBlockInstance,
+  mediaRefObjectSchema,
+  mediaRefSchema,
+  resolveMediaUrl
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextsparkjs/core",
-  "version": "0.1.0-beta.128",
+  "version": "0.1.0-beta.129",
   "description": "NextSpark - The complete SaaS framework for Next.js",
   "license": "MIT",
   "author": "NextSpark <hello@nextspark.dev>",
@@ -462,7 +462,7 @@
     "tailwind-merge": "^3.3.1",
     "uuid": "^13.0.0",
     "zod": "^4.1.5",
-    "@nextsparkjs/testing": "0.1.0-beta.128"
+    "@nextsparkjs/testing": "0.1.0-beta.129"
   },
   "scripts": {
     "postinstall": "node scripts/postinstall.mjs || true",

package/templates/app/api/v1/billing/cancel/route.ts

@@ -51,7 +51,7 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
 
   // 3. Permission check using MembershipService
   const membership = await MembershipService.get(authResult.user.id, teamId)
-  const actionResult = membership.canPerformAction('billing.cancel')
+  const actionResult = membership.canPerformAction('team.billing.manage')
 
   if (!actionResult.allowed) {
     return NextResponse.json(

package/templates/app/api/v1/billing/change-plan/route.ts

@@ -49,7 +49,7 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
 
   // 3. Permission check using MembershipService
   const membership = await MembershipService.get(authResult.user.id, teamId)
-  const actionResult = membership.canPerformAction('billing.change-plan')
+  const actionResult = membership.canPerformAction('team.billing.manage')
 
   if (!actionResult.allowed) {
     return NextResponse.json(

package/templates/app/api/v1/billing/check-action/route.ts

@@ -11,7 +11,7 @@
 
 import { NextRequest, NextResponse } from 'next/server'
 import { authenticateRequest, createAuthError } from '@nextsparkjs/core/lib/api/auth/dual-auth'
-import { MembershipService } from '@nextsparkjs/core/lib/services'
+import { SubscriptionService } from '@nextsparkjs/core/lib/services'
 import { z } from 'zod'
 import { withRateLimitTier } from '@nextsparkjs/core/lib/api/rate-limit'
 
@@ -69,11 +69,12 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
     )
   }
 
-  // 4. Check action permission using MembershipService
-  // Note: MembershipService.get() does NOT throw for non-members
-  // It returns TeamMembership with role: null
-  const membership = await MembershipService.get(authResult.user.id, teamId)
-  const result = membership.canPerformAction(action)
+  // 4. Check action using SubscriptionService (RBAC + features + quotas)
+  const result = await SubscriptionService.canPerformAction(
+    authResult.user.id,
+    teamId,
+    action
+  )
 
   return NextResponse.json({
     success: true,

package/templates/app/api/v1/billing/checkout/route.ts

@@ -69,7 +69,7 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
 
   // 4. Permission check using MembershipService
   const membership = await MembershipService.get(authResult.user.id, teamId)
-  const actionResult = membership.canPerformAction('billing.checkout')
+  const actionResult = membership.canPerformAction('team.billing.manage')
 
   if (!actionResult.allowed) {
     return NextResponse.json(
@@ -83,16 +83,44 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
     )
   }
 
-  // 5. Check existing subscription for customer ID
+  // 5. Check existing subscription
   try {
-    const subscription = await SubscriptionService.getActive(teamId)
+    const subscription = await SubscriptionService.getActive(teamId, authResult.user.id)
 
-    // Build URLs
+    // If already subscribed with an active provider subscription,
+    // use changePlan (immediate proration) instead of creating a new checkout.
+    // This prevents double-billing by updating the existing subscription in Stripe.
+    if (subscription?.externalSubscriptionId) {
+      const result = await SubscriptionService.changePlan(
+        teamId,
+        planSlug,
+        billingPeriod,
+        authResult.user.id
+      )
+
+      if (!result.success) {
+        return NextResponse.json(
+          { success: false, error: result.error },
+          { status: 400 }
+        )
+      }
+
+      // No redirect needed — plan changed immediately via API
+      return NextResponse.json({
+        success: true,
+        data: {
+          changed: true,
+          subscription: result.subscription,
+          warnings: result.downgradeWarnings,
+        }
+      })
+    }
+
+    // No existing provider subscription — create a new checkout session
     const appUrl = process.env.NEXT_PUBLIC_APP_URL || 'http://localhost:5173'
     const successUrl = `${appUrl}/dashboard/settings/billing?success=true`
     const cancelUrl = `${appUrl}/dashboard/settings/billing?canceled=true`
 
-    // Create checkout session via billing gateway
     const session = await getBillingGateway().createCheckoutSession({
       teamId,
       planSlug,
@@ -111,11 +139,11 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
       }
     })
   } catch (error) {
-    console.error('[checkout] Error creating checkout session:', error)
+    console.error('[checkout] Error:', error)
     return NextResponse.json(
       {
         success: false,
-        error: error instanceof Error ? error.message : 'Failed to create checkout session'
+        error: error instanceof Error ? error.message : 'Failed to process checkout'
       },
       { status: 500 }
     )

package/templates/app/api/v1/billing/portal/route.ts

@@ -38,7 +38,7 @@ export const POST = withRateLimitTier(async (request: NextRequest) => {
 
   // 3. Permission check using MembershipService
   const membership = await MembershipService.get(authResult.user.id, teamId)
-  const actionResult = membership.canPerformAction('billing.portal')
+  const actionResult = membership.canPerformAction('team.billing.manage')
 
   if (!actionResult.allowed) {
     return NextResponse.json(