Skip to content

[TS][Angular2] Fix for missing headers (2.3.0) #4329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Dec 6, 2016
Merged

[TS][Angular2] Fix for missing headers (2.3.0) #4329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd2d52
Fix for #4322
sebastianhaas Dec 6, 2016
ebf6a69
Run typescript-angular2-petstore-all.sh
sebastianhaas Dec 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions modules/swagger-codegen/src/main/resources/typescript-angular2/api.service.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,9 @@ export class {{classname}} {
}
{{/queryParams}}

{{#headers}}
{{#headerParams}}
headers.set('{{baseName}}', String({{paramName}}));

{{/headers}}
{{/headerParams}}

// to determine the Content-Type header
let consumes: string[] = [
Expand Down
90 changes: 69 additions & 21 deletions samples/client/petstore/typescript-angular2/default/api/pet.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,21 @@ export class PetService {
this.basePath = basePath || configuration.basePath || this.basePath;
}
}

/**
*
* Extends object by coping non-existing properties.
* @param objA object to be extended
* @param objB source object
*/
private extendObj<T1,T2>(objA: T1, objB: T2) {
for(let key in objB){
if(objB.hasOwnProperty(key)){
objA[key] = objB[key];
}
}
return <T1&T2>objA;
}

/**
* Add a new pet to the store
Expand Down Expand Up @@ -227,9 +242,13 @@ export class PetService {
method: RequestMethod.Post,
headers: headers,
body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
search: queryParameters,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand All @@ -250,6 +269,7 @@ export class PetService {
throw new Error('Required parameter petId was null or undefined when calling deletePet.');
}

headers.set('api_key', String(apiKey));

// to determine the Content-Type header
let consumes: string[] = [
Expand All @@ -274,9 +294,13 @@ export class PetService {
let requestOptions: RequestOptionsArgs = new RequestOptions({
method: RequestMethod.Delete,
headers: headers,
search: queryParameters,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand Down Expand Up @@ -319,9 +343,13 @@ export class PetService {
let requestOptions: RequestOptionsArgs = new RequestOptions({
method: RequestMethod.Get,
headers: headers,
search: queryParameters,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand Down Expand Up @@ -364,9 +392,13 @@ export class PetService {
let requestOptions: RequestOptionsArgs = new RequestOptions({
method: RequestMethod.Get,
headers: headers,
search: queryParameters,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand Down Expand Up @@ -397,27 +429,31 @@ export class PetService {
'application/xml'
];

// authentication (api_key) required
if (this.configuration.apiKey)
{
headers.set('api_key', this.configuration.apiKey);
}
// authentication (petstore_auth) required
// oauth required
if (this.configuration.accessToken)
{
headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
}
// 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,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand Down Expand Up @@ -461,9 +497,13 @@ export class PetService {
method: RequestMethod.Put,
headers: headers,
body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
search: queryParameters,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand Down Expand Up @@ -520,9 +560,13 @@ export class PetService {
method: RequestMethod.Post,
headers: headers,
body: formParams.toString(),
search: queryParameters,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand Down Expand Up @@ -579,9 +623,13 @@ export class PetService {
method: RequestMethod.Post,
headers: headers,
body: formParams.toString(),
search: queryParameters,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand Down
47 changes: 39 additions & 8 deletions samples/client/petstore/typescript-angular2/default/api/store.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,21 @@ export class StoreService {
this.basePath = basePath || configuration.basePath || this.basePath;
}
}

/**
*
* Extends object by coping non-existing properties.
* @param objA object to be extended
* @param objB source object
*/
private extendObj<T1,T2>(objA: T1, objB: T2) {
for(let key in objB){
if(objB.hasOwnProperty(key)){
objA[key] = objB[key];
}
}
return <T1&T2>objA;
}

/**
* Delete purchase order by ID
Expand Down Expand Up @@ -151,9 +166,13 @@ export class StoreService {
let requestOptions: RequestOptionsArgs = new RequestOptions({
method: RequestMethod.Delete,
headers: headers,
search: queryParameters,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand Down Expand Up @@ -191,9 +210,13 @@ export class StoreService {
let requestOptions: RequestOptionsArgs = new RequestOptions({
method: RequestMethod.Get,
headers: headers,
search: queryParameters,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand Down Expand Up @@ -231,9 +254,13 @@ export class StoreService {
let requestOptions: RequestOptionsArgs = new RequestOptions({
method: RequestMethod.Get,
headers: headers,
search: queryParameters,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand Down Expand Up @@ -269,9 +296,13 @@ export class StoreService {
method: RequestMethod.Post,
headers: headers,
body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
search: queryParameters,
responseType: ResponseContentType.Json
search: queryParameters
});

// https://github.com/swagger-api/swagger-codegen/issues/4037
if (extraHttpRequestParams) {
requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
}

return this.http.request(path, requestOptions);
}
Expand Down
Loading