Merge pull request #505 from wasp-lang/franjo/refactor-stripe-payment-provider

Author: FranjoMindek

.github/workflows/e2e-tests.yml

@@ -106,7 +106,6 @@ jobs:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           STRIPE_API_KEY: ${{ secrets.STRIPE_KEY }}
           STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_SECRET }}
-          STRIPE_CUSTOMER_PORTAL_URL: https://billing.stripe.com/p/login/test_8wM8x17JN7DT4zC000
           PAYMENTS_HOBBY_SUBSCRIPTION_PLAN_ID: ${{ secrets.STRIPE_HOBBY_SUBSCRIPTION_PRICE_ID }}
           PAYMENTS_PRO_SUBSCRIPTION_PLAN_ID: ${{ secrets.STRIPE_PRO_SUBSCRIPTION_PRICE_ID }}
           PAYMENTS_CREDITS_10_PLAN_ID: ${{ secrets.STRIPE_CREDITS_PRICE_ID }}

opensaas-sh/app_diff/README.md.diff

@@ -1,17 +1,17 @@
 --- template/app/README.md
 +++ opensaas-sh/app/README.md
-@@ -1,16 +1,31 @@
+@@ -1,6 +1,8 @@
 -# <YOUR_APP_NAME>
 +# opensaas.sh (demo) app
 
 -Built with [Wasp](https://wasp.sh), based on the [Open Saas](https://opensaas.sh) template.
 +This is a Wasp app based on Open Saas template with minimal modifications that make it into a demo app that showcases Open Saas's abilities.
- 
-+It is deployed to https://opensaas.sh and serves both as a landing page for Open Saas and as a demo app.
 +
++It is deployed to https://opensaas.sh and serves both as a landing page for Open Saas and as a demo app.
+ 
  ## UI Components
 
- This template includes [ShadCN UI](https://ui.shadcn.com/) v2 for beautiful, accessible React components. See [SHADCN_SETUP.md](./SHADCN_SETUP.md) for details on how to use ShadCN components in your app.
+@@ -8,9 +10,22 @@
 
  ## Development
 

opensaas-sh/app_diff/deletions

@@ -5,4 +5,5 @@ src/payment/lemonSqueezy/checkoutUtils.ts
 src/payment/lemonSqueezy/paymentDetails.ts
 src/payment/lemonSqueezy/paymentProcessor.ts
 src/payment/lemonSqueezy/webhook.ts
+src/payment/lemonSqueezy/webhookPayload.ts
 src/payment/webhook.ts

opensaas-sh/app_diff/package-lock.json.diff

@@ -6,7 +6,7 @@
  import { type DailyStats } from "wasp/entities";
  import { type DailyStatsJob } from "wasp/server/jobs";
 +import { SubscriptionStatus } from "../payment/plans";
- import { stripe } from "../payment/stripe/stripeClient";
+ import { stripeClient } from "../payment/stripe/stripeClient";
  import {
    getDailyPageViews,
    getSources,
@@ -38,7 +38,7 @@
 
      const { totalViews, prevDayViewsChangePercent } = await getDailyPageViews();
 
-@@ -176,38 +162,3 @@
+@@ -177,38 +163,3 @@
    // Revenue is in cents so we convert to dollars (or your main currency unit)
    return totalRevenue / 100;
  }

opensaas-sh/app_diff/src/analytics/stats.ts.diff

@@ -1,6 +1,6 @@
 --- template/app/src/client/Main.css
 +++ opensaas-sh/app/src/client/Main.css
-@@ -56,8 +56,66 @@
+@@ -56,6 +56,64 @@
    .border-gradient-primary > * {
      background: hsl(var(--background));
    }
@@ -21,8 +21,8 @@
 +      hsl(var(--card)) 100%
 +    );
 +  }
- }
- 
++}
++
 +/* Satoshi Font Family */
 +@font-face {
 +  font-family: "Satoshi";
@@ -62,11 +62,9 @@
 +  font-weight: 900;
 +  font-style: normal;
 +  font-display: swap;
-+}
-+
- /* third-party libraries CSS */
+ }
 
- .tableCheckbox:checked ~ div span {
+ /* third-party libraries CSS */
 @@ -176,4 +234,22 @@
    body {
      @apply bg-background text-foreground;
@@ -85,8 +83,8 @@
 +  p {
 +    @apply font-mono text-base leading-relaxed;
 +  }
- }
++}
 +
 +.navbar-maxwidth-transition {
 +  transition: max-width 300ms cubic-bezier(0.4, 0, 0.2, 1);
-+}
+ }

opensaas-sh/app_diff/src/client/Main.css.diff

@@ -10,7 +10,7 @@
 
  import * as z from "zod";
  import { ensureArgsSchemaOrThrowHttpError } from "../server/validation";
-@@ -37,11 +38,16 @@
+@@ -37,10 +38,15 @@
      throw new HttpError(401);
    }
 
@@ -25,9 +25,8 @@
 +  if (userFileLimitReached) {
 +    throw new HttpError(403, 'This demo only allows 2 file uploads per user.');
 +  }
- 
-+  const { fileType, fileName } = ensureArgsSchemaOrThrowHttpError(createFileInputSchema, rawArgs);
 +
