fixed stripe

Author: whkelvin

prisma/migrations/20250214022903_added_stripe_id/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "stripe_id" TEXT;

prisma/schema.prisma

@@ -20,6 +20,7 @@ model User {
   sessions                   Session[]
   username                   String
   google_id                  String?
+  stripe_id                  String?
   bridgeUserAndSpecification BridgeUserAndSpecfication[]
   SpecificationSnapshot      SpecificationSnapshot[]
   Workspaces                 BridgeWorkspaceAndUser[]

src/lib/server/services/data/db/dbService.ts

@@ -6,6 +6,7 @@ import {
   encodeHexLowerCase,
 } from "@oslojs/encoding";
 import { sha256 } from "@oslojs/crypto/sha2";
+import { stripeClient } from "$lib/server/services/data/stripeClient";
 
 const ONE_MONTH = 1000 * 60 * 60 * 24 * 30;
 const HALF_MONTH = ONE_MONTH / 2;
@@ -41,6 +42,7 @@ export type SessionValidationResult = {
     email: string;
     uuid: string;
     isSubscribed: boolean;
+    stripeId: string;
   };
 };
 
@@ -103,6 +105,7 @@ export async function validateSessionToken(
       email: user.email,
       username: user.username,
       isSubscribed: userHasSubscription,
+      stripeId: user.stripe_id ?? "",
     },
   };
 
@@ -140,12 +143,20 @@ export async function getOrCreateUser(
       ...user,
     };
   } else {
+    const uuid = crypto.randomUUID();
+    const customer = await stripeClient.customers.create({
+      email: email,
+      metadata: {
+        userId: uuid,
+      },
+    });
     const res: User = await prisma.user.create({
       data: {
         username,
         email,
-        uuid: crypto.randomUUID(),
+        uuid: uuid,
         google_id: googleId,
+        stripe_id: customer.id,
       },
     });
     return {

src/routes/api/stripe/createCheckoutSession/+server.ts

@@ -8,15 +8,8 @@ export async function POST(
   if (!locals.authState?.user.email) {
     return new Response(undefined, { status: 401 });
   }
-  const customerEmail = locals.authState?.user.email;
-  const customer = await stripeClient.customers.create({
-    email: customerEmail,
-    metadata: {
-      userId: locals.authState.user.uuid,
-    },
-  });
   const session = await stripeClient.checkout.sessions.create({
-    customer: customer.id,
+    customer: locals.authState.user.stripeId,
     billing_address_collection: "auto",
     line_items: [
       {
@@ -28,7 +21,6 @@ export async function POST(
     success_url: DOMAIN + `/upgrade?session_id={CHECKOUT_SESSION_ID}`,
     cancel_url: DOMAIN + `/stripe/cancel`,
     client_reference_id: "1",
-    customer_email: customerEmail,
     metadata: {
       userId: locals.authState.user.uuid,
     },

src/routes/api/stripe/webhook/+server.ts

@@ -34,15 +34,16 @@ export async function POST(
 
   let subscription: Stripe.Subscription;
   let checkoutSession: Stripe.Checkout.Session;
-  const customerId = event?.data?.object as { customer: string };
+  const customerObj = event?.data?.object as { customer: string };
   let subscriptionId = "";
   let yizyUserId = "";
 
-  if (typeof customerId !== "string") {
+  if (typeof customerObj.customer !== "string") {
     throw new Error(
       `[STRIPE HOOK] ID isn't string.\nEvent type: ${event.type}`,
     );
   }
+  const customerId = customerObj.customer;
 
   switch (event.type) {
     case "checkout.session.completed":

vite.config.ts

@@ -1,6 +1,9 @@
-import { sveltekit } from '@sveltejs/kit/vite';
-import { defineConfig } from 'vite';
+import { sveltekit } from "@sveltejs/kit/vite";
+import { defineConfig } from "vite";
 
 export default defineConfig({
-	plugins: [sveltekit()]
+  plugins: [sveltekit()],
+  server: {
+    allowedHosts: ["7d90-156-34-178-107.ngrok-free.app"],
+  },
 });