fix(api-client): http options without headers and params constructing…

… (AOT compatible) closes #47 Signed-off-by: Vojtech Masek <[email protected]>
flowup · May 22, 2018 · eca03c3 · eca03c3
1 parent 539ba46
commit eca03c3
Show file tree

Hide file tree

Showing 8 changed files with 716 additions and 676 deletions.
diff --git a/templates/ngx-module-export.mustache b/templates/ngx-module-export.mustache
@@ -10,16 +10,26 @@ export * from './models';
 
 export { APIClient } from './api-client.service';
 
+/**
+ * provided options, headers and params will be used as default for each request
+ */
+export interface DefaultHttpOptions {
+  headers?: {[key: string]: string};
+  params?: {[key: string]: string};
+  reportProgress?: boolean;
+  withCredentials?: boolean;
+}
+
 export interface HttpOptions {
-  headers?: HttpHeaders, // provided headers will be used as default for each request
-  params?: HttpParams,   // provided params will be used as default for each request
-  reportProgress?: boolean,
-  withCredentials?: boolean,
+  headers?: HttpHeaders;
+  params?: HttpParams;
+  reportProgress?: boolean;
+  withCredentials?: boolean;
 }
 
 export interface APIClientModuleConfig {
   domain?: string;
-  httpOptions?: HttpOptions;
+  httpOptions?: DefaultHttpOptions;
 }
 
 @NgModule({})

diff --git a/templates/ngx-service.mustache b/templates/ngx-service.mustache
@@ -3,7 +3,7 @@
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Inject, Injectable, InjectionToken, Optional } from '@angular/core';
 import { Observable } from 'rxjs';
-import { HttpOptions } from './';
+import { DefaultHttpOptions, HttpOptions } from './';
 
 {{#definitions.length}}
 import * as models from './models';
@@ -29,15 +29,15 @@ export class APIClient {
 
   constructor(private http: HttpClient,
               @Optional() @Inject(USE_DOMAIN) domain: string,
-              @Optional() @Inject(USE_HTTP_OPTIONS) options: HttpOptions) {
+              @Optional() @Inject(USE_HTTP_OPTIONS) options: DefaultHttpOptions) {
 
     if (domain) {
       this.domain = domain;
     }
 
     this.options = {
-      headers: options && options.headers ? options.headers : new HttpHeaders(),
-      params: options && options.params ? options.params : new HttpParams(),
+      headers: new HttpHeaders(options && options.headers ? options.headers : {}),
+      params: new HttpParams(options && options.params ? options.params : {}),
       ...(options && options.reportProgress ? { reportProgress: options.reportProgress } : {}),
       ...(options && options.withCredentials ? { withCredentials: options.withCredentials } : {})
     };
@@ -52,10 +52,10 @@ export class APIClient {
       {{/parameters}}
     },
   {{/parameters.length}}
-    passedOptions?: HttpOptions
+    requestHttpOptions?: HttpOptions
   ): Observable<{{&response}}> {
     const path = `{{&path}}`;
-    const options: APIHttpOptions = {...this.options, ...passedOptions};
+    const options: APIHttpOptions = {...this.options, ...requestHttpOptions};
 
     {{#parameters}}
       {{#isQueryParameter}}