Merge branch 'kp-add-base-url-support-graphql' into 'master'
Add support for baseUrl in ApolloClient instance within GraphQL helper See merge request gitlab-org/gitlab-ce!27657
This commit is contained in:
commit
97678c09fd
|
@ -3,10 +3,17 @@ import { InMemoryCache } from 'apollo-cache-inmemory';
|
|||
import { createUploadLink } from 'apollo-upload-client';
|
||||
import csrf from '~/lib/utils/csrf';
|
||||
|
||||
export default (resolvers = {}) =>
|
||||
new ApolloClient({
|
||||
export default (resolvers = {}, baseUrl = '') => {
|
||||
let uri = `${gon.relative_url_root}/api/graphql`;
|
||||
|
||||
if (baseUrl) {
|
||||
// Prepend baseUrl and ensure that `///` are replaced with `/`
|
||||
uri = `${baseUrl}${uri}`.replace(/\/{3,}/g, '/');
|
||||
}
|
||||
|
||||
return new ApolloClient({
|
||||
link: createUploadLink({
|
||||
uri: `${gon.relative_url_root}/api/graphql`,
|
||||
uri,
|
||||
headers: {
|
||||
[csrf.headerKey]: csrf.token,
|
||||
},
|
||||
|
@ -14,3 +21,4 @@ export default (resolvers = {}) =>
|
|||
cache: new InMemoryCache(),
|
||||
resolvers,
|
||||
});
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue