Skip to content

Commit b16b32e

Browse files
dkamyshovdkamyshov
authored
fix: use secure option from global config (#214)
Fixes #212.
1 parent 59e6fac commit b16b32e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+307
-63
lines changed

‎templates/base/http-clients/axios-http-client.eta‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export class HttpClient<SecurityDataType = unknown> {
6969
body,
7070
...params
7171
}: FullRequestParams): Promise<AxiosResponse<T>> => {
72-
const secureParams = (secure && this.securityWorker && (await this.securityWorker(this.securityData))) || {};
72+
const secureParams = ((typeof secure === 'boolean' ? secure : this.baseApiParams.secure) && this.securityWorker && (await this.securityWorker(this.securityData))) || {};
7373
const requestParams = this.mergeRequestParams(params, secureParams);
7474

7575
return this.instance.request({

‎templates/base/http-clients/fetch-http-client.eta‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export class HttpClient<SecurityDataType = unknown> {
153153
cancelToken,
154154
...params
155155
}: FullRequestParams): Promise<HttpResponse<T, E>> => {
156-
const secureParams = (secure && this.securityWorker && await this.securityWorker(this.securityData)) || {};
156+
const secureParams = ((typeof secure === 'boolean' ? secure : this.baseApiParams.secure) && this.securityWorker && await this.securityWorker(this.securityData)) || {};
157157
const requestParams = this.mergeRequestParams(params, secureParams);
158158
const queryString = query && this.toQueryString(query);
159159
const payloadFormatter = this.contentFormatters[type || ContentType.Json];

‎tests/generated/v2.0/adafruit.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,11 @@ export class HttpClient<SecurityDataType = unknown> {
313313
cancelToken,
314314
...params
315315
}: FullRequestParams): Promise<HttpResponse<T, E>> => {
316-
const secureParams = (secure && this.securityWorker && (await this.securityWorker(this.securityData))) || {};
316+
const secureParams =
317+
((typeof secure === "boolean" ? secure : this.baseApiParams.secure) &&
318+
this.securityWorker &&
319+
(await this.securityWorker(this.securityData))) ||
320+
{};
317321
const requestParams = this.mergeRequestParams(params, secureParams);
318322
const queryString = query && this.toQueryString(query);
319323
const payloadFormatter = this.contentFormatters[type || ContentType.Json];

‎tests/generated/v2.0/another-example.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,11 @@ export class HttpClient<SecurityDataType = unknown> {
289289
cancelToken,
290290
...params
291291
}: FullRequestParams): Promise<HttpResponse<T, E>> => {
292-
const secureParams = (secure && this.securityWorker && (await this.securityWorker(this.securityData))) || {};
292+
const secureParams =
293+
((typeof secure === "boolean" ? secure : this.baseApiParams.secure) &&
294+
this.securityWorker &&
295+
(await this.securityWorker(this.securityData))) ||
296+
{};
293297
const requestParams = this.mergeRequestParams(params, secureParams);
294298
const queryString = query && this.toQueryString(query);
295299
const payloadFormatter = this.contentFormatters[type || ContentType.Json];

‎tests/generated/v2.0/another-schema.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,11 @@ export class HttpClient<SecurityDataType = unknown> {
181181
cancelToken,
182182
...params
183183
}: FullRequestParams): Promise<HttpResponse<T, E>> => {
184-
const secureParams = (secure && this.securityWorker && (await this.securityWorker(this.securityData))) || {};
184+
const secureParams =
185+
((typeof secure === "boolean" ? secure : this.baseApiParams.secure) &&
186+
this.securityWorker &&
187+
(await this.securityWorker(this.securityData))) ||
188+
{};
185189
const requestParams = this.mergeRequestParams(params, secureParams);
186190
const queryString = query && this.toQueryString(query);
187191
const payloadFormatter = this.contentFormatters[type || ContentType.Json];

‎tests/generated/v2.0/api-with-examples.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,11 @@ export class HttpClient<SecurityDataType = unknown> {
158158
cancelToken,
159159
...params
160160
}: FullRequestParams): Promise<HttpResponse<T, E>> => {
161-
const secureParams = (secure && this.securityWorker && (await this.securityWorker(this.securityData))) || {};
161+
const secureParams =
162+
((typeof secure === "boolean" ? secure : this.baseApiParams.secure) &&
163+
this.securityWorker &&
164+
(await this.securityWorker(this.securityData))) ||
165+
{};
162166
const requestParams = this.mergeRequestParams(params, secureParams);
163167
const queryString = query && this.toQueryString(query);
164168
const payloadFormatter = this.contentFormatters[type || ContentType.Json];

‎tests/generated/v2.0/authentiq.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,11 @@ export class HttpClient<SecurityDataType = unknown> {
210210
cancelToken,
211211
...params
212212
}: FullRequestParams): Promise<HttpResponse<T, E>> => {
213-
const secureParams = (secure && this.securityWorker && (await this.securityWorker(this.securityData))) || {};
213+
const secureParams =
214+
((typeof secure === "boolean" ? secure : this.baseApiParams.secure) &&
215+
this.securityWorker &&
216+
(await this.securityWorker(this.securityData))) ||
217+
{};
214218
const requestParams = this.mergeRequestParams(params, secureParams);
215219
const queryString = query && this.toQueryString(query);
216220
const payloadFormatter = this.contentFormatters[type || ContentType.Json];

‎tests/generated/v2.0/enums.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,11 @@ export class HttpClient<SecurityDataType = unknown> {
223223
cancelToken,
224224
...params
225225
}: FullRequestParams): Promise<HttpResponse<T, E>> => {
226-
const secureParams = (secure && this.securityWorker && (await this.securityWorker(this.securityData))) || {};
226+
const secureParams =
227+
((typeof secure === "boolean" ? secure : this.baseApiParams.secure) &&
228+
this.securityWorker &&
229+
(await this.securityWorker(this.securityData))) ||
230+
{};
227231
const requestParams = this.mergeRequestParams(params, secureParams);
228232
const queryString = query && this.toQueryString(query);
229233
const payloadFormatter = this.contentFormatters[type || ContentType.Json];

‎tests/generated/v2.0/example1.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,11 @@ export class HttpClient<SecurityDataType = unknown> {
185185
cancelToken,
186186
...params
187187
}: FullRequestParams): Promise<HttpResponse<T, E>> => {
188-
const secureParams = (secure && this.securityWorker && (await this.securityWorker(this.securityData))) || {};
188+
const secureParams =
189+
((typeof secure === "boolean" ? secure : this.baseApiParams.secure) &&
190+
this.securityWorker &&
191+
(await this.securityWorker(this.securityData))) ||
192+
{};
189193
const requestParams = this.mergeRequestParams(params, secureParams);
190194
const queryString = query && this.toQueryString(query);
191195
const payloadFormatter = this.contentFormatters[type || ContentType.Json];

‎tests/generated/v2.0/file-formdata-example.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,11 @@ export class HttpClient<SecurityDataType = unknown> {
158158
cancelToken,
159159
...params
160160
}: FullRequestParams): Promise<HttpResponse<T, E>> => {
161-
const secureParams = (secure && this.securityWorker && (await this.securityWorker(this.securityData))) || {};
161+
const secureParams =
162+
((typeof secure === "boolean" ? secure : this.baseApiParams.secure) &&
163+
this.securityWorker &&
164+
(await this.securityWorker(this.securityData))) ||
165+
{};
162166
const requestParams = this.mergeRequestParams(params, secureParams);
163167
const queryString = query && this.toQueryString(query);
164168
const payloadFormatter = this.contentFormatters[type || ContentType.Json];

0 commit comments

Comments
 (0)