++  const { fileType, fileName } = ensureArgsSchemaOrThrowHttpError(createFileInputSchema, rawArgs);
+ 
    return await getUploadFileSignedURLFromS3({
      fileType,
-     fileName,

opensaas-sh/app_diff/src/file-upload/operations.ts.diff

@@ -160,42 +160,46 @@
 -    avatarSrc: daBoiAvatar,
 -    socialUrl: "https://twitter.com/wasplang",
 -    quote: "I don't even know how to code. I'm just a plushie.",
+-  },
+-  {
+-    name: "Mr. Foobar",
+-    role: "Founder @ Cool Startup",
+-    avatarSrc: daBoiAvatar,
+-    socialUrl: "",
+-    quote: "This product makes me cooler than I already am.",
+-  },
+-  {
+-    name: "Jamie",
+-    role: "Happy Customer",
+-    avatarSrc: daBoiAvatar,
+-    socialUrl: "#",
+-    quote: "My cats love it!",
 +    name: "Max Khamrovskyi",
 +    role: "Senior Eng @ Red Hat",
 +    avatarSrc:
 +      "https://pbs.twimg.com/profile_images/1719397191205179392/V_QrGPSO_400x400.jpg",
 +    socialUrl: "https://twitter.com/maksim36ua",
 +    quote:
 +      "I used Wasp to build and sell my AI-augmented SaaS app for marketplace vendors within two months!",
-   },
-   {
--    name: "Mr. Foobar",
--    role: "Founder @ Cool Startup",
--    avatarSrc: daBoiAvatar,
--    socialUrl: "",
--    quote: "This product makes me cooler than I already am.",
++  },
++  {
 +    name: "Jonathan Cocharan",
 +    role: "Entrepreneur",
 +    avatarSrc:
 +      "https://pbs.twimg.com/profile_images/1950172296376639488/sZ0JIqfR_400x400.jpg",
 +    socialUrl: "https://twitter.com/JonathanCochran",
 +    quote:
 +      "In just 6 nights... my SaaS app is live 🎉! Huge thanks to the amazing @wasplang community 🙌 for their guidance along the way. These tools are incredibly efficient 🤯!",
-   },
-   {
--    name: "Jamie",
--    role: "Happy Customer",
--    avatarSrc: daBoiAvatar,
--    socialUrl: "#",
--    quote: "My cats love it!",
++  },
++  {
 +    name: "Billy Howell",
 +    role: "Entrepreneur",
 +    avatarSrc:
 +      "https://pbs.twimg.com/profile_images/1877734205561430016/jjpG4mS6_400x400.jpg",
 +    socialUrl: "https://twitter.com/billyjhowell",
 +    quote:
 +      "Congrats! I am loving Wasp & Open SaaS. It's really helped me, a self-taught coder increase my confidence. I feel like I've finally found the perfect, versatile stack for all my projects instead of trying out a new one each time.",
-   },
++  },
 +  {
 +    name: "Tim Skaggs",
 +    role: "Founder @ Antler US",
@@ -249,7 +253,7 @@
 +      "https://dev.to/wasp/our-web-framework-reached-9000-stars-on-github-9000-jij#comment-2dech",
 +    quote:
 +      "This is exactly the framework I've been dreaming of ever since I've been waiting to fully venture into the JS Backend Dev world. I believe Wasp will go above 50k stars this year. The documentation alone gives me the confidence that this is my permanent Nodejs framework and I'm staying with Wasp. Phenomenal work by the team...  Please keep up your amazing spirits. Thank you",
-+  },
+   },
  ];
 -
  export const faqs = [
@@ -261,14 +265,14 @@
 +    question: "Why is this SaaS Template free and open-source?",
 +    answer:
 +      "We believe the best product is made when the community puts their heads together. We also believe a quality starting point for a web app should be free and available to everyone. Our hope is that together we can create the best SaaS template out there and bring our ideas to customers quickly.",
-   },
++  },
 +  {
 +    id: 2,
 +    question: "What's Wasp?",
 +    href: "https://wasp-lang.dev",
 +    answer:
 +      "It's the fastest way to develop full-stack React + NodeJS + Prisma apps and it's what gives this template superpowers. Wasp relies on React, NodeJS, and Prisma to define web components and server queries and actions. Wasp's secret sauce is its compiler which takes the client, server code, and config file and outputs the client app, server app and deployment code, supercharging the development experience. Combined with this template, you can build a SaaS app in record time.",
-+  },
+   },
  ];
 -
  export const footerNavigation = {

opensaas-sh/app_diff/src/landing-page/contentSections.tsx.diff

@@ -1,12 +1,12 @@
 --- template/app/src/payment/paymentProcessor.ts
 +++ opensaas-sh/app/src/payment/paymentProcessor.ts
-@@ -27,9 +27,4 @@
+@@ -28,9 +28,4 @@
    webhookMiddlewareConfigFn: MiddlewareConfigFn;
  }
 
 -/**
 - * Choose which payment processor you'd like to use, then delete the
 - * other payment processor code that you're not using  from `/src/payment`
 - */
--// export const paymentProcessor: PaymentProcessor = lemonSqueezyPaymentProcessor;
  export const paymentProcessor: PaymentProcessor = stripePaymentProcessor;
+-// export const paymentProcessor: PaymentProcessor = lemonSqueezyPaymentProcessor;