From bf98e4e7a97bf810eaa70fde6615caf0383eeb46 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Sun, 24 Jul 2022 00:23:08 -0700
Subject: [PATCH] Fix up a little stuff I broke

---
 functions/src/index.ts  |  2 +-
 functions/src/serve.ts  | 53 ++++++++++++++++++++++++-----------------
 functions/src/stripe.ts |  5 ++--
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/functions/src/index.ts b/functions/src/index.ts
index 7a6dfb71..239806de 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -46,7 +46,7 @@ import { unsubscribe } from './unsubscribe'
 import { stripewebhook, createcheckoutsession } from './stripe'
 
 const toCloudFunction = ({ opts, handler }: EndpointDefinition) => {
-  onRequest(opts, handler as any)
+  return onRequest(opts, handler as any)
 }
 const healthFunction = toCloudFunction(health)
 const transactFunction = toCloudFunction(transact)
diff --git a/functions/src/serve.ts b/functions/src/serve.ts
index e2f006ff..77282951 100644
--- a/functions/src/serve.ts
+++ b/functions/src/serve.ts
@@ -1,6 +1,6 @@
 import * as cors from 'cors'
 import * as express from 'express'
-import { Express } from 'express'
+import { Express, Request, Response, NextFunction } from 'express'
 import { EndpointDefinition } from './api'
 
 const PORT = 8088
@@ -26,34 +26,43 @@ import { resolvemarket } from './resolve-market'
 import { unsubscribe } from './unsubscribe'
 import { stripewebhook, createcheckoutsession } from './stripe'
 
+type Middleware = (req: Request, res: Response, next: NextFunction) => void
 const app = express()
 
-const addEndpointRoute = (name: string, endpoint: EndpointDefinition) => {
+const addEndpointRoute = (
+  path: string,
+  endpoint: EndpointDefinition,
+  ...middlewares: Middleware[]
+) => {
   const method = endpoint.opts.method.toLowerCase() as keyof Express
   const corsMiddleware = cors({ origin: endpoint.opts.cors })
-  const middleware = [express.json(), corsMiddleware]
-  app.options(name, corsMiddleware) // preflight requests
-  app[method](name, ...middleware, endpoint.handler)
+  const allMiddleware = [...middlewares, corsMiddleware]
+  app.options(path, corsMiddleware) // preflight requests
+  app[method](path, ...allMiddleware, endpoint.handler)
+}
+
+const addJsonEndpointRoute = (name: string, endpoint: EndpointDefinition) => {
+  addEndpointRoute(name, endpoint, express.json())
 }
 
 addEndpointRoute('/health', health)
-addEndpointRoute('/transact', transact)
-addEndpointRoute('/changeuserinfo', changeuserinfo)
-addEndpointRoute('/createuser', createuser)
-addEndpointRoute('/createanswer', createanswer)
-addEndpointRoute('/placebet', placebet)
-addEndpointRoute('/cancelbet', cancelbet)
-addEndpointRoute('/sellbet', sellbet)
-addEndpointRoute('/sellshares', sellshares)
-addEndpointRoute('/claimmanalink', claimmanalink)
-addEndpointRoute('/createmarket', createmarket)
-addEndpointRoute('/addliquidity', addliquidity)
-addEndpointRoute('/withdrawliquidity', withdrawliquidity)
-addEndpointRoute('/creategroup', creategroup)
-addEndpointRoute('/resolvemarket', resolvemarket)
-addEndpointRoute('/unsubscribe', unsubscribe)
-addEndpointRoute('/stripewebhook', stripewebhook)
-addEndpointRoute('/createcheckoutsession', createcheckoutsession)
+addJsonEndpointRoute('/transact', transact)
+addJsonEndpointRoute('/changeuserinfo', changeuserinfo)
+addJsonEndpointRoute('/createuser', createuser)
+addJsonEndpointRoute('/createanswer', createanswer)
+addJsonEndpointRoute('/placebet', placebet)
+addJsonEndpointRoute('/cancelbet', cancelbet)
+addJsonEndpointRoute('/sellbet', sellbet)
+addJsonEndpointRoute('/sellshares', sellshares)
+addJsonEndpointRoute('/claimmanalink', claimmanalink)
+addJsonEndpointRoute('/createmarket', createmarket)
+addJsonEndpointRoute('/addliquidity', addliquidity)
+addJsonEndpointRoute('/withdrawliquidity', withdrawliquidity)
+addJsonEndpointRoute('/creategroup', creategroup)
+addJsonEndpointRoute('/resolvemarket', resolvemarket)
+addJsonEndpointRoute('/unsubscribe', unsubscribe)
+addJsonEndpointRoute('/createcheckoutsession', createcheckoutsession)
+addEndpointRoute('/stripewebhook', stripewebhook, express.raw())
 
 app.listen(PORT)
 console.log(`Serving functions on port ${PORT}.`)
diff --git a/functions/src/stripe.ts b/functions/src/stripe.ts
index d5b5f98e..79f0ad53 100644
--- a/functions/src/stripe.ts
+++ b/functions/src/stripe.ts
@@ -100,9 +100,10 @@ export const stripewebhook: EndpointDefinition = {
     let event
 
     try {
-      console.log(typeof req.body, req.body)
+      // Cloud Functions jam the raw body into a special `rawBody` property
+      const rawBody = (req as any).rawBody ?? req.body
       event = stripe.webhooks.constructEvent(
-        req.body,
+        rawBody,
         req.headers['stripe-signature'] as string,
         process.env.STRIPE_WEBHOOKSECRET as string
       )