dbAuth Vercel Fix (#3309)

Co-authored-by: Rob Cameron <rob.cameron@fastmail.com>
redwoodjs · Sep 1, 2021 · 3008210 · 3008210
1 parent 4a6ed30
commit 3008210
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 10 deletions.
diff --git a/packages/api/src/functions/dbAuth/DbAuthHandler.ts b/packages/api/src/functions/dbAuth/DbAuthHandler.ts
@@ -294,12 +294,16 @@ export class DbAuthHandler {
 
   // parses the event body into JSON, whether it's base64 encoded or not
   _parseBody() {
-    if (this.event.isBase64Encoded) {
-      return JSON.parse(
-        Buffer.from(this.event.body || '', 'base64').toString('utf-8')
-      )
+    if (this.event.body) {
+      if (this.event.isBase64Encoded) {
+        return JSON.parse(
+          Buffer.from(this.event.body || '', 'base64').toString('utf-8')
+        )
+      } else {
+        return JSON.parse(this.event.body)
+      }
     } else {
-      return this.event.body && JSON.parse(this.event.body)
+      return {}
     }
   }
 
@@ -483,7 +487,7 @@ export class DbAuthHandler {
   _ok(body: string, headers = {}, options = { statusCode: 200 }) {
     return {
       statusCode: options.statusCode,
-      body,
+      body: typeof body === 'string' ? body : JSON.stringify(body),
       headers: { 'Content-Type': 'application/json', ...headers },
     }
   }

diff --git a/packages/api/src/functions/dbAuth/__tests__/DbAuthHandler.test.js b/packages/api/src/functions/dbAuth/__tests__/DbAuthHandler.test.js
@@ -174,7 +174,7 @@ describe('dbAuth', () => {
       expect(dbAuth.options).toEqual(options)
     })
 
-    it('parses a plain text body', () => {
+    it('parses params from a plain text body', () => {
       event = { headers: {}, body: `{"foo":"bar", "baz":123}` }
       context = { foo: 'bar' }
       options = { db: db }
@@ -183,7 +183,28 @@ describe('dbAuth', () => {
       expect(dbAuth.params).toEqual({ foo: 'bar', baz: 123 })
     })
 
-    it('parses a base64 encoded body', () => {
+    it('parses an empty plain text body and still sets params', () => {
+      event = { isBase64Encoded: false, headers: {}, body: '' }
+      context = { foo: 'bar' }
+      options = { db: db }
+      const dbAuth = new DbAuthHandler(event, context, options)
+
+      expect(dbAuth.params).toEqual({})
+    })
+
+    it('parses params from an undefined body when isBase64Encoded == false', () => {
+      event = {
+        isBase64Encoded: false,
+        headers: {},
+      }
+      context = { foo: 'bar' }
+      options = { db: db }
+      const dbAuth = new DbAuthHandler(event, context, options)
+
+      expect(dbAuth.params).toEqual({})
+    })
+
+    it('parses params from a base64 encoded body', () => {
       event = {
         isBase64Encoded: true,
         headers: {},
@@ -196,6 +217,31 @@ describe('dbAuth', () => {
       expect(dbAuth.params).toEqual({ foo: 'bar', baz: 123 })
     })
 
+    it('parses params from an undefined body when isBase64Encoded == true', () => {
+      event = {
+        isBase64Encoded: true,
+        headers: {},
+      }
+      context = { foo: 'bar' }
+      options = { db: db }
+      const dbAuth = new DbAuthHandler(event, context, options)
+
+      expect(dbAuth.params).toEqual({})
+    })
+
+    it('parses params from an empty body when isBase64Encoded == true', () => {
+      event = {
+        isBase64Encoded: true,
+        headers: {},
+        body: '',
+      }
+      context = { foo: 'bar' }
+      options = { db: db }
+      const dbAuth = new DbAuthHandler(event, context, options)
+
+      expect(dbAuth.params).toEqual({})
+    })
+
     it('sets header-based CSRF token', () => {
       event = { headers: { 'csrf-token': 'qwerty' } }
       const dbAuth = new DbAuthHandler(event, context, options)
@@ -907,6 +953,20 @@ describe('dbAuth', () => {
 
       expect(response.statusCode).toEqual(201)
     })
+
+    it('stringifies a JSON body', () => {
+      const dbAuth = new DbAuthHandler(event, context, options)
+      const response = dbAuth._ok({ foo: 'bar' }, {}, { statusCode: 201 })
+
+      expect(response.body).toEqual('{"foo":"bar"}')
+    })
+
+    it('does not stringify a body that is a string already', () => {
+      const dbAuth = new DbAuthHandler(event, context, options)
+      const response = dbAuth._ok('{"foo":"bar"}', {}, { statusCode: 201 })
+
+      expect(response.body).toEqual('{"foo":"bar"}')
+    })
   })
 
   describe('_notFound', () => {

diff --git a/packages/auth/src/authClients/dbAuth.ts b/packages/auth/src/authClients/dbAuth.ts
@@ -15,7 +15,12 @@ export const dbAuth = (): AuthClient => {
       `${global.__REDWOOD__API_PROXY_PATH}/auth?method=getToken`
     )
     const token = await response.text()
-    return token
+
+    if (token.length === 0) {
+      return null
+    } else {
+      return token
+    }
   }
 
   const login = async (attributes: LoginAttributes) => {

diff --git a/packages/cli/src/commands/setup/auth/templates/dbAuth.function.js.template b/packages/cli/src/commands/setup/auth/templates/dbAuth.function.js.template
@@ -65,5 +65,5 @@ export const handler = async (event, context) => {
     loginExpires: 60 * 60 * 24 * 365 * 10,
   })
 
-  return authHandler.invoke()
+  return await authHandler.invoke()
 }