Skip to content

Commit

Permalink
Merge pull request swagger-api#10380 from swagger-api/marcbuils-issue…
Browse files Browse the repository at this point in the history 
…-8836

Marcbuils issue 8836
  • Loading branch information
@HugoMario
HugoMario authored Jul 11, 2020
2 parents b9a731a + 309f7bd commit 04754cc
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 19 deletions.
5 changes: 5 additions & 0 deletions modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,12 @@ export class {{classname}} {
{{#hasFormParams}}
const canConsumeForm = this.canConsumeForm(consumes);

{{^useHttpClient}}
let formParams: { append(param: string, value: any): void; };
{{/useHttpClient}}
{{#useHttpClient}}
let formParams: { append(param: string, value: any): void | HttpParams; };
{{/useHttpClient}}
let useForm = false;
let convertFormParamsToString = false;
{{#formParams}}
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v2/default/.swagger-codegen/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.12-SNAPSHOT
2.4.15-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v2/npm/.swagger-codegen/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.12-SNAPSHOT
2.4.15-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v2/with-interfaces/.swagger-codegen/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.12-SNAPSHOT
2.4.15-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v4.3/npm/.swagger-codegen/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.12-SNAPSHOT
2.4.12-SNAPSHOT
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ export class PetService {

const canConsumeForm = this.canConsumeForm(consumes);

let formParams: { append(param: string, value: any): void; };
let formParams: { append(param: string, value: any): void | HttpParams; };
let useForm = false;
let convertFormParamsToString = false;
if (useForm) {
Expand Down Expand Up @@ -505,7 +505,7 @@ export class PetService {

const canConsumeForm = this.canConsumeForm(consumes);

let formParams: { append(param: string, value: any): void; };
let formParams: { append(param: string, value: any): void | HttpParams; };
let useForm = false;
let convertFormParamsToString = false;
// use FormData to transmit files using content-type "multipart/form-data"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v4.3/with-interfaces/.swagger-codegen/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.12-SNAPSHOT
2.4.12-SNAPSHOT
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ export class PetService implements PetServiceInterface {

const canConsumeForm = this.canConsumeForm(consumes);

let formParams: { append(param: string, value: any): void; };
let formParams: { append(param: string, value: any): void | HttpParams; };
let useForm = false;
let convertFormParamsToString = false;
if (useForm) {
Expand Down Expand Up @@ -506,7 +506,7 @@ export class PetService implements PetServiceInterface {

const canConsumeForm = this.canConsumeForm(consumes);

let formParams: { append(param: string, value: any): void; };
let formParams: { append(param: string, value: any): void | HttpParams; };
let useForm = false;
let convertFormParamsToString = false;
// use FormData to transmit files using content-type "multipart/form-data"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v4/npm/.swagger-codegen/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.12-SNAPSHOT
2.4.15-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v5/npm/.swagger-codegen/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.12-SNAPSHOT
2.4.12-SNAPSHOT
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-angular-v5/npm/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ export class PetService {

const canConsumeForm = this.canConsumeForm(consumes);

let formParams: { append(param: string, value: any): void; };
let formParams: { append(param: string, value: any): void | HttpParams; };
let useForm = false;
let convertFormParamsToString = false;
if (useForm) {
Expand Down Expand Up @@ -505,7 +505,7 @@ export class PetService {

const canConsumeForm = this.canConsumeForm(consumes);

let formParams: { append(param: string, value: any): void; };
let formParams: { append(param: string, value: any): void | HttpParams; };
let useForm = false;
let convertFormParamsToString = false;
// use FormData to transmit files using content-type "multipart/form-data"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v5/with-interfaces/.swagger-codegen/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.12-SNAPSHOT
2.4.12-SNAPSHOT
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-angular-v5/with-interfaces/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ export class PetService implements PetServiceInterface {

const canConsumeForm = this.canConsumeForm(consumes);

let formParams: { append(param: string, value: any): void; };
let formParams: { append(param: string, value: any): void | HttpParams; };
let useForm = false;
let convertFormParamsToString = false;
if (useForm) {
Expand Down Expand Up @@ -506,7 +506,7 @@ export class PetService implements PetServiceInterface {

const canConsumeForm = this.canConsumeForm(consumes);

let formParams: { append(param: string, value: any): void; };
let formParams: { append(param: string, value: any): void | HttpParams; };
let useForm = false;
let convertFormParamsToString = false;
// use FormData to transmit files using content-type "multipart/form-data"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v6/npm/.swagger-codegen/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.12-SNAPSHOT
2.4.12-SNAPSHOT
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-angular-v6/npm/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ export class PetService {

const canConsumeForm = this.canConsumeForm(consumes);

let formParams: { append(param: string, value: any): void; };
let formParams: { append(param: string, value: any): void | HttpParams; };
let useForm = false;
let convertFormParamsToString = false;
if (useForm) {
Expand Down Expand Up @@ -505,7 +505,7 @@ export class PetService {

const canConsumeForm = this.canConsumeForm(consumes);

let formParams: { append(param: string, value: any): void; };
let formParams: { append(param: string, value: any): void | HttpParams; };
let useForm = false;
let convertFormParamsToString = false;
// use FormData to transmit files using content-type "multipart/form-data"
Expand Down

0 comments on commit 04754cc

Please sign in to comment.