chore: use scoped server pattern in tiered-usage-gated-subscripiton

tiered-usage-gated-subscription/README.md

@@ -26,7 +26,6 @@ This project demonstrates the "Tiered Usage-Gated Subscription Template Pricing
 - Node.js >= 18.18.0
 - Bun >= 1.3.1
 - PostgreSQL database (or Docker to run the included `docker-compose.yml`)
-- `yalc` (for linking local Flowglad packages) - Install globally with `npm install -g yalc` or `bun install -g yalc`
 
 ## Getting Started
 
@@ -44,39 +43,14 @@ This will enable all the subscription plans, usage meters, and features defined
 
 ### 2. Install Dependencies
 
-**Important:** This project is part of a monorepo. You must install dependencies from the root of the monorepo first, then navigate into this example directory.
-
-From the root of the monorepo:
+Navigate into this project directory and install dependencies:
 
 ```bash
+cd tiered-usage-gated-subscription
 bun install
 ```
 
-Then navigate into this example directory:
-
-```bash
-cd examples/tiered-usage-gated-subscription
-```
-
-### 3. Link Flowglad Packages
-
-This example project uses `yalc` to link local Flowglad packages for development. You must link the packages before running the project:
-
-```bash
-bun run link:packages
-```
-
-This command will:
-- Add Flowglad packages to yalc's local registry
-- Link them into this project's `node_modules`
-- Update dependencies
-
-**Note:** If you need to unlink packages later (e.g., to use published npm packages), run:
-```bash
-bun run unlink:packages
-```
-
-### 4. Set Up Environment Variables
+### 3. Set Up Environment Variables
 
 Copy the example environment file:
 
@@ -95,7 +69,7 @@ Fill in the required values in `.env.local`:
 - **`FLOWGLAD_SECRET_KEY`** - Secret key for Flowglad API calls
   - Get your secret key from: [https://flowglad.com](https://flowglad.com)
 
-### 5. Set Up Database
+### 4. Set Up Database
 
 If you don't have a PostgreSQL database available, you can use the included `docker-compose.yml` file to spin up a local PostgreSQL instance:
 
@@ -124,7 +98,7 @@ docker-compose down
 
 **Note:** If you already have a PostgreSQL database, you can skip this step and use your existing database connection string instead.
 
-### 6. Run Database Migrations
+### 5. Run Database Migrations
 
 Generate and run database migrations:
 
@@ -133,7 +107,7 @@ bun db:generate
 bun db:migrate
 ```
 
-### 7. Start Development Server
+### 6. Start Development Server
 
 ```bash
 bun dev
@@ -152,8 +126,6 @@ Open [http://localhost:3000](http://localhost:3000) to see the application.
 - `bun db:generate` - Generate database migrations
 - `bun db:migrate` - Run database migrations
 - `bun db:studio` - Open Drizzle Studio (database GUI)
-- `bun link:packages` - Link local Flowglad packages using yalc (required before first run)
-- `bun unlink:packages` - Unlink Flowglad packages and restore to npm registry versions
 
 ## Project Structure
 

tiered-usage-gated-subscription/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import './.next/dev/types/routes.d.ts';
+/// <reference path="./.next/types/routes.d.ts" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

tiered-usage-gated-subscription/package.json

@@ -17,12 +17,10 @@
     "type-check": "tsc --noEmit",
     "db:generate": "drizzle-kit generate --config=drizzle.config.ts",
     "db:migrate": "drizzle-kit migrate --config=drizzle.config.ts",
-    "db:studio": "drizzle-kit studio --config=drizzle.config.ts",
-    "link:packages": "yalc add @flowglad/nextjs @flowglad/react @flowglad/server @flowglad/shared @flowglad/types && yalc update && bun install --force && yalc update",
-    "unlink:packages": "yalc remove --all && bun install"
+    "db:studio": "drizzle-kit studio --config=drizzle.config.ts"
   },
   "dependencies": {
-    "@flowglad/nextjs": "0.12.3",
+    "@flowglad/nextjs": "0.15.0",
     "@radix-ui/react-dropdown-menu": "^2.1.16",
     "@radix-ui/react-progress": "^1.1.8",
     "@radix-ui/react-slot": "^1.2.3",

tiered-usage-gated-subscription/src/app/api/flowglad/[...path]/route.ts

@@ -1,7 +1,18 @@
-// /api/flowglad/[...path]/route.ts
-import { createAppRouterRouteHandler } from '@flowglad/nextjs/server';
-import { flowgladServer } from '@/lib/flowglad';
+import { nextRouteHandler } from '@flowglad/nextjs/server';
+import { flowglad } from '@/lib/flowglad';
+import { auth } from '@/lib/auth';
+import { headers } from 'next/headers';
 
-const routeHandler = createAppRouterRouteHandler(flowgladServer);
-
-export { routeHandler as GET, routeHandler as POST };
+export const { GET, POST } = nextRouteHandler({
+  flowglad,
+  getCustomerExternalId: async (req) => {
+    const session = await auth.api.getSession({
+      headers: await headers(),
+    });
+    const userId = session?.user?.id;
+    if (!userId) {
+      throw new Error('User not found');
+    }
+    return userId;
+  },
+});

tiered-usage-gated-subscription/src/app/api/usage-events/route.ts

@@ -1,8 +1,10 @@
-import { flowgladServer } from '@/lib/flowglad';
+import { flowglad } from '@/lib/flowglad';
 import {
   findUsagePriceBySlug,
   findUsageMeterBySlug,
 } from '@/lib/billing-helpers';
+import { auth } from '@/lib/auth';
+import { headers } from 'next/headers';
 import { NextResponse } from 'next/server';
 import { z } from 'zod';
 
@@ -54,7 +56,18 @@ export async function POST(request: Request) {
       transactionId ||
       `usage_${Date.now()}_${Math.random().toString(36).substring(7)}`;
 
+    // Get customer ID from session
+    const session = await auth.api.getSession({ headers: await headers() });
+    const userId = session?.user?.id;
+    if (!userId) {
+      return NextResponse.json(
+        { error: 'User not found' },
+        { status: 401 }
+      );
+    }
+
     // Get billing information to extract required IDs
+    const flowgladServer = flowglad(userId);
     const billing = await flowgladServer.getBilling();
 
     if (!billing.customer) {
@@ -83,7 +96,6 @@ export async function POST(request: Request) {
       usageMeterSlug,
       billing.pricingModel
     );
-    console.log(usageMeter);
     if (!usageMeter) {
       return NextResponse.json(
         {
@@ -133,15 +145,10 @@ export async function POST(request: Request) {
       );
     }
 
-    const priceId = usagePrice.id;
-    const usageMeterId = usagePrice.usageMeterId;
-
-    // Create usage event with all required IDs
     // Note: customerId is automatically resolved from the session by FlowgladServer
     const usageEvent = await flowgladServer.createUsageEvent({
       subscriptionId,
-      priceId,
-      usageMeterId,
+      priceSlug,
       amount: amountNumber,
       transactionId: finalTransactionId,
     });