fix passport adapter to work behind cloudfront (#3132)

(patch)
blitz-js · Jan 18, 2022 · 1e3ae5d · 1e3ae5d
1 parent a344c1f
commit 1e3ae5d
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/nextjs/packages/next/stdlib-server/middleware.ts b/nextjs/packages/next/stdlib-server/middleware.ts
@@ -149,10 +149,14 @@ function getProtocol(req: MiddlewareRequest) {
   if (req.connection.encrypted) {
     return 'https'
   }
+
+  if (!req.headers) return 'http'
+
   const forwardedProto =
-    req.headers &&
-    ((req.headers['forwarded'] as string)?.match(/(?<=proto=).+/g)?.[0] ||
-      (req.headers['x-forwarded-proto'] as string))
+    (req.headers['forwarded'] as string)?.match(/(?<=proto=).+/g)?.[0] ||
+    (req.headers['x-forwarded-proto'] as string) ||
+    (req.headers['CloudFront-Forwarded-Proto'] as string)
+
   if (forwardedProto) {
     return forwardedProto.split(/\s*,\s*/)[0]
   }