rename webhooksRouter -> webhookRouter for consistency

Author: tudddorrr

src/config/public-routes.ts

@@ -5,7 +5,7 @@ import { healthCheckRouter } from '../routes/public/health-check'
 import { userPublicRouter } from '../routes/public/user-public'
 import { demoRouter } from '../routes/public/demo'
 import { invitePublicRouter } from '../routes/public/invite-public'
-import { webhooksRouter } from '../routes/public/webhooks'
+import { webhookRouter } from '../routes/public/webhook'
 
 export default function configurePublicRoutes(app: Koa) {
   const serviceOpts: ServiceOpts = {
@@ -21,5 +21,5 @@ export default function configurePublicRoutes(app: Koa) {
   app.use(userPublicRouter().routes())
   app.use(demoRouter().routes())
   app.use(invitePublicRouter().routes())
-  app.use(webhooksRouter().routes())
+  app.use(webhookRouter().routes())
 }

src/routes/public/webhooks/index.ts src/routes/public/webhook/index.tssrc/routes/public/webhooks/index.ts renamed to src/routes/public/webhook/index.ts

@@ -1,7 +1,7 @@
 import { publicRouter } from '../../../lib/routing/router'
 import { subscriptionsRoute } from './subscriptions'
 
-export function webhooksRouter() {
+export function webhookRouter() {
   return publicRouter('/public/webhooks', ({ route }) => {
     route(subscriptionsRoute)
   })

…/routes/public/webhooks/subscriptions.ts …c/routes/public/webhook/subscriptions.tssrc/routes/public/webhooks/subscriptions.ts renamed to src/routes/public/webhook/subscriptions.ts src/routes/public/webhooks/subscriptions.ts renamed to src/routes/public/webhook/subscriptions.ts

@@ -15,12 +15,10 @@ import { getGlobalQueue } from '../../../config/global-queues'
 import assert from 'node:assert'
 import { publicRoute } from '../../../lib/routing/router'
 
-const stripe = initStripe()
-
 async function getOrganisationPricingPlan(
   ctx: PublicRouteContext,
   stripeCustomerId: string
-): Promise<OrganisationPricingPlan> {
+) {
   const em = ctx.em
 
   const orgPlan = await em.repo(OrganisationPricingPlan).findOneOrFail({
@@ -46,7 +44,8 @@ async function handleSubscriptionDeleted(
 
 async function handleSubscriptionUpdated(
   ctx: PublicRouteContext,
-  subscription: Stripe.Subscription
+  subscription: Stripe.Subscription,
+  stripe: Stripe
 ) {
   const em = ctx.em
 
@@ -69,7 +68,7 @@ async function handleSubscriptionUpdated(
 
   if (prevStripePriceId !== orgPlan.stripePriceId) {
     const price = subscription.items.data[0].price
-    const product = await stripe!.products.retrieve(price.product as string)
+    const product = await stripe.products.retrieve(price.product as string)
     await queueEmail(getGlobalQueue('email'), new PlanUpgraded(orgPlan.organisation, price, product))
   }
 
@@ -83,15 +82,15 @@ async function handleSubscriptionUpdated(
 async function handleNewInvoice(
   ctx: PublicRouteContext,
   invoice: Stripe.Invoice
-): Promise<void> {
+) {
   const orgPlan = await getOrganisationPricingPlan(ctx, invoice.customer as string)
   await queueEmail(getGlobalQueue('email'), new PlanInvoice(orgPlan.organisation, invoice))
 }
 
 async function handlePaymentFailed(
   ctx: PublicRouteContext,
   invoice: Stripe.Invoice
-): Promise<void> {
+) {
   const orgPlan = await getOrganisationPricingPlan(ctx, invoice.customer as string)
   await queueEmail(getGlobalQueue('email'), new PlanPaymentFailed(orgPlan.organisation, invoice))
 }
@@ -100,6 +99,7 @@ export const subscriptionsRoute = publicRoute({
   method: 'post',
   path: '/subscriptions',
   handler: async (ctx) => {
+    const stripe = initStripe()
     assert(stripe)
 
     let event: Stripe.Event
@@ -122,7 +122,7 @@ export const subscriptionsRoute = publicRoute({
         break
       case 'customer.subscription.created':
       case 'customer.subscription.updated':
-        await handleSubscriptionUpdated(ctx, event.data.object as Stripe.Subscription)
+        await handleSubscriptionUpdated(ctx, event.data.object as Stripe.Subscription, stripe)
         break
       case 'invoice.finalized':
         await handleNewInvoice(ctx, event.data.object as Stripe.Invoice)