Merge branch 'main' into brendan-planDay

R2bEEaton · Dec 19, 2023 · a7ecd81 · a7ecd81
2 parents da3813d + 306637b
commit a7ecd81
Show file tree

Hide file tree

Showing 14 changed files with 9,542 additions and 9,018 deletions.
diff --git a/api/db/schema.prisma b/api/db/schema.prisma
@@ -5,7 +5,7 @@ datasource db {
 
 generator client {
   provider      = "prisma-client-js"
-  binaryTargets = "native"
+  binaryTargets = ["native", "rhel-openssl-3.0.x"]
 }
 
 // Define your own datamodels here and run `yarn redwood prisma migrate dev`

diff --git a/api/package.json b/api/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "6.3.3",
-    "@redwoodjs/auth-dbauth-api": "6.3.3",
-    "@redwoodjs/graphql-server": "6.3.3",
+    "@redwoodjs/api": "6.5.1",
+    "@redwoodjs/auth-dbauth-api": "6.5.1",
+    "@redwoodjs/graphql-server": "6.5.1",
     "crypto-js": "^4.2.0"
   }
 }
diff --git a/api/src/functions/oauth/oauth.js → .../functions/oauthcallback/oauthcallback.js b/api/src/functions/oauth/oauth.js → .../functions/oauthcallback/oauthcallback.js
@@ -2,16 +2,7 @@ import { db } from 'src/lib/db'
 import CryptoJS from 'crypto-js'
 
 export const handler = async (event, _context) => {
-  switch (event.path) {
-    case '/oauth/callback':
-      return await callback(event)
-    default:
-      // Whatever this is, it's not correct, so return "Not Found"
-      return {
-        statusCode: 404,
-        error: 'Error: returned status code 302',
-      }
-  }
+  return await callback(event)
 }
 
 const callback = async (event) => {