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.

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: resolving apollo status code #7001

Merged
merged 1 commit into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/middleware/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/middleware",
"version": "2.8.0",
"version": "2.8.1",
"description": "",
"main": "lib/index.cjs.js",
"module": "lib/index.es.js",
Expand Down
17 changes: 15 additions & 2 deletions packages/middleware/src/createServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,21 @@ async function createServer(config: MiddlewareConfig): Promise<Express> {
res.send(platformResponse);
} catch (error) {
consola.error(error);
res.status(getAgnosticStatusCode(error));
res.send('ServerError: Response not successful. Please, check server logs for more details.');
const status = getAgnosticStatusCode(error);
res.status(status);
if (status < 500) {
/**
* For all 4xx error codes or client error codes we wanted to send the error message
*/
res.send(error);
} else {
/**
* For all other error codes we wanted to send a generic error message
*/
res.send(
"ServerError: Something went wrong. Please, check the logs for more details."
);
}
}
});

Expand Down
5 changes: 5 additions & 0 deletions packages/middleware/src/helpers/getAgnosticStatusCode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export type AxiosError = {
export type ApolloError = {
networkError?: number
code: string | number
graphQLErrors: Array<any>
}

type Status = typeof STATUS_FIELDS[number]
Expand Down Expand Up @@ -56,6 +57,10 @@ function getApolloStatusCode(error: ApolloError) {
if (error?.code) {
return typeof error.code === 'string' ? 400 : error.code;
}

if (error?.graphQLErrors?.length > 0) {
return 200;
WojtekTheWebDev marked this conversation as resolved.
Show resolved Hide resolved
}
}

function getAgnosticStatusCode(error: AxiosError | ApolloError | UnknownError): number {
Expand Down
Loading