diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache
index ea2b19b7885..ca361762061 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache
@@ -75,8 +75,8 @@ export class {{classname}} {
 
 
 {{^useHttpClient}}
-{{! not sure why we used to generate a second method here rather than inlining those few lines of code, 
-    but let's keep it for now for the sake of backwards compatiblity. }}  
+{{! not sure why we used to generate a second method here rather than inlining those few lines of code,
+    but let's keep it for now for the sake of backwards compatiblity. }}
 {{#operation}}
     /**
      * {{&notes}}
@@ -152,17 +152,17 @@ export class {{classname}} {
         {{/isListContainer}}
 {{/queryParams}}
 
-{{/hasQueryParams}} 
-        let headers = {{#useHttpClient}}this.defaultHeaders;{{/useHttpClient}}{{^useHttpClient}}new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845{{/useHttpClient}}
+{{/hasQueryParams}}
+        let headersObservable = Observable.of({{#useHttpClient}}this.defaultHeaders{{/useHttpClient}}{{^useHttpClient}}new Headers(this.defaultHeaders.toJSON()){{/useHttpClient}});
 {{#headerParams}}
         {{#isListContainer}}
         if ({{paramName}}) {
-            {{#useHttpClient}}headers = {{/useHttpClient}}headers.set('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']));
+            headersObservable = headersObservable.{{#useHttpClient}}map((headers: HttpHeaders) => { return {{/useHttpClient}}{{^useHttpClient}}do((headers: Headers) => { {{/useHttpClient}}headers.set('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])); });
         }
         {{/isListContainer}}
         {{^isListContainer}}
         if ({{paramName}} !== undefined && {{paramName}} !== null) {
-            {{#useHttpClient}}headers = {{/useHttpClient}}headers.set('{{baseName}}', String({{paramName}}));
+            headersObservable = headersObservable.{{#useHttpClient}}map((headers: HttpHeaders) => { return {{/useHttpClient}}{{^useHttpClient}}do((headers: Headers) => { {{/useHttpClient}}headers.set('{{baseName}}', String({{paramName}})); });
         }
         {{/isListContainer}}
 {{/headerParams}}
@@ -172,7 +172,7 @@ export class {{classname}} {
 {{#isApiKey}}
 {{#isKeyInHeader}}
         if (this.configuration.apiKeys["{{keyParamName}}"]) {
-            {{#useHttpClient}}headers = {{/useHttpClient}}headers.set('{{keyParamName}}', this.configuration.apiKeys["{{keyParamName}}"]);
+            headersObservable = headersObservable.{{#useHttpClient}}map((headers: HttpHeaders) => { return {{/useHttpClient}}{{^useHttpClient}}do((headers: Headers) => { {{/useHttpClient}}headers.set('{{keyParamName}}', this.configuration.apiKeys["{{keyParamName}}"]); });
         }
 
 {{/isKeyInHeader}}
@@ -185,23 +185,26 @@ export class {{classname}} {
 {{/isApiKey}}
 {{#isBasic}}
         if (this.configuration.username || this.configuration.password) {
-            {{#useHttpClient}}headers = {{/useHttpClient}}headers.set('Authorization', 'Basic ' + btoa(this.configuration.username + ':' + this.configuration.password));
+            headersObservable = headersObservable.{{#useHttpClient}}map((headers: HttpHeaders) => { return {{/useHttpClient}}{{^useHttpClient}}do((headers: Headers) => { {{/useHttpClient}}headers.set('Authorization', 'Basic ' + btoa(this.configuration.username + ':' + this.configuration.password)); });
         }
 
 {{/isBasic}}
 {{#isOAuth}}
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            {{#useHttpClient}}headers = {{/useHttpClient}}headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("{{name}}", [{{#scopes}}"{{{scope}}}"{{^-last}}, {{/-last}}{{/scopes}}])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: {{#useHttpClient}}Http{{/useHttpClient}}Headers, accessToken: string) => {
+                {{#useHttpClient}}return {{/useHttpClient}}headers.set('Authorization', 'Bearer ' + accessToken);{{^useHttpClient}}
+                return headers;{{/useHttpClient}}
+            });
         }
 
 {{/isOAuth}}
 {{/authMethods}}
 {{#bodyParam}}
 {{^useHttpClient}}
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
 {{/useHttpClient}}
 {{/bodyParam}}
@@ -235,7 +238,7 @@ export class {{classname}} {
             convertFormParamsToString = true;
             formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
             // set the content-type explicitly to avoid having it set to 'text/plain'
-            headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
+            headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8'));
 {{/useHttpClient}}
         }
 
@@ -263,8 +266,8 @@ export class {{classname}} {
 
 {{/hasFormParams}}
 {{#useHttpClient}}
-        return this.httpClient.{{httpMethod}}{{^isResponseFile}}<any>{{/isResponseFile}}(`${this.basePath}{{{path}}}`, {{#bodyParam}}{{paramName}}, {{/bodyParam}}
-        {{#hasFormParams}}convertFormParamsToString ? formParams.toString() : formParams, {{/hasFormParams}}{
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.{{httpMethod}}{{^isResponseFile}}<any>{{/isResponseFile}}(`${this.basePath}{{{path}}}`, {{#bodyParam}}{{paramName}}, {{/bodyParam}}
+          {{#hasFormParams}}convertFormParamsToString ? formParams.toString() : formParams, {{/hasFormParams}}{
 {{#hasQueryParams}}
             params: queryParameters,
 {{/hasQueryParams}}
@@ -273,33 +276,32 @@ export class {{classname}} {
             responseType: "blob",
 {{/isResponseFile}}
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
 {{/useHttpClient}}
 {{^useHttpClient}}
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: {{httpMethod}},
-            headers: headers,
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: {{httpMethod}},
+              headers: headers,
 {{#bodyParam}}
-            body: {{paramName}} == null ? '' : JSON.stringify({{paramName}}), // https://github.com/angular/angular/issues/10612
+              body: {{paramName}} == null ? '' : JSON.stringify({{paramName}}), // https://github.com/angular/angular/issues/10612
 {{/bodyParam}}
 {{#hasFormParams}}
-            body: convertFormParamsToString ? formParams.toString() : formParams,
+              body: convertFormParamsToString ? formParams.toString() : formParams,
 {{/hasFormParams}}
 {{#isResponseFile}}
-            responseType: ResponseContentType.Blob,
+              responseType: ResponseContentType.Blob,
 {{/isResponseFile}}
 {{#hasQueryParams}}
-            search: queryParameters,
+              search: queryParameters,
 {{/hasQueryParams}}
-            withCredentials:this.configuration.withCredentials
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}{{{path}}}`, requestOptions);
-{{/useHttpClient}}        
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}{{{path}}}`, requestOptions));
+{{/useHttpClient}}
     }
 
 {{/operation}}}
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular/configuration.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/configuration.mustache
index 005c3a26df3..d7847235074 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular/configuration.mustache
@@ -1,8 +1,10 @@
+import { Observable } from 'rxjs/Observable';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 }
@@ -11,7 +13,7 @@ export class Configuration {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular/rxjs-operators.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/rxjs-operators.mustache
index 5659cd0694f..f81b512d8f0 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular/rxjs-operators.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular/rxjs-operators.mustache
@@ -5,7 +5,11 @@
 
 // Statics
 import 'rxjs/add/observable/throw';
+import 'rxjs/add/observable/of';
 
 // Operators
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/zip';
+import 'rxjs/add/operator/do';
+import 'rxjs/add/operator/mergeMap';
diff --git a/pom.xml b/pom.xml
index d063b8780d4..ad72316dd2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -860,6 +860,7 @@
                 <module>samples/client/petstore/typescript-jquery/npm</module>-->
                 <module>samples/client/petstore/typescript-angular-v2/npm</module>
                 <module>samples/client/petstore/typescript-angular-v4/npm</module>
+                <module>samples/client/petstore/typescript-angular-v4.3/npm</module>
                 <!-- comment out due to https://github.com/swagger-api/swagger-codegen/issues/6658
                 <module>samples/client/petstore/swift3/default/SwaggerClientTests</module>
                 <module>samples/client/petstore/swift3/promisekit/SwaggerClientTests</module>
diff --git a/samples/client/petstore-security-test/typescript-angular/.gitignore b/samples/client/petstore-security-test/typescript-angular/.gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/samples/client/petstore-security-test/typescript-angular/.gitignore
+++ b/samples/client/petstore-security-test/typescript-angular/.gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/samples/client/petstore-security-test/typescript-angular/.swagger-codegen/VERSION b/samples/client/petstore-security-test/typescript-angular/.swagger-codegen/VERSION
index 6b4d1577382..f9f7450d135 100644
--- a/samples/client/petstore-security-test/typescript-angular/.swagger-codegen/VERSION
+++ b/samples/client/petstore-security-test/typescript-angular/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.2.3
\ No newline at end of file
+2.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore-security-test/typescript-angular/api.module.ts b/samples/client/petstore-security-test/typescript-angular/api.module.ts
index daa111453ca..c3bde487bc4 100644
--- a/samples/client/petstore-security-test/typescript-angular/api.module.ts
+++ b/samples/client/petstore-security-test/typescript-angular/api.module.ts
@@ -1,7 +1,21 @@
-import * as api from './api/api';
-import * as angular from 'angular';
+import { NgModule, ModuleWithProviders } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpModule } from '@angular/http';
+import { Configuration } from './configuration';
 
-const apiModule = angular.module('api', [])
-.service('FakeApi', api.FakeApi)
+import { FakeService } from './api/fake.service';
 
-export default apiModule;
+@NgModule({
+  imports:      [ CommonModule, HttpModule ],
+  declarations: [],
+  exports:      [],
+  providers:    [ FakeService ]
+})
+export class ApiModule {
+    public static forConfig(configurationFactory: () => Configuration): ModuleWithProviders {
+        return {
+            ngModule: ApiModule,
+            providers: [ {provide: Configuration, useFactory: configurationFactory}]
+        }
+    }
+}
diff --git a/samples/client/petstore-security-test/typescript-angular/api/api.ts b/samples/client/petstore-security-test/typescript-angular/api/api.ts
index 4c0b3c9f56b..1457e1d01f4 100644
--- a/samples/client/petstore-security-test/typescript-angular/api/api.ts
+++ b/samples/client/petstore-security-test/typescript-angular/api/api.ts
@@ -1,3 +1,3 @@
-export * from './FakeApi';
-import { FakeApi } from './FakeApi';
-export const APIS = [FakeApi];
+export * from './fake.service';
+import { FakeService } from './fake.service';
+export const APIS = [FakeService];
diff --git a/samples/client/petstore-security-test/typescript-angular/api/fake.service.ts b/samples/client/petstore-security-test/typescript-angular/api/fake.service.ts
new file mode 100644
index 00000000000..b87aabfc6f1
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular/api/fake.service.ts
@@ -0,0 +1,98 @@
+/**
+ * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end --       
+ *
+ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
+ * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/* tslint:disable:no-unused-variable member-ordering */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { HttpClient, HttpHeaders, HttpParams }               from '@angular/common/http';
+
+import { Observable }                                        from 'rxjs/Observable';
+import '../rxjs-operators';
+
+
+import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
+import { Configuration }                                     from '../configuration';
+import { CustomHttpUrlEncodingCodec }                        from '../encoder';
+
+
+@Injectable()
+export class FakeService {
+
+    protected basePath = 'https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r';
+    public defaultHeaders = new HttpHeaders();
+    public configuration = new Configuration();
+
+    constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+            this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+
+    /**
+     * @param consumes string[] mime-types
+     * @return true: consumes contains 'multipart/form-data', false: otherwise
+     */
+    private canConsumeForm(consumes: string[]): boolean {
+        const form = 'multipart/form-data';
+        for (let consume of consumes) {
+            if (form === consume) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+
+    /**
+     * To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     * 
+     * @param test code inject * &#39; &quot; &#x3D;end  rn n r To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     */
+    public testCodeInjectEndRnNR(test code inject * &#39; &quot; &#x3D;end  rn n r?: string): Observable<{}> {
+
+        let headersObservable = Observable.of(this.defaultHeaders);
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'application/json',
+            '*_/   =end --       '
+        ];
+        const canConsumeForm = this.canConsumeForm(consumes);
+
+        let formParams: { append(param: string, value: any): void; };
+        let useForm = false;
+        let convertFormParamsToString = false;
+        if (useForm) {
+            formParams = new FormData();
+        } else {
+            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        }
+
+
+
+        if (test code inject * &#39; &quot; &#x3D;end  rn n r !== undefined) {
+            formParams = formParams.append('test code inject */ &#39; &quot; &#x3D;end -- \r\n \n \r', <any>test code inject * &#39; &quot; &#x3D;end  rn n r) || formParams;
+        }
+
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.put<any>(`${this.basePath}/fake`, 
+          convertFormParamsToString ? formParams.toString() : formParams, {
+            headers: headers,
+            withCredentials: this.configuration.withCredentials,
+        }));
+    }
+
+}
diff --git a/samples/client/petstore-security-test/typescript-angular/configuration.ts b/samples/client/petstore-security-test/typescript-angular/configuration.ts
new file mode 100644
index 00000000000..d7847235074
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular/configuration.ts
@@ -0,0 +1,28 @@
+import { Observable } from 'rxjs/Observable';
+
+export interface ConfigurationParameters {
+    apiKeys?: {[ key: string ]: string};
+    username?: string;
+    password?: string;
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
+    basePath?: string;
+    withCredentials?: boolean;
+}
+
+export class Configuration {
+    apiKeys?: {[ key: string ]: string};
+    username?: string;
+    password?: string;
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
+    basePath?: string;
+    withCredentials?: boolean;
+
+    constructor(configurationParameters: ConfigurationParameters = {}) {
+        this.apiKeys = configurationParameters.apiKeys;
+        this.username = configurationParameters.username;
+        this.password = configurationParameters.password;
+        this.accessToken = configurationParameters.accessToken;
+        this.basePath = configurationParameters.basePath;
+        this.withCredentials = configurationParameters.withCredentials;
+    }
+}
diff --git a/samples/client/petstore-security-test/typescript-angular/encoder.ts b/samples/client/petstore-security-test/typescript-angular/encoder.ts
new file mode 100644
index 00000000000..f1c6b78c9c8
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular/encoder.ts
@@ -0,0 +1,18 @@
+    import { HttpUrlEncodingCodec } from '@angular/common/http';
+
+/**
+* CustomHttpUrlEncodingCodec
+* Fix plus sign (+) not encoding, so sent as blank space
+* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+*/
+export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+    encodeKey(k: string): string {
+        k = super.encodeKey(k);
+        return k.replace(/\+/gi, '%2B');
+    }
+    encodeValue(v: string): string {
+        v = super.encodeValue(v);
+        return v.replace(/\+/gi, '%2B');
+    }
+}
+
diff --git a/samples/client/petstore-security-test/typescript-angular/index.ts b/samples/client/petstore-security-test/typescript-angular/index.ts
index 557365516ad..c312b70fa3e 100644
--- a/samples/client/petstore-security-test/typescript-angular/index.ts
+++ b/samples/client/petstore-security-test/typescript-angular/index.ts
@@ -1,2 +1,5 @@
 export * from './api/api';
-export * from './model/models';
\ No newline at end of file
+export * from './model/models';
+export * from './variables';
+export * from './configuration';
+export * from './api.module';
\ No newline at end of file
diff --git a/samples/client/petstore-security-test/typescript-angular/model/ModelReturn.ts b/samples/client/petstore-security-test/typescript-angular/model/ModelReturn.ts
index 0440a6393c6..170661be61a 100644
--- a/samples/client/petstore-security-test/typescript-angular/model/ModelReturn.ts
+++ b/samples/client/petstore-security-test/typescript-angular/model/ModelReturn.ts
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-import * as models from './models';
+
 
 /**
  * Model for testing reserved words  *_/ ' \" =end -- \\r\\n \\n \\r
@@ -19,6 +19,6 @@ export interface ModelReturn {
     /**
      * property description  *_/ ' \" =end -- \\r\\n \\n \\r
      */
-    "return"?: number;
-}
+    return?: number;
 
+}
diff --git a/samples/client/petstore-security-test/typescript-angular/model/modelReturn.ts b/samples/client/petstore-security-test/typescript-angular/model/modelReturn.ts
new file mode 100644
index 00000000000..e2360156a9d
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular/model/modelReturn.ts
@@ -0,0 +1,26 @@
+/**
+ * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end --       
+ *
+ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
+ * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+
+/**
+ * Model for testing reserved words  *_/ ' \" =end -- \\r\\n \\n \\r
+ */
+export interface ModelReturn {
+    /**
+     * property description  *_/ ' \" =end -- \\r\\n \\n \\r
+     */
+    return?: number;
+
+}
+
+
diff --git a/samples/client/petstore-security-test/typescript-angular/model/models.ts b/samples/client/petstore-security-test/typescript-angular/model/models.ts
index df8a2d48008..bca4c78d6b0 100644
--- a/samples/client/petstore-security-test/typescript-angular/model/models.ts
+++ b/samples/client/petstore-security-test/typescript-angular/model/models.ts
@@ -1 +1 @@
-export * from './ModelReturn';
+export * from './modelReturn';
diff --git a/samples/client/petstore-security-test/typescript-angular/rxjs-operators.ts b/samples/client/petstore-security-test/typescript-angular/rxjs-operators.ts
new file mode 100644
index 00000000000..f81b512d8f0
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular/rxjs-operators.ts
@@ -0,0 +1,15 @@
+// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
+
+// See node_module/rxjs/Rxjs.js
+// Import just the rxjs statics and operators we need for THIS app.
+
+// Statics
+import 'rxjs/add/observable/throw';
+import 'rxjs/add/observable/of';
+
+// Operators
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/zip';
+import 'rxjs/add/operator/do';
+import 'rxjs/add/operator/mergeMap';
diff --git a/samples/client/petstore-security-test/typescript-angular/variables.ts b/samples/client/petstore-security-test/typescript-angular/variables.ts
new file mode 100644
index 00000000000..6fe58549f39
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular/variables.ts
@@ -0,0 +1,9 @@
+import { InjectionToken } from '@angular/core';
+
+export const BASE_PATH = new InjectionToken<string>('basePath');
+export const COLLECTION_FORMATS = {
+    'csv': ',',
+    'tsv': '   ',
+    'ssv': ' ',
+    'pipes': '|'
+}
diff --git a/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
index 11a1b603831..03d5592e50e 100644
--- a/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
@@ -204,30 +204,32 @@ export class PetService {
             throw new Error('Required parameter body was null or undefined when calling addPet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet`, requestOptions));
     }
 
     /**
@@ -241,30 +243,32 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling deletePet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
         if (apiKey !== undefined && apiKey !== null) {
-            headers.set('api_key', String(apiKey));
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', String(apiKey)); });
         }
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -282,28 +286,30 @@ export class PetService {
             queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/findByStatus`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/findByStatus`, requestOptions));
     }
 
     /**
@@ -321,28 +327,30 @@ export class PetService {
             queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/findByTags`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/findByTags`, requestOptions));
     }
 
     /**
@@ -355,24 +363,23 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling getPetById.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (api_key) required
         if (this.configuration.apiKeys["api_key"]) {
-            headers.set('api_key', this.configuration.apiKeys["api_key"]);
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', this.configuration.apiKeys["api_key"]); });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -385,30 +392,32 @@ export class PetService {
             throw new Error('Required parameter body was null or undefined when calling updatePet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Put,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Put,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet`, requestOptions));
     }
 
     /**
@@ -423,14 +432,17 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
         // to determine the Content-Type header
@@ -449,7 +461,7 @@ export class PetService {
             convertFormParamsToString = true;
             formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
             // set the content-type explicitly to avoid having it set to 'text/plain'
-            headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
+            headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8'));
         }
 
 
@@ -461,18 +473,17 @@ export class PetService {
             formParams.append('status', <any>status);
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: convertFormParamsToString ? formParams.toString() : formParams,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: convertFormParamsToString ? formParams.toString() : formParams,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -487,14 +498,17 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling uploadFile.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
         // to determine the Content-Type header
@@ -516,7 +530,7 @@ export class PetService {
             convertFormParamsToString = true;
             formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
             // set the content-type explicitly to avoid having it set to 'text/plain'
-            headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
+            headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8'));
         }
 
 
@@ -528,18 +542,17 @@ export class PetService {
             formParams.append('file', <any>file);
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: convertFormParamsToString ? formParams.toString() : formParams,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: convertFormParamsToString ? formParams.toString() : formParams,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
index 393d291ba3d..104154578d5 100644
--- a/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
@@ -133,19 +133,18 @@ export class StoreService {
             throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions));
     }
 
     /**
@@ -154,24 +153,23 @@ export class StoreService {
      */
     public getInventoryWithHttpInfo(extraHttpRequestParams?: RequestOptionsArgs): Observable<Response> {
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (api_key) required
         if (this.configuration.apiKeys["api_key"]) {
-            headers.set('api_key', this.configuration.apiKeys["api_key"]);
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', this.configuration.apiKeys["api_key"]); });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/inventory`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/inventory`, requestOptions));
     }
 
     /**
@@ -184,19 +182,18 @@ export class StoreService {
             throw new Error('Required parameter orderId was null or undefined when calling getOrderById.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions));
     }
 
     /**
@@ -209,22 +206,21 @@ export class StoreService {
             throw new Error('Required parameter body was null or undefined when calling placeOrder.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
index f495f1f9d39..760688e20e4 100644
--- a/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
@@ -199,22 +199,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user`, requestOptions));
     }
 
     /**
@@ -227,22 +226,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/createWithArray`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/createWithArray`, requestOptions));
     }
 
     /**
@@ -255,22 +253,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/createWithList`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/createWithList`, requestOptions));
     }
 
     /**
@@ -283,19 +280,18 @@ export class UserService {
             throw new Error('Required parameter username was null or undefined when calling deleteUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
     /**
@@ -308,19 +304,18 @@ export class UserService {
             throw new Error('Required parameter username was null or undefined when calling getUserByName.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
     /**
@@ -345,20 +340,19 @@ export class UserService {
             queryParameters.set('password', <any>password);
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/login`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/login`, requestOptions));
     }
 
     /**
@@ -367,19 +361,18 @@ export class UserService {
      */
     public logoutUserWithHttpInfo(extraHttpRequestParams?: RequestOptionsArgs): Observable<Response> {
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/logout`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/logout`, requestOptions));
     }
 
     /**
@@ -396,22 +389,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling updateUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Put,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Put,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v2/default/configuration.ts b/samples/client/petstore/typescript-angular-v2/default/configuration.ts
index 005c3a26df3..d7847235074 100644
--- a/samples/client/petstore/typescript-angular-v2/default/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/configuration.ts
@@ -1,8 +1,10 @@
+import { Observable } from 'rxjs/Observable';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 }
@@ -11,7 +13,7 @@ export class Configuration {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/ApiResponse.ts b/samples/client/petstore/typescript-angular-v2/default/model/apiResponse.ts
similarity index 99%
rename from samples/client/petstore/typescript-angular-v2/default/model/ApiResponse.ts
rename to samples/client/petstore/typescript-angular-v2/default/model/apiResponse.ts
index 3af781cf580..e79fabe8c8c 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/ApiResponse.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/apiResponse.ts
@@ -23,3 +23,5 @@ export interface ApiResponse {
     message?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/category.ts b/samples/client/petstore/typescript-angular-v2/default/model/category.ts
index d09f8d7b265..56608731f95 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/category.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/category.ts
@@ -21,3 +21,5 @@ export interface Category {
     name?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/order.ts b/samples/client/petstore/typescript-angular-v2/default/model/order.ts
index 4639b8c2949..84b59f1b09a 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/order.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/order.ts
@@ -35,3 +35,5 @@ export interface Order {
 export namespace Order {
     export type StatusEnum = 'placed' | 'approved' | 'delivered';
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/pet.ts b/samples/client/petstore/typescript-angular-v2/default/model/pet.ts
index ce6c535b867..c0fc942934c 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/pet.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/pet.ts
@@ -37,3 +37,5 @@ export interface Pet {
 export namespace Pet {
     export type StatusEnum = 'available' | 'pending' | 'sold';
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/tag.ts b/samples/client/petstore/typescript-angular-v2/default/model/tag.ts
index 3ed1eeff8f3..dbfa473f538 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/tag.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/tag.ts
@@ -21,3 +21,5 @@ export interface Tag {
     name?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/user.ts b/samples/client/petstore/typescript-angular-v2/default/model/user.ts
index f4914ae2608..4dfad607c51 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/user.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/user.ts
@@ -36,3 +36,5 @@ export interface User {
     userStatus?: number;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/rxjs-operators.ts b/samples/client/petstore/typescript-angular-v2/default/rxjs-operators.ts
index 5659cd0694f..f81b512d8f0 100644
--- a/samples/client/petstore/typescript-angular-v2/default/rxjs-operators.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/rxjs-operators.ts
@@ -5,7 +5,11 @@
 
 // Statics
 import 'rxjs/add/observable/throw';
+import 'rxjs/add/observable/of';
 
 // Operators
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/zip';
+import 'rxjs/add/operator/do';
+import 'rxjs/add/operator/mergeMap';
diff --git a/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
index 11a1b603831..03d5592e50e 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
@@ -204,30 +204,32 @@ export class PetService {
             throw new Error('Required parameter body was null or undefined when calling addPet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet`, requestOptions));
     }
 
     /**
@@ -241,30 +243,32 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling deletePet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
         if (apiKey !== undefined && apiKey !== null) {
-            headers.set('api_key', String(apiKey));
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', String(apiKey)); });
         }
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -282,28 +286,30 @@ export class PetService {
             queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/findByStatus`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/findByStatus`, requestOptions));
     }
 
     /**
@@ -321,28 +327,30 @@ export class PetService {
             queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/findByTags`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/findByTags`, requestOptions));
     }
 
     /**
@@ -355,24 +363,23 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling getPetById.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (api_key) required
         if (this.configuration.apiKeys["api_key"]) {
-            headers.set('api_key', this.configuration.apiKeys["api_key"]);
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', this.configuration.apiKeys["api_key"]); });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -385,30 +392,32 @@ export class PetService {
             throw new Error('Required parameter body was null or undefined when calling updatePet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Put,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Put,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet`, requestOptions));
     }
 
     /**
@@ -423,14 +432,17 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
         // to determine the Content-Type header
@@ -449,7 +461,7 @@ export class PetService {
             convertFormParamsToString = true;
             formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
             // set the content-type explicitly to avoid having it set to 'text/plain'
-            headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
+            headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8'));
         }
 
 
@@ -461,18 +473,17 @@ export class PetService {
             formParams.append('status', <any>status);
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: convertFormParamsToString ? formParams.toString() : formParams,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: convertFormParamsToString ? formParams.toString() : formParams,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -487,14 +498,17 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling uploadFile.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
         // to determine the Content-Type header
@@ -516,7 +530,7 @@ export class PetService {
             convertFormParamsToString = true;
             formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
             // set the content-type explicitly to avoid having it set to 'text/plain'
-            headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
+            headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8'));
         }
 
 
@@ -528,18 +542,17 @@ export class PetService {
             formParams.append('file', <any>file);
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: convertFormParamsToString ? formParams.toString() : formParams,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: convertFormParamsToString ? formParams.toString() : formParams,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
index 393d291ba3d..104154578d5 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
@@ -133,19 +133,18 @@ export class StoreService {
             throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions));
     }
 
     /**
@@ -154,24 +153,23 @@ export class StoreService {
      */
     public getInventoryWithHttpInfo(extraHttpRequestParams?: RequestOptionsArgs): Observable<Response> {
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (api_key) required
         if (this.configuration.apiKeys["api_key"]) {
-            headers.set('api_key', this.configuration.apiKeys["api_key"]);
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', this.configuration.apiKeys["api_key"]); });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/inventory`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/inventory`, requestOptions));
     }
 
     /**
@@ -184,19 +182,18 @@ export class StoreService {
             throw new Error('Required parameter orderId was null or undefined when calling getOrderById.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions));
     }
 
     /**
@@ -209,22 +206,21 @@ export class StoreService {
             throw new Error('Required parameter body was null or undefined when calling placeOrder.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts
index f495f1f9d39..760688e20e4 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts
@@ -199,22 +199,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user`, requestOptions));
     }
 
     /**
@@ -227,22 +226,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/createWithArray`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/createWithArray`, requestOptions));
     }
 
     /**
@@ -255,22 +253,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/createWithList`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/createWithList`, requestOptions));
     }
 
     /**
@@ -283,19 +280,18 @@ export class UserService {
             throw new Error('Required parameter username was null or undefined when calling deleteUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
     /**
@@ -308,19 +304,18 @@ export class UserService {
             throw new Error('Required parameter username was null or undefined when calling getUserByName.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
     /**
@@ -345,20 +340,19 @@ export class UserService {
             queryParameters.set('password', <any>password);
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/login`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/login`, requestOptions));
     }
 
     /**
@@ -367,19 +361,18 @@ export class UserService {
      */
     public logoutUserWithHttpInfo(extraHttpRequestParams?: RequestOptionsArgs): Observable<Response> {
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/logout`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/logout`, requestOptions));
     }
 
     /**
@@ -396,22 +389,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling updateUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Put,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Put,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v2/npm/configuration.ts b/samples/client/petstore/typescript-angular-v2/npm/configuration.ts
index 005c3a26df3..d7847235074 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/configuration.ts
@@ -1,8 +1,10 @@
+import { Observable } from 'rxjs/Observable';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 }
@@ -11,7 +13,7 @@ export class Configuration {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/ApiResponse.ts b/samples/client/petstore/typescript-angular-v2/npm/model/apiResponse.ts
similarity index 99%
rename from samples/client/petstore/typescript-angular-v2/npm/model/ApiResponse.ts
rename to samples/client/petstore/typescript-angular-v2/npm/model/apiResponse.ts
index 3af781cf580..e79fabe8c8c 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/ApiResponse.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/apiResponse.ts
@@ -23,3 +23,5 @@ export interface ApiResponse {
     message?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/category.ts b/samples/client/petstore/typescript-angular-v2/npm/model/category.ts
index d09f8d7b265..56608731f95 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/category.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/category.ts
@@ -21,3 +21,5 @@ export interface Category {
     name?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/order.ts b/samples/client/petstore/typescript-angular-v2/npm/model/order.ts
index 4639b8c2949..84b59f1b09a 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/order.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/order.ts
@@ -35,3 +35,5 @@ export interface Order {
 export namespace Order {
     export type StatusEnum = 'placed' | 'approved' | 'delivered';
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/pet.ts b/samples/client/petstore/typescript-angular-v2/npm/model/pet.ts
index ce6c535b867..c0fc942934c 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/pet.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/pet.ts
@@ -37,3 +37,5 @@ export interface Pet {
 export namespace Pet {
     export type StatusEnum = 'available' | 'pending' | 'sold';
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/tag.ts b/samples/client/petstore/typescript-angular-v2/npm/model/tag.ts
index 3ed1eeff8f3..dbfa473f538 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/tag.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/tag.ts
@@ -21,3 +21,5 @@ export interface Tag {
     name?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/user.ts b/samples/client/petstore/typescript-angular-v2/npm/model/user.ts
index f4914ae2608..4dfad607c51 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/user.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/user.ts
@@ -36,3 +36,5 @@ export interface User {
     userStatus?: number;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/package-lock.json b/samples/client/petstore/typescript-angular-v2/npm/package-lock.json
index e75509b0294..d72ef237878 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/package-lock.json
+++ b/samples/client/petstore/typescript-angular-v2/npm/package-lock.json
@@ -2,6 +2,7 @@
   "name": "@swagger/angular2-typescript-petstore",
   "version": "0.0.1",
   "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
     "@angular/common": {
       "version": "2.4.10",
@@ -43,7 +44,10 @@
       "version": "5.4.2",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.2.tgz",
       "integrity": "sha1-KjI2/L8D31e64G/Wly/ZnlwI/Pc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "symbol-observable": "1.0.4"
+      }
     },
     "symbol-observable": {
       "version": "1.0.4",
diff --git a/samples/client/petstore/typescript-angular-v2/npm/package.json b/samples/client/petstore/typescript-angular-v2/npm/package.json
index d6aee04c589..0e363919a9b 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/package.json
+++ b/samples/client/petstore/typescript-angular-v2/npm/package.json
@@ -35,6 +35,6 @@
     "typescript": "^2.1.5"
   },
   "publishConfig": {
-    "registry":"https://skimdb.npmjs.com/registry"
+    "registry": "https://skimdb.npmjs.com/registry"
   }
 }
diff --git a/samples/client/petstore/typescript-angular-v2/npm/rxjs-operators.ts b/samples/client/petstore/typescript-angular-v2/npm/rxjs-operators.ts
index 5659cd0694f..f81b512d8f0 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/rxjs-operators.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/rxjs-operators.ts
@@ -5,7 +5,11 @@
 
 // Statics
 import 'rxjs/add/observable/throw';
+import 'rxjs/add/observable/of';
 
 // Operators
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/zip';
+import 'rxjs/add/operator/do';
+import 'rxjs/add/operator/mergeMap';
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/PetApi.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/PetApi.ts
deleted file mode 100644
index 0d1c1439c34..00000000000
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/PetApi.ts
+++ /dev/null
@@ -1,610 +0,0 @@
-/**
- * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-/* tslint:disable:no-unused-variable member-ordering */
-
-import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
-
-import { Observable }                                        from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
-
-import * as models                                           from '../model/models';
-import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
-import { Configuration }                                     from '../configuration';
-import { PetApiInterface }                            from './PetApiInterface';
-
-
-@Injectable()
-export class PetApi implements PetApiInterface {
-
-    protected basePath = 'http://petstore.swagger.io/v2';
-    public defaultHeaders: Headers = new Headers();
-    public configuration: Configuration = new Configuration();
-
-    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
-        if (basePath) {
-            this.basePath = basePath;
-        }
-        if (configuration) {
-            this.configuration = configuration;
-        }
-    }
-
-    /**
-     * 
-     * @summary Add a new pet to the store
-     * @param body Pet object that needs to be added to the store
-     */
-    public addPet(body: models.Pet, extraHttpRequestParams?: any): Observable<{}> {
-        return this.addPetWithHttpInfo(body, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * 
-     * @summary Deletes a pet
-     * @param petId Pet id to delete
-     * @param apiKey 
-     */
-    public deletePet(petId: number, apiKey?: string, extraHttpRequestParams?: any): Observable<{}> {
-        return this.deletePetWithHttpInfo(petId, apiKey, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * Multiple status values can be provided with comma separated strings
-     * @summary Finds Pets by status
-     * @param status Status values that need to be considered for filter
-     */
-    public findPetsByStatus(status: Array<string>, extraHttpRequestParams?: any): Observable<Array<models.Pet>> {
-        return this.findPetsByStatusWithHttpInfo(status, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * @summary Finds Pets by tags
-     * @param tags Tags to filter by
-     */
-    public findPetsByTags(tags: Array<string>, extraHttpRequestParams?: any): Observable<Array<models.Pet>> {
-        return this.findPetsByTagsWithHttpInfo(tags, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * Returns a single pet
-     * @summary Find pet by ID
-     * @param petId ID of pet to return
-     */
-    public getPetById(petId: number, extraHttpRequestParams?: any): Observable<models.Pet> {
-        return this.getPetByIdWithHttpInfo(petId, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * 
-     * @summary Update an existing pet
-     * @param body Pet object that needs to be added to the store
-     */
-    public updatePet(body: models.Pet, extraHttpRequestParams?: any): Observable<{}> {
-        return this.updatePetWithHttpInfo(body, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * 
-     * @summary Updates a pet in the store with form data
-     * @param petId ID of pet that needs to be updated
-     * @param name Updated name of the pet
-     * @param status Updated status of the pet
-     */
-    public updatePetWithForm(petId: number, name?: string, status?: string, extraHttpRequestParams?: any): Observable<{}> {
-        return this.updatePetWithFormWithHttpInfo(petId, name, status, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * 
-     * @summary uploads an image
-     * @param petId ID of pet to update
-     * @param additionalMetadata Additional data to pass to server
-     * @param file file to upload
-     */
-    public uploadFile(petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any): Observable<models.ApiResponse> {
-        return this.uploadFileWithHttpInfo(petId, additionalMetadata, file, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-
-    /**
-     * Add a new pet to the store
-     * 
-     * @param body Pet object that needs to be added to the store
-     */
-    public addPetWithHttpInfo(body: models.Pet, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/pet';
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling addPet.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        // authentication (petstore_auth) required
-        // oauth required
-        if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        headers.set('Content-Type', 'application/json');
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Deletes a pet
-     * 
-     * @param petId Pet id to delete
-     * @param apiKey 
-     */
-    public deletePetWithHttpInfo(petId: number, apiKey?: string, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/pet/${petId}'
-                    .replace('${' + 'petId' + '}', String(petId));
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'petId' is not null or undefined
-        if (petId === null || petId === undefined) {
-            throw new Error('Required parameter petId was null or undefined when calling deletePet.');
-        }
-        if (apiKey !== undefined && apiKey !== null) {
-            headers.set('api_key', String(apiKey));
-        }
-
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        // authentication (petstore_auth) required
-        // oauth required
-        if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Finds Pets by status
-     * Multiple status values can be provided with comma separated strings
-     * @param status Status values that need to be considered for filter
-     */
-    public findPetsByStatusWithHttpInfo(status: Array<string>, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/pet/findByStatus';
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'status' is not null or undefined
-        if (status === null || status === undefined) {
-            throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
-        }
-        if (status) {
-            queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
-        }
-
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        // authentication (petstore_auth) required
-        // oauth required
-        if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Finds Pets by tags
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * @param tags Tags to filter by
-     */
-    public findPetsByTagsWithHttpInfo(tags: Array<string>, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/pet/findByTags';
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'tags' is not null or undefined
-        if (tags === null || tags === undefined) {
-            throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
-        }
-        if (tags) {
-            queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
-        }
-
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        // authentication (petstore_auth) required
-        // oauth required
-        if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Find pet by ID
-     * Returns a single pet
-     * @param petId ID of pet to return
-     */
-    public getPetByIdWithHttpInfo(petId: number, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/pet/${petId}'
-                    .replace('${' + 'petId' + '}', String(petId));
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'petId' is not null or undefined
-        if (petId === null || petId === undefined) {
-            throw new Error('Required parameter petId was null or undefined when calling getPetById.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        // authentication (api_key) required
-        if (this.configuration.apiKey) {
-            headers.set('api_key', this.configuration.apiKey);
-        }
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Update an existing pet
-     * 
-     * @param body Pet object that needs to be added to the store
-     */
-    public updatePetWithHttpInfo(body: models.Pet, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/pet';
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling updatePet.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        // authentication (petstore_auth) required
-        // oauth required
-        if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        headers.set('Content-Type', 'application/json');
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Put,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Updates a pet in the store with form data
-     * 
-     * @param petId ID of pet that needs to be updated
-     * @param name Updated name of the pet
-     * @param status Updated status of the pet
-     */
-    public updatePetWithFormWithHttpInfo(petId: number, name?: string, status?: string, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/pet/${petId}'
-                    .replace('${' + 'petId' + '}', String(petId));
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        let formParams = new URLSearchParams();
-
-        // verify required parameter 'petId' is not null or undefined
-        if (petId === null || petId === undefined) {
-            throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-            'application/x-www-form-urlencoded'
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        // authentication (petstore_auth) required
-        // oauth required
-        if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        headers.set('Content-Type', 'application/x-www-form-urlencoded');
-
-        if (name !== undefined) {
-            formParams.set('name', <any>name);
-        }
-
-        if (status !== undefined) {
-            formParams.set('status', <any>status);
-        }
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: formParams.toString(),
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * uploads an image
-     * 
-     * @param petId ID of pet to update
-     * @param additionalMetadata Additional data to pass to server
-     * @param file file to upload
-     */
-    public uploadFileWithHttpInfo(petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/pet/${petId}/uploadImage'
-                    .replace('${' + 'petId' + '}', String(petId));
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        let formParams = new URLSearchParams();
-
-        // verify required parameter 'petId' is not null or undefined
-        if (petId === null || petId === undefined) {
-            throw new Error('Required parameter petId was null or undefined when calling uploadFile.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-            'multipart/form-data'
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        // authentication (petstore_auth) required
-        // oauth required
-        if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        headers.set('Content-Type', 'application/x-www-form-urlencoded');
-
-        if (additionalMetadata !== undefined) {
-            formParams.set('additionalMetadata', <any>additionalMetadata);
-        }
-
-        if (file !== undefined) {
-            formParams.set('file', <any>file);
-        }
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: formParams.toString(),
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-}
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/PetApiInterface.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/PetApiInterface.ts
deleted file mode 100644
index 3f7c04d27db..00000000000
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/PetApiInterface.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-import { Headers }                                           from '@angular/http';
-
-import { Observable }                                        from 'rxjs/Observable';
-
-import * as models                                           from '../model/models';
-import { Configuration }                                     from '../configuration';
-
-
-export interface PetApiInterface {
-    defaultHeaders: Headers;
-    configuration: Configuration;
-    [others: string]: any;
-
-    /**
-    * Add a new pet to the store
-    * 
-    * @param body Pet object that needs to be added to the store
-    */
-    addPet(body: models.Pet, extraHttpRequestParams?: any): Observable<{}>;
-
-    /**
-    * Deletes a pet
-    * 
-    * @param petId Pet id to delete
-    * @param apiKey 
-    */
-    deletePet(petId: number, apiKey?: string, extraHttpRequestParams?: any): Observable<{}>;
-
-    /**
-    * Finds Pets by status
-    * Multiple status values can be provided with comma separated strings
-    * @param status Status values that need to be considered for filter
-    */
-    findPetsByStatus(status: Array<string>, extraHttpRequestParams?: any): Observable<Array<models.Pet>>;
-
-    /**
-    * Finds Pets by tags
-    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-    * @param tags Tags to filter by
-    */
-    findPetsByTags(tags: Array<string>, extraHttpRequestParams?: any): Observable<Array<models.Pet>>;
-
-    /**
-    * Find pet by ID
-    * Returns a single pet
-    * @param petId ID of pet to return
-    */
-    getPetById(petId: number, extraHttpRequestParams?: any): Observable<models.Pet>;
-
-    /**
-    * Update an existing pet
-    * 
-    * @param body Pet object that needs to be added to the store
-    */
-    updatePet(body: models.Pet, extraHttpRequestParams?: any): Observable<{}>;
-
-    /**
-    * Updates a pet in the store with form data
-    * 
-    * @param petId ID of pet that needs to be updated
-    * @param name Updated name of the pet
-    * @param status Updated status of the pet
-    */
-    updatePetWithForm(petId: number, name?: string, status?: string, extraHttpRequestParams?: any): Observable<{}>;
-
-    /**
-    * uploads an image
-    * 
-    * @param petId ID of pet to update
-    * @param additionalMetadata Additional data to pass to server
-    * @param file file to upload
-    */
-    uploadFile(petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any): Observable<models.ApiResponse>;
-
-}
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/StoreApi.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/StoreApi.ts
deleted file mode 100644
index 137c9b76625..00000000000
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/StoreApi.ts
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-/* tslint:disable:no-unused-variable member-ordering */
-
-import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
-
-import { Observable }                                        from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
-
-import * as models                                           from '../model/models';
-import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
-import { Configuration }                                     from '../configuration';
-import { StoreApiInterface }                            from './StoreApiInterface';
-
-
-@Injectable()
-export class StoreApi implements StoreApiInterface {
-
-    protected basePath = 'http://petstore.swagger.io/v2';
-    public defaultHeaders: Headers = new Headers();
-    public configuration: Configuration = new Configuration();
-
-    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
-        if (basePath) {
-            this.basePath = basePath;
-        }
-        if (configuration) {
-            this.configuration = configuration;
-        }
-    }
-
-    /**
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     * @summary Delete purchase order by ID
-     * @param orderId ID of the order that needs to be deleted
-     */
-    public deleteOrder(orderId: string, extraHttpRequestParams?: any): Observable<{}> {
-        return this.deleteOrderWithHttpInfo(orderId, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * Returns a map of status codes to quantities
-     * @summary Returns pet inventories by status
-     */
-    public getInventory(extraHttpRequestParams?: any): Observable<{ [key: string]: number; }> {
-        return this.getInventoryWithHttpInfo(extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     * @summary Find purchase order by ID
-     * @param orderId ID of pet that needs to be fetched
-     */
-    public getOrderById(orderId: number, extraHttpRequestParams?: any): Observable<models.Order> {
-        return this.getOrderByIdWithHttpInfo(orderId, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * 
-     * @summary Place an order for a pet
-     * @param body order placed for purchasing the pet
-     */
-    public placeOrder(body: models.Order, extraHttpRequestParams?: any): Observable<models.Order> {
-        return this.placeOrderWithHttpInfo(body, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-
-    /**
-     * Delete purchase order by ID
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     * @param orderId ID of the order that needs to be deleted
-     */
-    public deleteOrderWithHttpInfo(orderId: string, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/store/order/${orderId}'
-                    .replace('${' + 'orderId' + '}', String(orderId));
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'orderId' is not null or undefined
-        if (orderId === null || orderId === undefined) {
-            throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Returns pet inventories by status
-     * Returns a map of status codes to quantities
-     */
-    public getInventoryWithHttpInfo(extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/store/inventory';
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        // authentication (api_key) required
-        if (this.configuration.apiKey) {
-            headers.set('api_key', this.configuration.apiKey);
-        }
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Find purchase order by ID
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     * @param orderId ID of pet that needs to be fetched
-     */
-    public getOrderByIdWithHttpInfo(orderId: number, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/store/order/${orderId}'
-                    .replace('${' + 'orderId' + '}', String(orderId));
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'orderId' is not null or undefined
-        if (orderId === null || orderId === undefined) {
-            throw new Error('Required parameter orderId was null or undefined when calling getOrderById.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Place an order for a pet
-     * 
-     * @param body order placed for purchasing the pet
-     */
-    public placeOrderWithHttpInfo(body: models.Order, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/store/order';
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling placeOrder.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        headers.set('Content-Type', 'application/json');
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-}
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/StoreApiInterface.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/StoreApiInterface.ts
deleted file mode 100644
index ca2476d8210..00000000000
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/StoreApiInterface.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-import { Headers }                                           from '@angular/http';
-
-import { Observable }                                        from 'rxjs/Observable';
-
-import * as models                                           from '../model/models';
-import { Configuration }                                     from '../configuration';
-
-
-export interface StoreApiInterface {
-    defaultHeaders: Headers;
-    configuration: Configuration;
-    [others: string]: any;
-
-    /**
-    * Delete purchase order by ID
-    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-    * @param orderId ID of the order that needs to be deleted
-    */
-    deleteOrder(orderId: string, extraHttpRequestParams?: any): Observable<{}>;
-
-    /**
-    * Returns pet inventories by status
-    * Returns a map of status codes to quantities
-    */
-    getInventory(extraHttpRequestParams?: any): Observable<{ [key: string]: number; }>;
-
-    /**
-    * Find purchase order by ID
-    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-    * @param orderId ID of pet that needs to be fetched
-    */
-    getOrderById(orderId: number, extraHttpRequestParams?: any): Observable<models.Order>;
-
-    /**
-    * Place an order for a pet
-    * 
-    * @param body order placed for purchasing the pet
-    */
-    placeOrder(body: models.Order, extraHttpRequestParams?: any): Observable<models.Order>;
-
-}
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/UserApi.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/UserApi.ts
deleted file mode 100644
index 1fb4f6c6f4d..00000000000
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/UserApi.ts
+++ /dev/null
@@ -1,507 +0,0 @@
-/**
- * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-/* tslint:disable:no-unused-variable member-ordering */
-
-import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
-
-import { Observable }                                        from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
-
-import * as models                                           from '../model/models';
-import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
-import { Configuration }                                     from '../configuration';
-import { UserApiInterface }                            from './UserApiInterface';
-
-
-@Injectable()
-export class UserApi implements UserApiInterface {
-
-    protected basePath = 'http://petstore.swagger.io/v2';
-    public defaultHeaders: Headers = new Headers();
-    public configuration: Configuration = new Configuration();
-
-    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
-        if (basePath) {
-            this.basePath = basePath;
-        }
-        if (configuration) {
-            this.configuration = configuration;
-        }
-    }
-
-    /**
-     * This can only be done by the logged in user.
-     * @summary Create user
-     * @param body Created user object
-     */
-    public createUser(body: models.User, extraHttpRequestParams?: any): Observable<{}> {
-        return this.createUserWithHttpInfo(body, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * 
-     * @summary Creates list of users with given input array
-     * @param body List of user object
-     */
-    public createUsersWithArrayInput(body: Array<models.User>, extraHttpRequestParams?: any): Observable<{}> {
-        return this.createUsersWithArrayInputWithHttpInfo(body, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * 
-     * @summary Creates list of users with given input array
-     * @param body List of user object
-     */
-    public createUsersWithListInput(body: Array<models.User>, extraHttpRequestParams?: any): Observable<{}> {
-        return this.createUsersWithListInputWithHttpInfo(body, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * This can only be done by the logged in user.
-     * @summary Delete user
-     * @param username The name that needs to be deleted
-     */
-    public deleteUser(username: string, extraHttpRequestParams?: any): Observable<{}> {
-        return this.deleteUserWithHttpInfo(username, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * 
-     * @summary Get user by user name
-     * @param username The name that needs to be fetched. Use user1 for testing. 
-     */
-    public getUserByName(username: string, extraHttpRequestParams?: any): Observable<models.User> {
-        return this.getUserByNameWithHttpInfo(username, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * 
-     * @summary Logs user into the system
-     * @param username The user name for login
-     * @param password The password for login in clear text
-     */
-    public loginUser(username: string, password: string, extraHttpRequestParams?: any): Observable<string> {
-        return this.loginUserWithHttpInfo(username, password, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * 
-     * @summary Logs out current logged in user session
-     */
-    public logoutUser(extraHttpRequestParams?: any): Observable<{}> {
-        return this.logoutUserWithHttpInfo(extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-    /**
-     * This can only be done by the logged in user.
-     * @summary Updated user
-     * @param username name that need to be deleted
-     * @param body Updated user object
-     */
-    public updateUser(username: string, body: models.User, extraHttpRequestParams?: any): Observable<{}> {
-        return this.updateUserWithHttpInfo(username, body, extraHttpRequestParams)
-            .map((response: Response) => {
-                if (response.status === 204) {
-                    return undefined;
-                } else {
-                    return response.json() || {};
-                }
-            });
-    }
-
-
-    /**
-     * Create user
-     * This can only be done by the logged in user.
-     * @param body Created user object
-     */
-    public createUserWithHttpInfo(body: models.User, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/user';
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling createUser.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        headers.set('Content-Type', 'application/json');
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Creates list of users with given input array
-     * 
-     * @param body List of user object
-     */
-    public createUsersWithArrayInputWithHttpInfo(body: Array<models.User>, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/user/createWithArray';
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        headers.set('Content-Type', 'application/json');
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Creates list of users with given input array
-     * 
-     * @param body List of user object
-     */
-    public createUsersWithListInputWithHttpInfo(body: Array<models.User>, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/user/createWithList';
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        headers.set('Content-Type', 'application/json');
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Delete user
-     * This can only be done by the logged in user.
-     * @param username The name that needs to be deleted
-     */
-    public deleteUserWithHttpInfo(username: string, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/user/${username}'
-                    .replace('${' + 'username' + '}', String(username));
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'username' is not null or undefined
-        if (username === null || username === undefined) {
-            throw new Error('Required parameter username was null or undefined when calling deleteUser.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Get user by user name
-     * 
-     * @param username The name that needs to be fetched. Use user1 for testing. 
-     */
-    public getUserByNameWithHttpInfo(username: string, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/user/${username}'
-                    .replace('${' + 'username' + '}', String(username));
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'username' is not null or undefined
-        if (username === null || username === undefined) {
-            throw new Error('Required parameter username was null or undefined when calling getUserByName.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Logs user into the system
-     * 
-     * @param username The user name for login
-     * @param password The password for login in clear text
-     */
-    public loginUserWithHttpInfo(username: string, password: string, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/user/login';
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'username' is not null or undefined
-        if (username === null || username === undefined) {
-            throw new Error('Required parameter username was null or undefined when calling loginUser.');
-        }
-        // verify required parameter 'password' is not null or undefined
-        if (password === null || password === undefined) {
-            throw new Error('Required parameter password was null or undefined when calling loginUser.');
-        }
-        if (username !== undefined) {
-            queryParameters.set('username', <any>username);
-        }
-
-        if (password !== undefined) {
-            queryParameters.set('password', <any>password);
-        }
-
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Logs out current logged in user session
-     * 
-     */
-    public logoutUserWithHttpInfo(extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/user/logout';
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-    /**
-     * Updated user
-     * This can only be done by the logged in user.
-     * @param username name that need to be deleted
-     * @param body Updated user object
-     */
-    public updateUserWithHttpInfo(username: string, body: models.User, extraHttpRequestParams?: any): Observable<Response> {
-        const path = this.basePath + '/user/${username}'
-                    .replace('${' + 'username' + '}', String(username));
-
-        let queryParameters = new URLSearchParams();
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
-        // verify required parameter 'username' is not null or undefined
-        if (username === null || username === undefined) {
-            throw new Error('Required parameter username was null or undefined when calling updateUser.');
-        }
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling updateUser.');
-        }
-        // to determine the Content-Type header
-        let consumes: string[] = [
-        ];
-
-        // to determine the Accept header
-        let produces: string[] = [
-            'application/json',
-            'application/xml'
-        ];
-
-        headers.set('Content-Type', 'application/json');
-
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Put,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
-        });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
-
-        return this.http.request(path, requestOptions);
-    }
-
-}
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/UserApiInterface.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/UserApiInterface.ts
deleted file mode 100644
index 067befa18e7..00000000000
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/UserApiInterface.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-import { Headers }                                           from '@angular/http';
-
-import { Observable }                                        from 'rxjs/Observable';
-
-import * as models                                           from '../model/models';
-import { Configuration }                                     from '../configuration';
-
-
-export interface UserApiInterface {
-    defaultHeaders: Headers;
-    configuration: Configuration;
-    [others: string]: any;
-
-    /**
-    * Create user
-    * This can only be done by the logged in user.
-    * @param body Created user object
-    */
-    createUser(body: models.User, extraHttpRequestParams?: any): Observable<{}>;
-
-    /**
-    * Creates list of users with given input array
-    * 
-    * @param body List of user object
-    */
-    createUsersWithArrayInput(body: Array<models.User>, extraHttpRequestParams?: any): Observable<{}>;
-
-    /**
-    * Creates list of users with given input array
-    * 
-    * @param body List of user object
-    */
-    createUsersWithListInput(body: Array<models.User>, extraHttpRequestParams?: any): Observable<{}>;
-
-    /**
-    * Delete user
-    * This can only be done by the logged in user.
-    * @param username The name that needs to be deleted
-    */
-    deleteUser(username: string, extraHttpRequestParams?: any): Observable<{}>;
-
-    /**
-    * Get user by user name
-    * 
-    * @param username The name that needs to be fetched. Use user1 for testing. 
-    */
-    getUserByName(username: string, extraHttpRequestParams?: any): Observable<models.User>;
-
-    /**
-    * Logs user into the system
-    * 
-    * @param username The user name for login
-    * @param password The password for login in clear text
-    */
-    loginUser(username: string, password: string, extraHttpRequestParams?: any): Observable<string>;
-
-    /**
-    * Logs out current logged in user session
-    * 
-    */
-    logoutUser(extraHttpRequestParams?: any): Observable<{}>;
-
-    /**
-    * Updated user
-    * This can only be done by the logged in user.
-    * @param username name that need to be deleted
-    * @param body Updated user object
-    */
-    updateUser(username: string, body: models.User, extraHttpRequestParams?: any): Observable<{}>;
-
-}
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts
index 8ff5eda659d..7f11984c6af 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts
@@ -205,30 +205,32 @@ export class PetService implements PetServiceInterface {
             throw new Error('Required parameter body was null or undefined when calling addPet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet`, requestOptions));
     }
 
     /**
@@ -242,30 +244,32 @@ export class PetService implements PetServiceInterface {
             throw new Error('Required parameter petId was null or undefined when calling deletePet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
         if (apiKey !== undefined && apiKey !== null) {
-            headers.set('api_key', String(apiKey));
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', String(apiKey)); });
         }
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -283,28 +287,30 @@ export class PetService implements PetServiceInterface {
             queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/findByStatus`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/findByStatus`, requestOptions));
     }
 
     /**
@@ -322,28 +328,30 @@ export class PetService implements PetServiceInterface {
             queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/findByTags`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/findByTags`, requestOptions));
     }
 
     /**
@@ -356,24 +364,23 @@ export class PetService implements PetServiceInterface {
             throw new Error('Required parameter petId was null or undefined when calling getPetById.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (api_key) required
         if (this.configuration.apiKeys["api_key"]) {
-            headers.set('api_key', this.configuration.apiKeys["api_key"]);
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', this.configuration.apiKeys["api_key"]); });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -386,30 +393,32 @@ export class PetService implements PetServiceInterface {
             throw new Error('Required parameter body was null or undefined when calling updatePet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Put,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Put,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet`, requestOptions));
     }
 
     /**
@@ -424,14 +433,17 @@ export class PetService implements PetServiceInterface {
             throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
         // to determine the Content-Type header
@@ -450,7 +462,7 @@ export class PetService implements PetServiceInterface {
             convertFormParamsToString = true;
             formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
             // set the content-type explicitly to avoid having it set to 'text/plain'
-            headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
+            headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8'));
         }
 
 
@@ -462,18 +474,17 @@ export class PetService implements PetServiceInterface {
             formParams.append('status', <any>status);
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: convertFormParamsToString ? formParams.toString() : formParams,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: convertFormParamsToString ? formParams.toString() : formParams,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -488,14 +499,17 @@ export class PetService implements PetServiceInterface {
             throw new Error('Required parameter petId was null or undefined when calling uploadFile.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
         // to determine the Content-Type header
@@ -517,7 +531,7 @@ export class PetService implements PetServiceInterface {
             convertFormParamsToString = true;
             formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
             // set the content-type explicitly to avoid having it set to 'text/plain'
-            headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
+            headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8'));
         }
 
 
@@ -529,18 +543,17 @@ export class PetService implements PetServiceInterface {
             formParams.append('file', <any>file);
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: convertFormParamsToString ? formParams.toString() : formParams,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: convertFormParamsToString ? formParams.toString() : formParams,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts
index 1297e638d43..ff3750dc33b 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts
@@ -134,19 +134,18 @@ export class StoreService implements StoreServiceInterface {
             throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions));
     }
 
     /**
@@ -155,24 +154,23 @@ export class StoreService implements StoreServiceInterface {
      */
     public getInventoryWithHttpInfo(extraHttpRequestParams?: RequestOptionsArgs): Observable<Response> {
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (api_key) required
         if (this.configuration.apiKeys["api_key"]) {
-            headers.set('api_key', this.configuration.apiKeys["api_key"]);
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', this.configuration.apiKeys["api_key"]); });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/inventory`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/inventory`, requestOptions));
     }
 
     /**
@@ -185,19 +183,18 @@ export class StoreService implements StoreServiceInterface {
             throw new Error('Required parameter orderId was null or undefined when calling getOrderById.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions));
     }
 
     /**
@@ -210,22 +207,21 @@ export class StoreService implements StoreServiceInterface {
             throw new Error('Required parameter body was null or undefined when calling placeOrder.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts
index 480d00b3bb6..261e1825ca7 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts
@@ -200,22 +200,21 @@ export class UserService implements UserServiceInterface {
             throw new Error('Required parameter body was null or undefined when calling createUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user`, requestOptions));
     }
 
     /**
@@ -228,22 +227,21 @@ export class UserService implements UserServiceInterface {
             throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/createWithArray`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/createWithArray`, requestOptions));
     }
 
     /**
@@ -256,22 +254,21 @@ export class UserService implements UserServiceInterface {
             throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/createWithList`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/createWithList`, requestOptions));
     }
 
     /**
@@ -284,19 +281,18 @@ export class UserService implements UserServiceInterface {
             throw new Error('Required parameter username was null or undefined when calling deleteUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
     /**
@@ -309,19 +305,18 @@ export class UserService implements UserServiceInterface {
             throw new Error('Required parameter username was null or undefined when calling getUserByName.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
     /**
@@ -346,20 +341,19 @@ export class UserService implements UserServiceInterface {
             queryParameters.set('password', <any>password);
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/login`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/login`, requestOptions));
     }
 
     /**
@@ -368,19 +362,18 @@ export class UserService implements UserServiceInterface {
      */
     public logoutUserWithHttpInfo(extraHttpRequestParams?: RequestOptionsArgs): Observable<Response> {
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/logout`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/logout`, requestOptions));
     }
 
     /**
@@ -397,22 +390,21 @@ export class UserService implements UserServiceInterface {
             throw new Error('Required parameter body was null or undefined when calling updateUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Put,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Put,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/configuration.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/configuration.ts
index 005c3a26df3..d7847235074 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/configuration.ts
@@ -1,8 +1,10 @@
+import { Observable } from 'rxjs/Observable';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 }
@@ -11,7 +13,7 @@ export class Configuration {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/apiResponse.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/apiResponse.ts
index 3af781cf580..e79fabe8c8c 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/apiResponse.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/apiResponse.ts
@@ -23,3 +23,5 @@ export interface ApiResponse {
     message?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Category.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/category.ts
similarity index 99%
rename from samples/client/petstore/typescript-angular-v2/with-interfaces/model/Category.ts
rename to samples/client/petstore/typescript-angular-v2/with-interfaces/model/category.ts
index d09f8d7b265..56608731f95 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Category.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/category.ts
@@ -21,3 +21,5 @@ export interface Category {
     name?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Order.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/order.ts
similarity index 99%
rename from samples/client/petstore/typescript-angular-v2/with-interfaces/model/Order.ts
rename to samples/client/petstore/typescript-angular-v2/with-interfaces/model/order.ts
index 4639b8c2949..84b59f1b09a 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Order.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/order.ts
@@ -35,3 +35,5 @@ export interface Order {
 export namespace Order {
     export type StatusEnum = 'placed' | 'approved' | 'delivered';
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Pet.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/pet.ts
similarity index 99%
rename from samples/client/petstore/typescript-angular-v2/with-interfaces/model/Pet.ts
rename to samples/client/petstore/typescript-angular-v2/with-interfaces/model/pet.ts
index ce6c535b867..c0fc942934c 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Pet.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/pet.ts
@@ -37,3 +37,5 @@ export interface Pet {
 export namespace Pet {
     export type StatusEnum = 'available' | 'pending' | 'sold';
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Tag.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/tag.ts
similarity index 99%
rename from samples/client/petstore/typescript-angular-v2/with-interfaces/model/Tag.ts
rename to samples/client/petstore/typescript-angular-v2/with-interfaces/model/tag.ts
index 3ed1eeff8f3..dbfa473f538 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Tag.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/tag.ts
@@ -21,3 +21,5 @@ export interface Tag {
     name?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/User.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/user.ts
similarity index 99%
rename from samples/client/petstore/typescript-angular-v2/with-interfaces/model/User.ts
rename to samples/client/petstore/typescript-angular-v2/with-interfaces/model/user.ts
index f4914ae2608..4dfad607c51 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/User.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/user.ts
@@ -36,3 +36,5 @@ export interface User {
     userStatus?: number;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/rxjs-operators.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/rxjs-operators.ts
index 5659cd0694f..f81b512d8f0 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/rxjs-operators.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/rxjs-operators.ts
@@ -5,7 +5,11 @@
 
 // Statics
 import 'rxjs/add/observable/throw';
+import 'rxjs/add/observable/of';
 
 // Operators
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/zip';
+import 'rxjs/add/operator/do';
+import 'rxjs/add/operator/mergeMap';
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
index ee44df243de..d6c49adbf29 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
@@ -69,21 +69,23 @@ export class PetService {
             throw new Error('Required parameter body was null or undefined when calling addPet.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: HttpHeaders, accessToken: string) => {
+                return headers.set('Authorization', 'Bearer ' + accessToken);
+            });
         }
 
-        return this.httpClient.post<any>(`${this.basePath}/pet`, body, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.post<any>(`${this.basePath}/pet`, body, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -97,24 +99,26 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling deletePet.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
         if (apiKey !== undefined && apiKey !== null) {
-            headers = headers.set('api_key', String(apiKey));
+            headersObservable = headersObservable.map((headers: HttpHeaders) => { return headers.set('api_key', String(apiKey)); });
         }
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: HttpHeaders, accessToken: string) => {
+                return headers.set('Authorization', 'Bearer ' + accessToken);
+            });
         }
 
-        return this.httpClient.delete<any>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.delete<any>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -132,22 +136,24 @@ export class PetService {
             queryParameters = queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: HttpHeaders, accessToken: string) => {
+                return headers.set('Authorization', 'Bearer ' + accessToken);
+            });
         }
 
-        return this.httpClient.get<any>(`${this.basePath}/pet/findByStatus`, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.get<any>(`${this.basePath}/pet/findByStatus`, 
+          {
             params: queryParameters,
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -165,22 +171,24 @@ export class PetService {
             queryParameters = queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: HttpHeaders, accessToken: string) => {
+                return headers.set('Authorization', 'Bearer ' + accessToken);
+            });
         }
 
-        return this.httpClient.get<any>(`${this.basePath}/pet/findByTags`, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.get<any>(`${this.basePath}/pet/findByTags`, 
+          {
             params: queryParameters,
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -193,18 +201,18 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling getPetById.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
         // authentication (api_key) required
         if (this.configuration.apiKeys["api_key"]) {
-            headers = headers.set('api_key', this.configuration.apiKeys["api_key"]);
+            headersObservable = headersObservable.map((headers: HttpHeaders) => { return headers.set('api_key', this.configuration.apiKeys["api_key"]); });
         }
 
-        return this.httpClient.get<any>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.get<any>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -217,21 +225,23 @@ export class PetService {
             throw new Error('Required parameter body was null or undefined when calling updatePet.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: HttpHeaders, accessToken: string) => {
+                return headers.set('Authorization', 'Bearer ' + accessToken);
+            });
         }
 
-        return this.httpClient.put<any>(`${this.basePath}/pet`, body, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.put<any>(`${this.basePath}/pet`, body, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -246,14 +256,16 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: HttpHeaders, accessToken: string) => {
+                return headers.set('Authorization', 'Bearer ' + accessToken);
+            });
         }
 
         // to determine the Content-Type header
@@ -280,11 +292,11 @@ export class PetService {
             formParams = formParams.append('status', <any>status) || formParams;
         }
 
-        return this.httpClient.post<any>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, 
-        convertFormParamsToString ? formParams.toString() : formParams, {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.post<any>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, 
+          convertFormParamsToString ? formParams.toString() : formParams, {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -299,14 +311,16 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling uploadFile.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: HttpHeaders, accessToken: string) => {
+                return headers.set('Authorization', 'Bearer ' + accessToken);
+            });
         }
 
         // to determine the Content-Type header
@@ -336,11 +350,11 @@ export class PetService {
             formParams = formParams.append('file', <any>file) || formParams;
         }
 
-        return this.httpClient.post<any>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, 
-        convertFormParamsToString ? formParams.toString() : formParams, {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.post<any>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, 
+          convertFormParamsToString ? formParams.toString() : formParams, {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts
index f0cf7dbc1cb..18abdb77456 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts
@@ -68,13 +68,13 @@ export class StoreService {
             throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
-        return this.httpClient.delete<any>(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.delete<any>(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -83,18 +83,18 @@ export class StoreService {
      */
     public getInventory(): Observable<{ [key: string]: number; }> {
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
         // authentication (api_key) required
         if (this.configuration.apiKeys["api_key"]) {
-            headers = headers.set('api_key', this.configuration.apiKeys["api_key"]);
+            headersObservable = headersObservable.map((headers: HttpHeaders) => { return headers.set('api_key', this.configuration.apiKeys["api_key"]); });
         }
 
-        return this.httpClient.get<any>(`${this.basePath}/store/inventory`, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.get<any>(`${this.basePath}/store/inventory`, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -107,13 +107,13 @@ export class StoreService {
             throw new Error('Required parameter orderId was null or undefined when calling getOrderById.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
-        return this.httpClient.get<any>(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.get<any>(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -126,13 +126,13 @@ export class StoreService {
             throw new Error('Required parameter body was null or undefined when calling placeOrder.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
-        return this.httpClient.post<any>(`${this.basePath}/store/order`, body, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.post<any>(`${this.basePath}/store/order`, body, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts
index d67fb448fc3..4cdffb77ba2 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts
@@ -68,13 +68,13 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUser.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
-        return this.httpClient.post<any>(`${this.basePath}/user`, body, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.post<any>(`${this.basePath}/user`, body, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -87,13 +87,13 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
-        return this.httpClient.post<any>(`${this.basePath}/user/createWithArray`, body, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.post<any>(`${this.basePath}/user/createWithArray`, body, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -106,13 +106,13 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
-        return this.httpClient.post<any>(`${this.basePath}/user/createWithList`, body, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.post<any>(`${this.basePath}/user/createWithList`, body, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -125,13 +125,13 @@ export class UserService {
             throw new Error('Required parameter username was null or undefined when calling deleteUser.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
-        return this.httpClient.delete<any>(`${this.basePath}/user/${encodeURIComponent(String(username))}`, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.delete<any>(`${this.basePath}/user/${encodeURIComponent(String(username))}`, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -144,13 +144,13 @@ export class UserService {
             throw new Error('Required parameter username was null or undefined when calling getUserByName.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
-        return this.httpClient.get<any>(`${this.basePath}/user/${encodeURIComponent(String(username))}`, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.get<any>(`${this.basePath}/user/${encodeURIComponent(String(username))}`, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -175,14 +175,14 @@ export class UserService {
             queryParameters = queryParameters.set('password', <any>password);
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
-        return this.httpClient.get<any>(`${this.basePath}/user/login`, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.get<any>(`${this.basePath}/user/login`, 
+          {
             params: queryParameters,
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -191,13 +191,13 @@ export class UserService {
      */
     public logoutUser(): Observable<{}> {
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
-        return this.httpClient.get<any>(`${this.basePath}/user/logout`, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.get<any>(`${this.basePath}/user/logout`, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
     /**
@@ -214,13 +214,13 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling updateUser.');
         }
 
-        let headers = this.defaultHeaders;
+        let headersObservable = Observable.of(this.defaultHeaders);
 
-        return this.httpClient.put<any>(`${this.basePath}/user/${encodeURIComponent(String(username))}`, body, 
-        {
+        return headersObservable.mergeMap((headers: HttpHeaders) => this.httpClient.put<any>(`${this.basePath}/user/${encodeURIComponent(String(username))}`, body, 
+          {
             headers: headers,
             withCredentials: this.configuration.withCredentials,
-        });
+        }));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/configuration.ts b/samples/client/petstore/typescript-angular-v4.3/npm/configuration.ts
index 005c3a26df3..d7847235074 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/configuration.ts
@@ -1,8 +1,10 @@
+import { Observable } from 'rxjs/Observable';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 }
@@ -11,7 +13,7 @@ export class Configuration {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/apiResponse.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/apiResponse.ts
index 3af781cf580..e79fabe8c8c 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/model/apiResponse.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/apiResponse.ts
@@ -23,3 +23,5 @@ export interface ApiResponse {
     message?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/category.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/category.ts
index d09f8d7b265..56608731f95 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/model/category.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/category.ts
@@ -21,3 +21,5 @@ export interface Category {
     name?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts
index 402a86689c8..84b59f1b09a 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts
@@ -33,9 +33,7 @@ export interface Order {
 
 }
 export namespace Order {
-    export enum StatusEnum {
-        Placed = <any> 'placed',
-        Approved = <any> 'approved',
-        Delivered = <any> 'delivered'
-    }
+    export type StatusEnum = 'placed' | 'approved' | 'delivered';
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/pet.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/pet.ts
index 0d6137d02cf..c0fc942934c 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/model/pet.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/pet.ts
@@ -35,9 +35,7 @@ export interface Pet {
 
 }
 export namespace Pet {
-    export enum StatusEnum {
-        Available = <any> 'available',
-        Pending = <any> 'pending',
-        Sold = <any> 'sold'
-    }
+    export type StatusEnum = 'available' | 'pending' | 'sold';
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/tag.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/tag.ts
index 3ed1eeff8f3..dbfa473f538 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/model/tag.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/tag.ts
@@ -21,3 +21,5 @@ export interface Tag {
     name?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/user.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/user.ts
index f4914ae2608..4dfad607c51 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/model/user.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/user.ts
@@ -36,3 +36,5 @@ export interface User {
     userStatus?: number;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/package-lock.json b/samples/client/petstore/typescript-angular-v4.3/npm/package-lock.json
new file mode 100644
index 00000000000..d991f97055c
--- /dev/null
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/package-lock.json
@@ -0,0 +1,92 @@
+{
+  "name": "@swagger/angular2-typescript-petstore",
+  "version": "0.0.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@angular/common": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.4.tgz",
+      "integrity": "sha1-rgqBiqoMaj8JAee4C9lOHCLrk2U=",
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
+    },
+    "@angular/compiler": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.4.tgz",
+      "integrity": "sha1-Mm6wAp2aNUGqyhJN75rcUcNvK0E=",
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
+    },
+    "@angular/core": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.4.tgz",
+      "integrity": "sha1-vTfs9UFY+XSJmWyThr0iL4CjL1w=",
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
+    },
+    "@angular/http": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.4.tgz",
+      "integrity": "sha1-Zn+vYWu2JBaOr65u6S5euiOp0fI=",
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
+    },
+    "@angular/platform-browser": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.4.tgz",
+      "integrity": "sha1-o4mOLnup2E/6DUcUTGlxF5x1ruY=",
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
+    },
+    "reflect-metadata": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz",
+      "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo=",
+      "dev": true
+    },
+    "rxjs": {
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz",
+      "integrity": "sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==",
+      "dev": true,
+      "requires": {
+        "symbol-observable": "1.0.4"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
+      "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=",
+      "dev": true
+    },
+    "tslib": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz",
+      "integrity": "sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw=",
+      "dev": true
+    },
+    "typescript": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
+      "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==",
+      "dev": true
+    },
+    "zone.js": {
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.7.8.tgz",
+      "integrity": "sha1-Tz/og01EWX8mOQU6D6Q43zT//e0=",
+      "dev": true
+    }
+  }
+}
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/package.json b/samples/client/petstore/typescript-angular-v4.3/npm/package.json
index 40157c62927..05887c323e6 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/package.json
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/package.json
@@ -35,6 +35,6 @@
     "typescript": "^2.1.5"
   },
   "publishConfig": {
-    "registry":"https://skimdb.npmjs.com/registry"
+    "registry": "https://skimdb.npmjs.com/registry"
   }
 }
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/pom.xml b/samples/client/petstore/typescript-angular-v4.3/npm/pom.xml
new file mode 100644
index 00000000000..75435795ca1
--- /dev/null
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/pom.xml
@@ -0,0 +1,60 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.wordnik</groupId>
+    <artifactId>TSAngular4.3PestoreTest</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Angular v4.3 Petstore Test</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-run-build</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/rxjs-operators.ts b/samples/client/petstore/typescript-angular-v4.3/npm/rxjs-operators.ts
index 5659cd0694f..f81b512d8f0 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/rxjs-operators.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/rxjs-operators.ts
@@ -5,7 +5,11 @@
 
 // Statics
 import 'rxjs/add/observable/throw';
+import 'rxjs/add/observable/of';
 
 // Operators
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/zip';
+import 'rxjs/add/operator/do';
+import 'rxjs/add/operator/mergeMap';
diff --git a/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts
index 11a1b603831..03d5592e50e 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts
@@ -204,30 +204,32 @@ export class PetService {
             throw new Error('Required parameter body was null or undefined when calling addPet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet`, requestOptions));
     }
 
     /**
@@ -241,30 +243,32 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling deletePet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
         if (apiKey !== undefined && apiKey !== null) {
-            headers.set('api_key', String(apiKey));
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', String(apiKey)); });
         }
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -282,28 +286,30 @@ export class PetService {
             queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/findByStatus`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/findByStatus`, requestOptions));
     }
 
     /**
@@ -321,28 +327,30 @@ export class PetService {
             queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/findByTags`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/findByTags`, requestOptions));
     }
 
     /**
@@ -355,24 +363,23 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling getPetById.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (api_key) required
         if (this.configuration.apiKeys["api_key"]) {
-            headers.set('api_key', this.configuration.apiKeys["api_key"]);
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', this.configuration.apiKeys["api_key"]); });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -385,30 +392,32 @@ export class PetService {
             throw new Error('Required parameter body was null or undefined when calling updatePet.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Put,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Put,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet`, requestOptions));
     }
 
     /**
@@ -423,14 +432,17 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
         // to determine the Content-Type header
@@ -449,7 +461,7 @@ export class PetService {
             convertFormParamsToString = true;
             formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
             // set the content-type explicitly to avoid having it set to 'text/plain'
-            headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
+            headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8'));
         }
 
 
@@ -461,18 +473,17 @@ export class PetService {
             formParams.append('status', <any>status);
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: convertFormParamsToString ? formParams.toString() : formParams,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: convertFormParamsToString ? formParams.toString() : formParams,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, requestOptions));
     }
 
     /**
@@ -487,14 +498,17 @@ export class PetService {
             throw new Error('Required parameter petId was null or undefined when calling uploadFile.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (petstore_auth) required
         if (this.configuration.accessToken) {
-            let accessToken = typeof this.configuration.accessToken === 'function'
-                ? this.configuration.accessToken()
-                : this.configuration.accessToken;
-            headers.set('Authorization', 'Bearer ' + accessToken);
+            let accessTokenObservable = typeof this.configuration.accessToken === 'function'
+              ? this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
+              : Observable.of(this.configuration.accessToken);
+            headersObservable = headersObservable.zip(accessTokenObservable, (headers: Headers, accessToken: string) => {
+                headers.set('Authorization', 'Bearer ' + accessToken);
+                return headers;
+            });
         }
 
         // to determine the Content-Type header
@@ -516,7 +530,7 @@ export class PetService {
             convertFormParamsToString = true;
             formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
             // set the content-type explicitly to avoid having it set to 'text/plain'
-            headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
+            headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8'));
         }
 
 
@@ -528,18 +542,17 @@ export class PetService {
             formParams.append('file', <any>file);
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: convertFormParamsToString ? formParams.toString() : formParams,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: convertFormParamsToString ? formParams.toString() : formParams,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts
index 393d291ba3d..104154578d5 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts
@@ -133,19 +133,18 @@ export class StoreService {
             throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions));
     }
 
     /**
@@ -154,24 +153,23 @@ export class StoreService {
      */
     public getInventoryWithHttpInfo(extraHttpRequestParams?: RequestOptionsArgs): Observable<Response> {
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
         // authentication (api_key) required
         if (this.configuration.apiKeys["api_key"]) {
-            headers.set('api_key', this.configuration.apiKeys["api_key"]);
+            headersObservable = headersObservable.do((headers: Headers) => { headers.set('api_key', this.configuration.apiKeys["api_key"]); });
         }
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/inventory`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/inventory`, requestOptions));
     }
 
     /**
@@ -184,19 +182,18 @@ export class StoreService {
             throw new Error('Required parameter orderId was null or undefined when calling getOrderById.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, requestOptions));
     }
 
     /**
@@ -209,22 +206,21 @@ export class StoreService {
             throw new Error('Required parameter body was null or undefined when calling placeOrder.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/store/order`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/store/order`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts
index f495f1f9d39..760688e20e4 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts
@@ -199,22 +199,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user`, requestOptions));
     }
 
     /**
@@ -227,22 +226,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/createWithArray`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/createWithArray`, requestOptions));
     }
 
     /**
@@ -255,22 +253,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Post,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Post,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/createWithList`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/createWithList`, requestOptions));
     }
 
     /**
@@ -283,19 +280,18 @@ export class UserService {
             throw new Error('Required parameter username was null or undefined when calling deleteUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Delete,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Delete,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
     /**
@@ -308,19 +304,18 @@ export class UserService {
             throw new Error('Required parameter username was null or undefined when calling getUserByName.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
     /**
@@ -345,20 +340,19 @@ export class UserService {
             queryParameters.set('password', <any>password);
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            search: queryParameters,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              search: queryParameters,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/login`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/login`, requestOptions));
     }
 
     /**
@@ -367,19 +361,18 @@ export class UserService {
      */
     public logoutUserWithHttpInfo(extraHttpRequestParams?: RequestOptionsArgs): Observable<Response> {
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Get,
-            headers: headers,
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Get,
+              headers: headers,
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/logout`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/logout`, requestOptions));
     }
 
     /**
@@ -396,22 +389,21 @@ export class UserService {
             throw new Error('Required parameter body was null or undefined when calling updateUser.');
         }
 
-        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let headersObservable = Observable.of(new Headers(this.defaultHeaders.toJSON()));
 
-        headers.set('Content-Type', 'application/json');
+        headersObservable = headersObservable.do((headers: Headers) => headers.set('Content-Type', 'application/json'));
 
-        let requestOptions: RequestOptionsArgs = new RequestOptions({
-            method: RequestMethod.Put,
-            headers: headers,
-            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
-            withCredentials:this.configuration.withCredentials
+        let requestOptionsObservable = headersObservable.map((headers: Headers) => {
+            let requestOptions: RequestOptionsArgs = new RequestOptions({
+              method: RequestMethod.Put,
+              headers: headers,
+              body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+              withCredentials:this.configuration.withCredentials
+            });
+            return requestOptions;
         });
-        // https://github.com/swagger-api/swagger-codegen/issues/4037
-        if (extraHttpRequestParams) {
-            requestOptions = (<any>Object).assign(requestOptions, extraHttpRequestParams);
-        }
 
-        return this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions);
+        return requestOptionsObservable.mergeMap((requestOptions: RequestOptionsArgs) => this.http.request(`${this.basePath}/user/${encodeURIComponent(String(username))}`, requestOptions));
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular-v4/npm/configuration.ts b/samples/client/petstore/typescript-angular-v4/npm/configuration.ts
index 005c3a26df3..d7847235074 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/configuration.ts
@@ -1,8 +1,10 @@
+import { Observable } from 'rxjs/Observable';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 }
@@ -11,7 +13,7 @@ export class Configuration {
     apiKeys?: {[ key: string ]: string};
     username?: string;
     password?: string;
-    accessToken?: string | (() => string);
+    accessToken?: string | ((name: string, scopes?: string[]) => Observable<string>);
     basePath?: string;
     withCredentials?: boolean;
 
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/apiResponse.ts b/samples/client/petstore/typescript-angular-v4/npm/model/apiResponse.ts
index 3af781cf580..e79fabe8c8c 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/apiResponse.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/apiResponse.ts
@@ -23,3 +23,5 @@ export interface ApiResponse {
     message?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/category.ts b/samples/client/petstore/typescript-angular-v4/npm/model/category.ts
index d09f8d7b265..56608731f95 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/category.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/category.ts
@@ -21,3 +21,5 @@ export interface Category {
     name?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/order.ts b/samples/client/petstore/typescript-angular-v4/npm/model/order.ts
index 4639b8c2949..84b59f1b09a 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/order.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/order.ts
@@ -35,3 +35,5 @@ export interface Order {
 export namespace Order {
     export type StatusEnum = 'placed' | 'approved' | 'delivered';
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/pet.ts b/samples/client/petstore/typescript-angular-v4/npm/model/pet.ts
index ce6c535b867..c0fc942934c 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/pet.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/pet.ts
@@ -37,3 +37,5 @@ export interface Pet {
 export namespace Pet {
     export type StatusEnum = 'available' | 'pending' | 'sold';
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/tag.ts b/samples/client/petstore/typescript-angular-v4/npm/model/tag.ts
index 3ed1eeff8f3..dbfa473f538 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/tag.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/tag.ts
@@ -21,3 +21,5 @@ export interface Tag {
     name?: string;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/user.ts b/samples/client/petstore/typescript-angular-v4/npm/model/user.ts
index f4914ae2608..4dfad607c51 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/user.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/user.ts
@@ -36,3 +36,5 @@ export interface User {
     userStatus?: number;
 
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4/npm/package-lock.json b/samples/client/petstore/typescript-angular-v4/npm/package-lock.json
index 270b88ce43f..32a7ef05fe6 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/package-lock.json
+++ b/samples/client/petstore/typescript-angular-v4/npm/package-lock.json
@@ -2,36 +2,52 @@
   "name": "@swagger/angular2-typescript-petstore",
   "version": "0.0.1",
   "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
     "@angular/common": {
       "version": "4.2.6",
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.2.6.tgz",
       "integrity": "sha1-IQrOS9JON1+LQbpS/rNLGKiH1do=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
     },
     "@angular/compiler": {
       "version": "4.2.6",
       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.2.6.tgz",
       "integrity": "sha1-ZndW1JXKDUXSBhJooQ1Sr4Ofr/Q=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
     },
     "@angular/core": {
       "version": "4.2.6",
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.2.6.tgz",
       "integrity": "sha1-DByP8BV/B29KfAtyHKFCPxu+Fk4=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
     },
     "@angular/http": {
       "version": "4.2.6",
       "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.2.6.tgz",
       "integrity": "sha1-SZ4roLvB89cbdt6+wDTJWMrxE04=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
     },
     "@angular/platform-browser": {
       "version": "4.2.6",
       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.2.6.tgz",
       "integrity": "sha1-oTH/WSIl/mSWvKLJr/YSpNvd9Dc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
     },
     "reflect-metadata": {
       "version": "0.1.10",
@@ -43,7 +59,10 @@
       "version": "5.4.2",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.2.tgz",
       "integrity": "sha1-KjI2/L8D31e64G/Wly/ZnlwI/Pc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "symbol-observable": "1.0.4"
+      }
     },
     "symbol-observable": {
       "version": "1.0.4",
diff --git a/samples/client/petstore/typescript-angular-v4/npm/package.json b/samples/client/petstore/typescript-angular-v4/npm/package.json
index af9c5d898e6..b33b2586f0f 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/package.json
+++ b/samples/client/petstore/typescript-angular-v4/npm/package.json
@@ -35,6 +35,6 @@
     "typescript": "^2.1.5"
   },
   "publishConfig": {
-    "registry":"https://skimdb.npmjs.com/registry"
+    "registry": "https://skimdb.npmjs.com/registry"
   }
 }
diff --git a/samples/client/petstore/typescript-angular-v4/npm/rxjs-operators.ts b/samples/client/petstore/typescript-angular-v4/npm/rxjs-operators.ts
index 5659cd0694f..f81b512d8f0 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/rxjs-operators.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/rxjs-operators.ts
@@ -5,7 +5,11 @@
 
 // Statics
 import 'rxjs/add/observable/throw';
+import 'rxjs/add/observable/of';
 
 // Operators
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/zip';
+import 'rxjs/add/operator/do';
+import 'rxjs/add/operator/mergeMap';