Skip to content
Snippets Groups Projects
Commit 6242b32d authored by Joao Ramia's avatar Joao Ramia
Browse files

Merge branch 'noissue/fix-accept-language-header' into 'main'

NOISSUE: Fix usage of accept-language header

See merge request app/holi-geo-api!24
parents d39e6ba1 2e9023cf
Loading
...@@ -55,7 +55,7 @@ const createResolvers = (config: ServerConfig) => ({ ...@@ -55,7 +55,7 @@ const createResolvers = (config: ServerConfig) => ({
): Promise<Place[]> => ): Promise<Place[]> =>
config.fake ? Promise.resolve([]) : fetchPlaces( config.fake ? Promise.resolve([]) : fetchPlaces(
parameters, parameters,
getLanguage(context.language), context.language || DEFAULT_LANGUAGE,
config.geoapifyApiKey, config.geoapifyApiKey,
), ),
...@@ -67,7 +67,7 @@ const createResolvers = (config: ServerConfig) => ({ ...@@ -67,7 +67,7 @@ const createResolvers = (config: ServerConfig) => ({
): Promise<PlaceDetails | undefined> => ): Promise<PlaceDetails | undefined> =>
config.fake ? Promise.resolve(undefined) : fetchPlaceDetails( config.fake ? Promise.resolve(undefined) : fetchPlaceDetails(
parameters, parameters,
getLanguage(context.language), context.language || DEFAULT_LANGUAGE,
config.geoapifyApiKey, config.geoapifyApiKey,
), ),
}, },
...@@ -119,12 +119,11 @@ export const createGraphQLServer = (config: ServerConfig): GraphQLServer => { ...@@ -119,12 +119,11 @@ export const createGraphQLServer = (config: ServerConfig): GraphQLServer => {
graphiql: true, graphiql: true,
plugins, plugins,
context: (context: GraphQLContext) => { context: (context: GraphQLContext) => {
const language = (context.params?.extensions?.headers || {})[ const headers = new Headers(context.params?.extensions?.headers);
"accept-language" const languages = headers.get("accept-language") || DEFAULT_LANGUAGE;
];
return { return {
...context, ...context,
language, language: getLanguage(languages),
}; };
}, },
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment