Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(lambda) File uploads #4506

Merged
merged 8 commits into from
Oct 30, 2020
Merged

fix(lambda) File uploads #4506

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
afa8f93
fix(lambda) File uploads
mathix420 Aug 24, 2020
285484e
Merge branch 'main' into fix/lambda-file-uploads
mathix420 Sep 18, 2020
5664194
Merge branch 'main' into fix/lambda-file-uploads
mathix420 Sep 20, 2020
034176b
Update Content-Type comparison to be case insensitive
mathix420 Oct 23, 2020
678602a
Merge branch 'main' into fix/lambda-file-uploads
mathix420 Oct 23, 2020
666939c
Merge remote-tracking branch 'origin/release-2.19.0' into pull/4506
abernix Oct 30, 2020
139003f
Update changelog
trevor-scheer Oct 30, 2020
e5a1f96
Merge branch 'release-2.19.0' into fix/lambda-file-uploads
trevor-scheer Oct 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions packages/apollo-server-lambda/src/lambdaApollo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@ export function graphqlLambda(
callback,
): void => {
context.callbackWaitsForEmptyEventLoop = false;
let { body, isBase64Encoded } = event;
let { body, headers, isBase64Encoded } = event;
let query: Record<string, any> | Record<string, any>[];
const contentType = headers["content-type"] || headers["Content-Type"];
const isMultipart = (contentType || "").startsWith("multipart/form-data");
mathix420 marked this conversation as resolved.
Show resolved Hide resolved

if (body && isBase64Encoded) {
if (body && isBase64Encoded && !isMultipart) {
body = Buffer.from(body, 'base64').toString();
}

Expand All @@ -45,12 +48,7 @@ export function graphqlLambda(
});
}

const contentType = event.headers["content-type"] || event.headers["Content-Type"];
let query: Record<string, any> | Record<string, any>[];

if (body && event.httpMethod === 'POST' &&
contentType && contentType.startsWith("multipart/form-data")
) {
if (body && event.httpMethod === 'POST' && isMultipart) {
query = body as any;
} else if (body && event.httpMethod === 'POST') {
query = JSON.parse(body);
Expand Down