Merge pull request #136 from rmarscher/lucia-remove-apple-edge-handler

Remove apple form_post handler for now
timothymiller · Jan 4, 2024 · 855dd41 · 855dd41
2 parents 4803ec7 + 7538881
commit 855dd41
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/apps/next/middleware.ts → apps/next/_middleware.ts b/apps/next/middleware.ts → apps/next/_middleware.ts
@@ -1,3 +1,9 @@
+// This is currently being archived while we rethink how to handle
+// Apple OAuth form post data being sent to the app domain.
+// This middleware deployed to cloudflare without issue, but the
+// getServerSideProps edge function could not deploy to due unrelated
+// SSR issues.
+
 import { NextResponse } from 'next/server'
 import type { NextRequest } from 'next/server'
 

diff --git a/apps/next/pages/oauth/[provider].tsx b/apps/next/pages/oauth/[provider].tsx
@@ -3,8 +3,10 @@ import Head from 'next/head'
 
 // Apple will POST form data to the redirect URI when scopes have been requested
 // @link https://developer.apple.com/documentation/sign_in_with_apple/request_an_authorization_to_the_sign_in_with_apple_server
-export { getServerSideProps } from 'app/features/oauth/screen'
-export const runtime = 'experimental-edge'
+// However, it does deploy to cloudflare due to issues with the SSR function for the react screen
+// We are looking into alternatives (possibly using nextjs api routes) to handle Apple's form post
+// export { getServerSideProps } from 'app/features/oauth/screen'
+// export const runtime = 'experimental-edge'
 
 export default function Page(props: OAuthSignInScreenProps) {
   return (

diff --git a/bun.lockb b/bun.lockb
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -28,7 +28,7 @@
     "hono": "^3.9.2",
     "lucia": "3.0.0-beta.12",
     "miniflare": "3.20231025.1",
-    "oslo": "0.26.1",
+    "oslo": "0.25.0",
     "superjson": "1.13.3",
     "ts-pattern": "^5.0.5",
     "valibot": "^0.20.1"

diff --git a/packages/app/features/oauth/screen.tsx b/packages/app/features/oauth/screen.tsx
@@ -85,8 +85,8 @@ export const OAuthSignInScreen = ({ appleUser }: OAuthSignInScreenProps): React.
       // Maybe there's a superjson plugin or another way to handle it.
       appleUser: appleUser
         ? {
-          email: appleUser.email || undefined,
-        }
+            email: appleUser.email || undefined,
+          }
         : undefined,
     })
   }, [provider, redirectTo, state, code, sendApiRequestOnLoad, appleUser])