Revert "Merge branch 'main' into appts-highlight"

This reverts commit 007dd02, reversing changes made to 8bafd49.
R2bEEaton · Dec 19, 2023 · 246e992 · 246e992
1 parent 007dd02
commit 246e992
Show file tree

Hide file tree

Showing 16 changed files with 9,218 additions and 9,821 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", "rhel-openssl-3.0.x"]
+  binaryTargets = "native"
 }
 
 // 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.5.1",
-    "@redwoodjs/auth-dbauth-api": "6.5.1",
-    "@redwoodjs/graphql-server": "6.5.1",
+    "@redwoodjs/api": "6.3.3",
+    "@redwoodjs/auth-dbauth-api": "6.3.3",
+    "@redwoodjs/graphql-server": "6.3.3",
     "crypto-js": "^4.2.0"
   }
 }
diff --git a/.../functions/oauthcallback/oauthcallback.js → api/src/functions/oauth/oauth.js b/.../functions/oauthcallback/oauthcallback.js → api/src/functions/oauth/oauth.js
@@ -2,7 +2,16 @@ import { db } from 'src/lib/db'
 import CryptoJS from 'crypto-js'
 
 export const handler = async (event, _context) => {
-  return await callback(event)
+  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',
+      }
+  }
 }
 
 const callback = async (event) => {