Skip to content

Commit bf7ee5e

Browse files
janbucharjanbuchar
committed
Bug
1 parent df125e6 commit bf7ee5e

File tree

21 files changed

+153
-125
lines changed

21 files changed

+153
-125
lines changed

‎modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class BaseAPI {
4747
// do not handle correctly sometimes.
4848
url += '?' + querystring(context.query);
4949
}
50-
const body = (context.body instanceof FormData || context.body instanceof Body)
50+
const body = (context.body instanceof FormData || context.body instanceof Blob)
5151
? context.body
5252
: JSON.stringify(context.body);
5353
const init = {

‎samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
} from '../models';
2424

2525
export interface AddPetRequest {
26-
body: Pet;
26+
pet: Pet;
2727
}
2828

2929
export interface DeletePetRequest {
@@ -37,14 +37,15 @@ export interface FindPetsByStatusRequest {
3737

3838
export interface FindPetsByTagsRequest {
3939
tags: Array<string>;
40+
maxCount?: number;
4041
}
4142

4243
export interface GetPetByIdRequest {
4344
petId: number;
4445
}
4546

4647
export interface UpdatePetRequest {
47-
body: Pet;
48+
pet: Pet;
4849
}
4950

5051
export interface UpdatePetWithFormRequest {
@@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI {
6869
* Add a new pet to the store
6970
*/
7071
async addPetRaw(requestParameters: AddPetRequest): Promise<runtime.ApiResponse<void>> {
71-
if (requestParameters.body === null || requestParameters.body === undefined) {
72-
throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
72+
if (requestParameters.pet === null || requestParameters.pet === undefined) {
73+
throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.');
7374
}
7475

7576
const queryParameters: runtime.HTTPQuery = {};
@@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI {
9293
method: 'POST',
9394
headers: headerParameters,
9495
query: queryParameters,
95-
body: PetToJSON(requestParameters.body),
96+
body: PetToJSON(requestParameters.pet),
9697
});
9798

9899
return new runtime.VoidApiResponse(response);
@@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI {
167168
if (this.configuration && this.configuration.accessToken) {
168169
// oauth required
169170
if (typeof this.configuration.accessToken === 'function') {
170-
headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
171+
headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
171172
} else {
172173
headerParameters["Authorization"] = this.configuration.accessToken;
173174
}
@@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI {
207208
queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
208209
}
209210

211+
if (requestParameters.maxCount !== undefined) {
212+
queryParameters['maxCount'] = requestParameters.maxCount;
213+
}
214+
210215
const headerParameters: runtime.HTTPHeaders = {};
211216

212217
if (this.configuration && this.configuration.accessToken) {
213218
// oauth required
214219
if (typeof this.configuration.accessToken === 'function') {
215-
headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
220+
headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
216221
} else {
217222
headerParameters["Authorization"] = this.configuration.accessToken;
218223
}
@@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI {
277282
* Update an existing pet
278283
*/
279284
async updatePetRaw(requestParameters: UpdatePetRequest): Promise<runtime.ApiResponse<void>> {
280-
if (requestParameters.body === null || requestParameters.body === undefined) {
281-
throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
285+
if (requestParameters.pet === null || requestParameters.pet === undefined) {
286+
throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.');
282287
}
283288

284289
const queryParameters: runtime.HTTPQuery = {};
@@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI {
301306
method: 'PUT',
302307
headers: headerParameters,
303308
query: queryParameters,
304-
body: PetToJSON(requestParameters.body),
309+
body: PetToJSON(requestParameters.pet),
305310
});
306311

307312
return new runtime.VoidApiResponse(response);

‎samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export interface GetOrderByIdRequest {
2828
}
2929

3030
export interface PlaceOrderRequest {
31-
body: Order;
31+
order: Order;
3232
}
3333

3434
/**
@@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI {
135135
* Place an order for a pet
136136
*/
137137
async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise<runtime.ApiResponse<Order>> {
138-
if (requestParameters.body === null || requestParameters.body === undefined) {
139-
throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
138+
if (requestParameters.order === null || requestParameters.order === undefined) {
139+
throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.');
140140
}
141141

142142
const queryParameters: runtime.HTTPQuery = {};
@@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI {
150150
method: 'POST',
151151
headers: headerParameters,
152152
query: queryParameters,
153-
body: OrderToJSON(requestParameters.body),
153+
body: OrderToJSON(requestParameters.order),
154154
});
155155

156156
return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));

‎samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ import {
2020
} from '../models';
2121

2222
export interface CreateUserRequest {
23-
body: User;
23+
user: User;
2424
}
2525

2626
export interface CreateUsersWithArrayInputRequest {
27-
body: Array<User>;
27+
user: Array<User>;
2828
}
2929

3030
export interface CreateUsersWithListInputRequest {
31-
body: Array<User>;
31+
user: Array<User>;
3232
}
3333

3434
export interface DeleteUserRequest {
@@ -46,7 +46,7 @@ export interface LoginUserRequest {
4646

4747
export interface UpdateUserRequest {
4848
username: string;
49-
body: User;
49+
user: User;
5050
}
5151

5252
/**
@@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI {
5959
* Create user
6060
*/
6161
async createUserRaw(requestParameters: CreateUserRequest): Promise<runtime.ApiResponse<void>> {
62-
if (requestParameters.body === null || requestParameters.body === undefined) {
63-
throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
62+
if (requestParameters.user === null || requestParameters.user === undefined) {
63+
throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.');
6464
}
6565

6666
const queryParameters: runtime.HTTPQuery = {};
@@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI {
7474
method: 'POST',
7575
headers: headerParameters,
7676
query: queryParameters,
77-
body: UserToJSON(requestParameters.body),
77+
body: UserToJSON(requestParameters.user),
7878
});
7979

8080
return new runtime.VoidApiResponse(response);
@@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI {
9292
* Creates list of users with given input array
9393
*/
9494
async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise<runtime.ApiResponse<void>> {
95-
if (requestParameters.body === null || requestParameters.body === undefined) {
96-
throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
95+
if (requestParameters.user === null || requestParameters.user === undefined) {
96+
throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.');
9797
}
9898

9999
const queryParameters: runtime.HTTPQuery = {};
@@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI {
107107
method: 'POST',
108108
headers: headerParameters,
109109
query: queryParameters,
110-
body: requestParameters.body.map(UserToJSON),
110+
body: requestParameters.user.map(UserToJSON),
111111
});
112112

113113
return new runtime.VoidApiResponse(response);
@@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI {
124124
* Creates list of users with given input array
125125
*/
126126
async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise<runtime.ApiResponse<void>> {
127-
if (requestParameters.body === null || requestParameters.body === undefined) {
128-
throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
127+
if (requestParameters.user === null || requestParameters.user === undefined) {
128+
throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.');
129129
}
130130

131131
const queryParameters: runtime.HTTPQuery = {};
@@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI {
139139
method: 'POST',
140140
headers: headerParameters,
141141
query: queryParameters,
142-
body: requestParameters.body.map(UserToJSON),
142+
body: requestParameters.user.map(UserToJSON),
143143
});
144144

145145
return new runtime.VoidApiResponse(response);
@@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI {
289289
throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.');
290290
}
291291

292-
if (requestParameters.body === null || requestParameters.body === undefined) {
293-
throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
292+
if (requestParameters.user === null || requestParameters.user === undefined) {
293+
throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.');
294294
}
295295

296296
const queryParameters: runtime.HTTPQuery = {};
@@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI {
304304
method: 'PUT',
305305
headers: headerParameters,
306306
query: queryParameters,
307-
body: UserToJSON(requestParameters.body),
307+
body: UserToJSON(requestParameters.user),
308308
});
309309

310310
return new runtime.VoidApiResponse(response);

‎samples/client/petstore/typescript-fetch/builds/default/models/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
export * from './Category';
2+
export * from './InlineObject';
3+
export * from './InlineObject1';
24
export * from './ModelApiResponse';
35
export * from './Order';
46
export * from './Pet';

‎samples/client/petstore/typescript-fetch/builds/default/runtime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export class BaseAPI {
5858
// do not handle correctly sometimes.
5959
url += '?' + querystring(context.query);
6060
}
61-
const body = (context.body instanceof FormData || context.body instanceof Body)
61+
const body = (context.body instanceof FormData || context.body instanceof Blob)
6262
? context.body
6363
: JSON.stringify(context.body);
6464
const init = {

‎samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
} from '../models';
2424

2525
export interface AddPetRequest {
26-
body: Pet;
26+
pet: Pet;
2727
}
2828

2929
export interface DeletePetRequest {
@@ -37,14 +37,15 @@ export interface FindPetsByStatusRequest {
3737

3838
export interface FindPetsByTagsRequest {
3939
tags: Array<string>;
40+
maxCount?: number;
4041
}
4142

4243
export interface GetPetByIdRequest {
4344
petId: number;
4445
}
4546

4647
export interface UpdatePetRequest {
47-
body: Pet;
48+
pet: Pet;
4849
}
4950

5051
export interface UpdatePetWithFormRequest {
@@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI {
6869
* Add a new pet to the store
6970
*/
7071
async addPetRaw(requestParameters: AddPetRequest): Promise<runtime.ApiResponse<void>> {
71-
if (requestParameters.body === null || requestParameters.body === undefined) {
72-
throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
72+
if (requestParameters.pet === null || requestParameters.pet === undefined) {
73+
throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.');
7374
}
7475

7576
const queryParameters: runtime.HTTPQuery = {};
@@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI {
9293
method: 'POST',
9394
headers: headerParameters,
9495
query: queryParameters,
95-
body: PetToJSON(requestParameters.body),
96+
body: PetToJSON(requestParameters.pet),
9697
});
9798

9899
return new runtime.VoidApiResponse(response);
@@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI {
167168
if (this.configuration && this.configuration.accessToken) {
168169
// oauth required
169170
if (typeof this.configuration.accessToken === 'function') {
170-
headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
171+
headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
171172
} else {
172173
headerParameters["Authorization"] = this.configuration.accessToken;
173174
}
@@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI {
207208
queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
208209
}
209210

211+
if (requestParameters.maxCount !== undefined) {
212+
queryParameters['maxCount'] = requestParameters.maxCount;
213+
}
214+
210215
const headerParameters: runtime.HTTPHeaders = {};
211216

212217
if (this.configuration && this.configuration.accessToken) {
213218
// oauth required
214219
if (typeof this.configuration.accessToken === 'function') {
215-
headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
220+
headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
216221
} else {
217222
headerParameters["Authorization"] = this.configuration.accessToken;
218223
}
@@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI {
277282
* Update an existing pet
278283
*/
279284
async updatePetRaw(requestParameters: UpdatePetRequest): Promise<runtime.ApiResponse<void>> {
280-
if (requestParameters.body === null || requestParameters.body === undefined) {
281-
throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
285+
if (requestParameters.pet === null || requestParameters.pet === undefined) {
286+
throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.');
282287
}
283288

284289
const queryParameters: runtime.HTTPQuery = {};
@@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI {
301306
method: 'PUT',
302307
headers: headerParameters,
303308
query: queryParameters,
304-
body: PetToJSON(requestParameters.body),
309+
body: PetToJSON(requestParameters.pet),
305310
});
306311

307312
return new runtime.VoidApiResponse(response);

‎samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export interface GetOrderByIdRequest {
2828
}
2929

3030
export interface PlaceOrderRequest {
31-
body: Order;
31+
order: Order;
3232
}
3333

3434
/**
@@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI {
135135
* Place an order for a pet
136136
*/
137137
async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise<runtime.ApiResponse<Order>> {
138-
if (requestParameters.body === null || requestParameters.body === undefined) {
139-
throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
138+
if (requestParameters.order === null || requestParameters.order === undefined) {
139+
throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.');
140140
}
141141

142142
const queryParameters: runtime.HTTPQuery = {};
@@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI {
150150
method: 'POST',
151151
headers: headerParameters,
152152
query: queryParameters,
153-
body: OrderToJSON(requestParameters.body),
153+
body: OrderToJSON(requestParameters.order),
154154
});
155155

156156
return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));

0 commit comments

Comments
 (0)