loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[typescript-angular] apply encodeURIComponent to path-parameter (#6525)

Browse Source 
* #6524: [typescript-angular] apply encodeURIComponent to path-parameter

* #6524: [typescript-angular2] update samples

* #6524: [typescript-angularjs] update samples
This commit is contained in:
Esteban Marin 2017-09-23 11:23:45 +02:00 committed by wing328
parent 209158aa9d
commit 4a89d23619
14 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache
View File

@ -122,7 +122,7 @@ export class {{classname}} {
{{/allParams}}*/
public {{nickname}}WithHttpInfo({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '{{{path}}}'{{#pathParams}}
.replace('${' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}};
.replace('${' + '{{baseName}}' + '}', encodeURIComponent(String({{paramName}}))){{/pathParams}};
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845

2
modules/swagger-codegen/src/main/resources/typescript-angularjs/api.mustache
View File

@ -33,7 +33,7 @@ export class {{classname}} {
{{/allParams}}*/
public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}extraHttpRequestParams?: any ) : ng.IHttpPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}{}{{/returnType}}> {
const localVarPath = this.basePath + '{{{path}}}'{{#pathParams}}
.replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}};
.replace('{' + '{{baseName}}' + '}', encodeURIComponent(String({{paramName}}))){{/pathParams}};
let queryParameters: any = {};
let headerParams: any = (<any>Object).assign({}, this.defaultHeaders);

8
samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
View File

@ -274,7 +274,7 @@ export class PetService {
*/
public deletePetWithHttpInfo(petId: number, apiKey?: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -437,7 +437,7 @@ export class PetService {
*/
public getPetByIdWithHttpInfo(petId: number, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -539,7 +539,7 @@ export class PetService {
*/
public updatePetWithFormWithHttpInfo(petId: number, name?: string, status?: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -615,7 +615,7 @@ export class PetService {
*/
public uploadFileWithHttpInfo(petId: number, additionalMetadata?: string, file?: Blob, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}/uploadImage'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845

4
samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
View File

@ -149,7 +149,7 @@ export class StoreService {
*/
public deleteOrderWithHttpInfo(orderId: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/store/order/${orderId}'
.replace('${' + 'orderId' + '}', String(orderId));
.replace('${' + 'orderId' + '}', encodeURIComponent(String(orderId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -231,7 +231,7 @@ export class StoreService {
*/
public getOrderByIdWithHttpInfo(orderId: number, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/store/order/${orderId}'
.replace('${' + 'orderId' + '}', String(orderId));
.replace('${' + 'orderId' + '}', encodeURIComponent(String(orderId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845

6
samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
View File

@ -347,7 +347,7 @@ export class UserService {
*/
public deleteUserWithHttpInfo(username: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/user/${username}'
.replace('${' + 'username' + '}', String(username));
.replace('${' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -389,7 +389,7 @@ export class UserService {
*/
public getUserByNameWithHttpInfo(username: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/user/${username}'
.replace('${' + 'username' + '}', String(username));
.replace('${' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -522,7 +522,7 @@ export class UserService {
*/
public updateUserWithHttpInfo(username: string, body: User, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/user/${username}'
.replace('${' + 'username' + '}', String(username));
.replace('${' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845

8
samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
View File

@ -274,7 +274,7 @@ export class PetService {
*/
public deletePetWithHttpInfo(petId: number, apiKey?: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -437,7 +437,7 @@ export class PetService {
*/
public getPetByIdWithHttpInfo(petId: number, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -539,7 +539,7 @@ export class PetService {
*/
public updatePetWithFormWithHttpInfo(petId: number, name?: string, status?: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -615,7 +615,7 @@ export class PetService {
*/
public uploadFileWithHttpInfo(petId: number, additionalMetadata?: string, file?: Blob, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}/uploadImage'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845

4
samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
View File

@ -149,7 +149,7 @@ export class StoreService {
*/
public deleteOrderWithHttpInfo(orderId: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/store/order/${orderId}'
.replace('${' + 'orderId' + '}', String(orderId));
.replace('${' + 'orderId' + '}', encodeURIComponent(String(orderId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -231,7 +231,7 @@ export class StoreService {
*/
public getOrderByIdWithHttpInfo(orderId: number, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/store/order/${orderId}'
.replace('${' + 'orderId' + '}', String(orderId));
.replace('${' + 'orderId' + '}', encodeURIComponent(String(orderId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845

6
samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts
View File

@ -347,7 +347,7 @@ export class UserService {
*/
public deleteUserWithHttpInfo(username: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/user/${username}'
.replace('${' + 'username' + '}', String(username));
.replace('${' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -389,7 +389,7 @@ export class UserService {
*/
public getUserByNameWithHttpInfo(username: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/user/${username}'
.replace('${' + 'username' + '}', String(username));
.replace('${' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -522,7 +522,7 @@ export class UserService {
*/
public updateUserWithHttpInfo(username: string, body: User, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/user/${username}'
.replace('${' + 'username' + '}', String(username));
.replace('${' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845

8
samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts
View File

@ -275,7 +275,7 @@ export class PetService implements PetServiceInterface {
*/
public deletePetWithHttpInfo(petId: number, apiKey?: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -438,7 +438,7 @@ export class PetService implements PetServiceInterface {
*/
public getPetByIdWithHttpInfo(petId: number, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -540,7 +540,7 @@ export class PetService implements PetServiceInterface {
*/
public updatePetWithFormWithHttpInfo(petId: number, name?: string, status?: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -616,7 +616,7 @@ export class PetService implements PetServiceInterface {
*/
public uploadFileWithHttpInfo(petId: number, additionalMetadata?: string, file?: Blob, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/pet/${petId}/uploadImage'
.replace('${' + 'petId' + '}', String(petId));
.replace('${' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845

4
samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts
View File

@ -150,7 +150,7 @@ export class StoreService implements StoreServiceInterface {
*/
public deleteOrderWithHttpInfo(orderId: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/store/order/${orderId}'
.replace('${' + 'orderId' + '}', String(orderId));
.replace('${' + 'orderId' + '}', encodeURIComponent(String(orderId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -232,7 +232,7 @@ export class StoreService implements StoreServiceInterface {
*/
public getOrderByIdWithHttpInfo(orderId: number, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/store/order/${orderId}'
.replace('${' + 'orderId' + '}', String(orderId));
.replace('${' + 'orderId' + '}', encodeURIComponent(String(orderId)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845

6
samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts
View File

@ -348,7 +348,7 @@ export class UserService implements UserServiceInterface {
*/
public deleteUserWithHttpInfo(username: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/user/${username}'
.replace('${' + 'username' + '}', String(username));
.replace('${' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -390,7 +390,7 @@ export class UserService implements UserServiceInterface {
*/
public getUserByNameWithHttpInfo(username: string, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/user/${username}'
.replace('${' + 'username' + '}', String(username));
.replace('${' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
@ -523,7 +523,7 @@ export class UserService implements UserServiceInterface {
*/
public updateUserWithHttpInfo(username: string, body: User, extraHttpRequestParams?: any): Observable<Response> {
const path = this.basePath + '/user/${username}'
.replace('${' + 'username' + '}', String(username));
.replace('${' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845

8
samples/client/petstore/typescript-angularjs/api/PetApi.ts
View File

@ -62,7 +62,7 @@ export class PetApi {
*/
public deletePet (petId: number, apiKey?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
const localVarPath = this.basePath + '/pet/{petId}'
.replace('{' + 'petId' + '}', String(petId));
.replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters: any = {};
let headerParams: any = (<any>Object).assign({}, this.defaultHeaders);
@ -154,7 +154,7 @@ export class PetApi {
*/
public getPetById (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise<models.Pet> {
const localVarPath = this.basePath + '/pet/{petId}'
.replace('{' + 'petId' + '}', String(petId));
.replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters: any = {};
let headerParams: any = (<any>Object).assign({}, this.defaultHeaders);
@ -212,7 +212,7 @@ export class PetApi {
*/
public updatePetWithForm (petId: number, name?: string, status?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
const localVarPath = this.basePath + '/pet/{petId}'
.replace('{' + 'petId' + '}', String(petId));
.replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters: any = {};
let headerParams: any = (<any>Object).assign({}, this.defaultHeaders);
@ -251,7 +251,7 @@ export class PetApi {
*/
public uploadFile (petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any ) : ng.IHttpPromise<models.ApiResponse> {
const localVarPath = this.basePath + '/pet/{petId}/uploadImage'
.replace('{' + 'petId' + '}', String(petId));
.replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
let queryParameters: any = {};
let headerParams: any = (<any>Object).assign({}, this.defaultHeaders);

4
samples/client/petstore/typescript-angularjs/api/StoreApi.ts
View File

@ -33,7 +33,7 @@ export class StoreApi {
*/
public deleteOrder (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
const localVarPath = this.basePath + '/store/order/{orderId}'
.replace('{' + 'orderId' + '}', String(orderId));
.replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
let queryParameters: any = {};
let headerParams: any = (<any>Object).assign({}, this.defaultHeaders);
@ -83,7 +83,7 @@ export class StoreApi {
*/
public getOrderById (orderId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise<models.Order> {
const localVarPath = this.basePath + '/store/order/{orderId}'
.replace('{' + 'orderId' + '}', String(orderId));
.replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
let queryParameters: any = {};
let headerParams: any = (<any>Object).assign({}, this.defaultHeaders);

6
samples/client/petstore/typescript-angularjs/api/UserApi.ts
View File

@ -117,7 +117,7 @@ export class UserApi {
*/
public deleteUser (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
const localVarPath = this.basePath + '/user/{username}'
.replace('{' + 'username' + '}', String(username));
.replace('{' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters: any = {};
let headerParams: any = (<any>Object).assign({}, this.defaultHeaders);
@ -145,7 +145,7 @@ export class UserApi {
*/
public getUserByName (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<models.User> {
const localVarPath = this.basePath + '/user/{username}'
.replace('{' + 'username' + '}', String(username));
.replace('{' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters: any = {};
let headerParams: any = (<any>Object).assign({}, this.defaultHeaders);
@ -236,7 +236,7 @@ export class UserApi {
*/
public updateUser (username: string, body: models.User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
const localVarPath = this.basePath + '/user/{username}'
.replace('{' + 'username' + '}', String(username));
.replace('{' + 'username' + '}', encodeURIComponent(String(username)));
let queryParameters: any = {};
let headerParams: any = (<any>Object).assign({}, this.defaultHeaders);