Skip to content

Commit 7242d20

Browse files
HugoMarioHugoMario
authored
Merge pull request #12330 from simeonborko/typescript-fetch-nullify-url-search
typescript-fetch: nullify url search
2 parents cff2c41 + 492a075 commit 7242d20

5 files changed

Lines changed: 34 additions & 34 deletions

File tree

  • modules/swagger-codegen/src/main/resources/typescript-fetch
  • samples/client
    • petstore-security-test/typescript-fetch
    • petstore/typescript-fetch/builds/default

‎modules/swagger-codegen/src/main/resources/typescript-fetch/api.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class BaseAPI {
5252
this.basePath = configuration.basePath || this.basePath;
5353
}
5454
}
55-
};
55+
}
5656

5757
/**
5858
*
@@ -224,7 +224,7 @@ export const {{classname}}FetchParamCreator = function (configuration?: Configur
224224
{{/bodyParam}}
225225
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
226226
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
227-
delete localVarUrlObj.search;
227+
localVarUrlObj.search = null;
228228
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
229229
{{#hasFormParams}}
230230
localVarRequestOptions.body = localVarFormParams.toString();

‎samples/client/petstore-security-test/typescript-fetch/.swagger-codegen/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0-SNAPSHOT
1+
2.4.40-SNAPSHOT

‎samples/client/petstore-security-test/typescript-fetch/api.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export interface FetchAPI {
4040
}
4141

4242
/**
43-
*
43+
*
4444
* @export
4545
* @interface FetchArgs
4646
*/
@@ -50,29 +50,29 @@ export interface FetchArgs {
5050
}
5151

5252
/**
53-
*
53+
*
5454
* @export
5555
* @class BaseAPI
5656
*/
5757
export class BaseAPI {
58-
protected configuration: Configuration;
58+
protected configuration?: Configuration;
5959

6060
constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected fetch: FetchAPI = portableFetch) {
6161
if (configuration) {
6262
this.configuration = configuration;
6363
this.basePath = configuration.basePath || this.basePath;
6464
}
6565
}
66-
};
66+
}
6767

6868
/**
69-
*
69+
*
7070
* @export
7171
* @class RequiredError
7272
* @extends {Error}
7373
*/
7474
export class RequiredError extends Error {
75-
name: "RequiredError"
75+
name = "RequiredError"
7676
constructor(public field: string, msg?: string) {
7777
super(msg);
7878
}
@@ -122,7 +122,7 @@ export const FakeApiFetchParamCreator = function (configuration?: Configuration)
122122

123123
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
124124
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
125-
delete localVarUrlObj.search;
125+
localVarUrlObj.search = null;
126126
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
127127
localVarRequestOptions.body = localVarFormParams.toString();
128128

‎samples/client/petstore/typescript-fetch/builds/default/.swagger-codegen/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.19-SNAPSHOT
1+
2.4.40-SNAPSHOT

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import * as url from "url";
1717
import * as portableFetch from "portable-fetch";
1818
import { Configuration } from "./configuration";
1919

20-
const BASE_PATH = "https://petstore.swagger.io/v2".replace(/\/+$/, "");
20+
const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, "");
2121

