fix(link-http): allow to use HttpParams on GET requests

kamilkisiela · Oct 31, 2017 · 3ec24f3 · 3ec24f3
1 parent 9369abe
commit 3ec24f3
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/packages/apollo-angular-link-http/src/HttpLink.ts b/packages/apollo-angular-link-http/src/HttpLink.ts
@@ -1,5 +1,5 @@
 import {Injectable} from '@angular/core';
-import {HttpClient, HttpResponse} from '@angular/common/http';
+import {HttpClient, HttpResponse, HttpParams} from '@angular/common/http';
 import {
   ApolloLink,
   Observable as LinkObservable,
@@ -68,14 +68,34 @@ export class HttpLinkHandler extends ApolloLink {
             req.method = method;
           }
 
+          // `body` for some, `params` for others
+          const useBody = ['POST', 'PUT', 'PATCH'].includes(
+            req.method.toUpperCase(),
+          );
+          let bodyOrParams = {};
+
+          if (useBody) {
+            bodyOrParams = {
+              body: req.body,
+            };
+          } else {
+            const params = Object.keys(req.body).reduce(
+              (httpParams, param) =>
+                httpParams.set(param, (req.body as any)[param]),
+              new HttpParams(),
+            );
+
+            bodyOrParams = {params};
+          }
+
           // create a request
           const obs: Observable<HttpResponse<Object>> = httpClient.request<
             Object
           >(req.method, req.url, {
-            body: req.body,
             observe: 'response',
             responseType: 'json',
             reportProgress: false,
+            ...bodyOrParams,
             ...req.options,
           });
 

diff --git a/packages/apollo-angular-link-http/src/types.ts b/packages/apollo-angular-link-http/src/types.ts
@@ -18,7 +18,6 @@ export type Body = {
   query: string;
   variables?: Record<string, any>;
   operationName?: string;
-  context?: Record<string, any> | Context;
   extensions?: Record<string, any>;
 };
 

diff --git a/packages/apollo-angular-link-http/tests/HttpLink.spec.ts b/packages/apollo-angular-link-http/tests/HttpLink.spec.ts
@@ -158,8 +158,7 @@ describe('HttpLink', () => {
 
           httpBackend.match(req => {
             expect(req.method).toBe('GET');
-            expect(req.body.operationName).toBe(op.operationName);
-            expect(req.detectContentTypeHeader()).toBe('application/json');
+            expect(req.params.get('operationName')).toBe(op.operationName);
             return true;
           });
         },

diff --git a/packages/apollo-angular-link-http/tests/SSR.spec.ts b/packages/apollo-angular-link-http/tests/SSR.spec.ts
@@ -69,13 +69,19 @@ describe('integration', () => {
       ) {}
 
       public ngOnInit() {
-        execute(this.httpLink.create({uri: 'graphql'}), {
+        execute(this.httpLink.create({uri: 'graphql', method: 'GET'}), {
           query,
         }).subscribe(result => {
           this.text = result.data.website.status;
         });
 
-        this.httpBackend.expectOne('graphql').flush({data});
+        this.httpBackend
+          .match(
+            req =>
+              req.url === 'graphql' &&
+              req.params.get('operationName') === 'websiteInfo',
+          )[0]
+          .flush({data});
       }
     }