fix(admin-ui): Fix channel header when using bearer auth

vendure-ecommerce · Aug 26, 2020 · fa29805 · fa29805
1 parent 5da5b4e
commit fa29805
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/packages/admin-ui/src/lib/core/src/data/data.module.ts b/packages/admin-ui/src/lib/core/src/data/data.module.ts
@@ -48,26 +48,18 @@ export function createApollo(
             new OmitTypenameLink(),
             new CheckJobsLink(injector),
             setContext(() => {
+                const headers: Record<string, string> = {};
                 const channelToken = localStorageService.get('activeChannelToken');
                 if (channelToken) {
-                    return {
-                        headers: {
-                            'vendure-token': channelToken,
-                        },
-                    };
+                    headers['vendure-token'] = channelToken;
                 }
-            }),
-            setContext(() => {
                 if (tokenMethod === 'bearer') {
                     const authToken = localStorageService.get('authToken');
                     if (authToken) {
-                        return {
-                            headers: {
-                                authorization: `Bearer ${authToken}`,
-                            },
-                        };
+                        headers.authorization = `Bearer ${authToken}`;
                     }
                 }
+                return { headers };
             }),
             createUploadLink({
                 uri: `${serverLocation}/${adminApiPath}`,