2222
/**
2323
*
@@ -55,7 +55,7 @@ export interface FetchArgs {
5555
* @class BaseAPI
5656
*/
5757
export class BaseAPI {
58-
protected configuration: Configuration;
58+
protected configuration?: Configuration;
5959

6060
constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected fetch: FetchAPI = portableFetch) {
6161
if (configuration) {
@@ -72,7 +72,7 @@ export class BaseAPI {
7272
* @extends {Error}
7373
*/
7474
export class RequiredError extends Error {
75-
name: "RequiredError"
75+
name = "RequiredError"
7676
constructor(public field: string, msg?: string) {
7777
super(msg);
7878
}
@@ -386,7 +386,7 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
386386

387387
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
388388
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
389-
delete localVarUrlObj.search;
389+
localVarUrlObj.search = null;
390390
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
391391
const needsSerialization = (<any>"Pet" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
392392
localVarRequestOptions.body = needsSerialization ? JSON.stringify(body || {}) : (body || "");
@@ -431,7 +431,7 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
431431

432432
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
433433
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
434-
delete localVarUrlObj.search;
434+
localVarUrlObj.search = null;
435435
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
436436

437437
return {
@@ -472,7 +472,7 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
472472

473473
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
474474
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
475-
delete localVarUrlObj.search;
475+
localVarUrlObj.search = null;
476476
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
477477

478478
return {
@@ -513,7 +513,7 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
513513

514514
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
515515
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
516-
delete localVarUrlObj.search;
516+
localVarUrlObj.search = null;
517517
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
518518

519519
return {
@@ -550,7 +550,7 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
550550

551551
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
552552
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
553-
delete localVarUrlObj.search;
553+
localVarUrlObj.search = null;
554554
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
555555

556556
return {
@@ -589,7 +589,7 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
589589

590590
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
591591
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
592-
delete localVarUrlObj.search;
592+
localVarUrlObj.search = null;
593593
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
594594
const needsSerialization = (<any>"Pet" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
595595
localVarRequestOptions.body = needsSerialization ? JSON.stringify(body || {}) : (body || "");
@@ -642,7 +642,7 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
642642

643643
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
644644
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
645-
delete localVarUrlObj.search;
645+
localVarUrlObj.search = null;
646646
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
647647
localVarRequestOptions.body = localVarFormParams.toString();
648648

@@ -694,7 +694,7 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
694694

695695
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
696696
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
697-
delete localVarUrlObj.search;
697+
localVarUrlObj.search = null;
698698
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
699699
localVarRequestOptions.body = localVarFormParams.toString();
700700

@@ -1103,7 +1103,7 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
11031103

11041104
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
11051105
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1106-
delete localVarUrlObj.search;
1106+
localVarUrlObj.search = null;
11071107
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
11081108

11091109
return {
@@ -1134,7 +1134,7 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
11341134

11351135
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
11361136
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1137-
delete localVarUrlObj.search;
1137+
localVarUrlObj.search = null;
11381138
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
11391139

11401140
return {
@@ -1163,7 +1163,7 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
11631163

11641164
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
11651165
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1166-
delete localVarUrlObj.search;
1166+
localVarUrlObj.search = null;
11671167
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
11681168

11691169
return {
@@ -1193,7 +1193,7 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
11931193

11941194
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
11951195
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1196-
delete localVarUrlObj.search;
1196+
localVarUrlObj.search = null;
11971197
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
11981198
const needsSerialization = (<any>"Order" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
11991199
localVarRequestOptions.body = needsSerialization ? JSON.stringify(body || {}) : (body || "");
@@ -1422,7 +1422,7 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
14221422

14231423
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
14241424
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1425-
delete localVarUrlObj.search;
1425+
localVarUrlObj.search = null;
14261426
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
14271427
const needsSerialization = (<any>"User" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
14281428
localVarRequestOptions.body = needsSerialization ? JSON.stringify(body || {}) : (body || "");
@@ -1454,7 +1454,7 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
14541454

14551455
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
14561456
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1457-
delete localVarUrlObj.search;
1457+
localVarUrlObj.search = null;
14581458
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
14591459
const needsSerialization = (<any>"Array&lt;User&gt;" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
14601460
localVarRequestOptions.body = needsSerialization ? JSON.stringify(body || {}) : (body || "");
@@ -1486,7 +1486,7 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
14861486

14871487
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
14881488
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1489-
delete localVarUrlObj.search;
1489+
localVarUrlObj.search = null;
14901490
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
14911491
const needsSerialization = (<any>"Array&lt;User&gt;" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
14921492
localVarRequestOptions.body = needsSerialization ? JSON.stringify(body || {}) : (body || "");
@@ -1517,7 +1517,7 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
15171517

15181518
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
15191519
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1520-
delete localVarUrlObj.search;
1520+
localVarUrlObj.search = null;
15211521
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
15221522

15231523
return {
@@ -1546,7 +1546,7 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
15461546

15471547
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
15481548
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1549-
delete localVarUrlObj.search;
1549+
localVarUrlObj.search = null;
15501550
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
15511551

15521552
return {
@@ -1587,7 +1587,7 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
15871587

15881588
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
15891589
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1590-
delete localVarUrlObj.search;
1590+
localVarUrlObj.search = null;
15911591
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
15921592

15931593
return {
@@ -1610,7 +1610,7 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
16101610

16111611
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
16121612
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1613-
delete localVarUrlObj.search;
1613+
localVarUrlObj.search = null;
16141614
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
16151615

16161616
return {
@@ -1646,7 +1646,7 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
16461646

16471647
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
16481648
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
1649-
delete localVarUrlObj.search;
1649+
localVarUrlObj.search = null;
16501650
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
16511651
const needsSerialization = (<any>"User" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
16521652
localVarRequestOptions.body = needsSerialization ? JSON.stringify(body || {}) : (body || "");

0 commit comments

Comments
 (0)