Skip to content

Commit 5bff5b7

Browse files
zplatazplata
committed
fix: Adjust manually overridden SDK methods to match new changes in main client files
1 parent 5ce7d69 commit 5bff5b7

File tree

4 files changed

+78
-76
lines changed

4 files changed

+78
-76
lines changed

‎src/wrapper/FormsClient.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import urlJoin from "url-join";
21
import { Forms } from "../api/resources/forms/client/Client";
32
import * as core from "../core";
43
import * as Webflow from "../api";
54
import * as environments from "../environments";
65
import * as errors from "../errors";
76
import * as serializers from "../serialization";
8-
import { mergeHeaders, mergeOnlyDefinedHeaders } from "../core/headers.js";
7+
import { mergeHeaders, mergeOnlyDefinedHeaders } from "../core/headers";
98

109
declare module "../api/resources/forms/client/Client" {
1110
export namespace Forms {}
@@ -60,33 +59,34 @@ export class Client extends Forms {
6059
const { elementId, offset, limit } = request;
6160
const _queryParams: Record<string, string | string[] | object | object[] | null> = {};
6261
if (elementId != null) {
63-
_queryParams["elementId"] = elementId;
62+
_queryParams.elementId = elementId;
6463
}
6564

6665
if (offset != null) {
67-
_queryParams["offset"] = offset.toString();
66+
_queryParams.offset = offset.toString();
6867
}
6968

7069
if (limit != null) {
71-
_queryParams["limit"] = limit.toString();
70+
_queryParams.limit = limit.toString();
7271
}
7372

73+
const _headers: core.Fetcher.Args["headers"] = mergeHeaders(
74+
this._options?.headers,
75+
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
76+
requestOptions?.headers,
77+
);
7478
const _response = await core.fetcher({
75-
url: urlJoin(
79+
url: core.url.join(
7680
(await core.Supplier.get(this._options.baseUrl)) ??
7781
((await core.Supplier.get(this._options.environment)) ?? environments.WebflowEnvironment.DataApi)
7882
.base,
79-
`sites/${encodeURIComponent(siteId)}/form_submissions`,
83+
`sites/${core.url.encodePathParam(siteId)}/form_submissions`,
8084
),
8185
method: "GET",
82-
headers: mergeHeaders(
83-
this._options?.headers,
84-
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
85-
requestOptions?.headers,
86-
),
87-
queryParameters: _queryParams,
88-
timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
89-
maxRetries: requestOptions?.maxRetries,
86+
headers: _headers,
87+
queryParameters: { ..._queryParams, ...requestOptions?.queryParams },
88+
timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
89+
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
9090
abortSignal: requestOptions?.abortSignal,
9191
});
9292
if (_response.ok) {

‎src/wrapper/ItemsClient.ts‎

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import urlJoin from "url-join";
21
import * as Webflow from "../api";
32
import { Items } from "../api/resources/collections/resources/items/client/Client";
43
import * as core from "../core";
54
import * as environments from "../environments";
65
import * as errors from "../errors";
76
import * as serializers from "../serialization";
8-
import { mergeHeaders, mergeOnlyDefinedHeaders } from "../core/headers.js";
7+
import { mergeHeaders, mergeOnlyDefinedHeaders } from "../core/headers";
98
import * as SchemaOverrides from "./schemas";
109

1110
declare module "../api/resources/collections/resources/items/client/Client" {
@@ -82,32 +81,33 @@ export class Client extends Items {
8281
const { skipInvalidFiles, ..._body } = request;
8382
const _queryParams: Record<string, string | string[] | object | object[] | null> = {};
8483
if (skipInvalidFiles != null) {
85-
_queryParams["skipInvalidFiles"] = skipInvalidFiles.toString();
84+
_queryParams.skipInvalidFiles = skipInvalidFiles.toString();
8685
}
8786

87+
const _headers: core.Fetcher.Args["headers"] = mergeHeaders(
88+
this._options?.headers,
89+
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
90+
requestOptions?.headers,
91+
);
8892
const _response = await core.fetcher({
89-
url: urlJoin(
93+
url: core.url.join(
9094
(await core.Supplier.get(this._options.baseUrl)) ??
9195
((await core.Supplier.get(this._options.environment)) ?? environments.WebflowEnvironment.DataApi)
9296
.base,
93-
`collections/${encodeURIComponent(collectionId)}/items`,
97+
`collections/${core.url.encodePathParam(collectionId)}/items`,
9498
),
9599
method: "POST",
96-
headers: mergeHeaders(
97-
this._options?.headers,
98-
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
99-
requestOptions?.headers,
100-
),
100+
headers: _headers,
101101
contentType: "application/json",
102-
queryParameters: _queryParams,
102+
queryParameters: { ..._queryParams, ...requestOptions?.queryParams },
103103
requestType: "json",
104104
body: serializers.collections.ItemsCreateItemRequestBody.jsonOrThrow(_body, {
105105
unrecognizedObjectKeys: "passthrough",
106106
allowUnrecognizedUnionMembers: true,
107107
allowUnrecognizedEnumValues: true,
108108
}),
109-
timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
110-
maxRetries: requestOptions?.maxRetries,
109+
timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
110+
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
111111
abortSignal: requestOptions?.abortSignal,
112112
});
113113
if (_response.ok) {
@@ -245,32 +245,33 @@ export class Client extends Items {
245245
const { skipInvalidFiles, ..._body } = request;
246246
const _queryParams: Record<string, string | string[] | object | object[] | null> = {};
247247
if (skipInvalidFiles != null) {
248-
_queryParams["skipInvalidFiles"] = skipInvalidFiles.toString();
248+
_queryParams.skipInvalidFiles = skipInvalidFiles.toString();
249249
}
250250

251+
const _headers: core.Fetcher.Args["headers"] = mergeHeaders(
252+
this._options?.headers,
253+
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
254+
requestOptions?.headers,
255+
);
251256
const _response = await core.fetcher({
252-
url: urlJoin(
257+
url: core.url.join(
253258
(await core.Supplier.get(this._options.baseUrl)) ??
254259
((await core.Supplier.get(this._options.environment)) ?? environments.WebflowEnvironment.DataApi)
255260
.base,
256-
`collections/${encodeURIComponent(collectionId)}/items/${encodeURIComponent(itemId)}`,
261+
`collections/${core.url.encodePathParam(collectionId)}/items/${core.url.encodePathParam(itemId)}`,
257262
),
258263
method: "PATCH",
259-
headers: mergeHeaders(
260-
this._options?.headers,
261-
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
262-
requestOptions?.headers,
263-
),
264+
headers: _headers,
264265
contentType: "application/json",
265-
queryParameters: _queryParams,
266+
queryParameters: { ..._queryParams, ...requestOptions?.queryParams },
266267
requestType: "json",
267268
body: serializers.CollectionItemPatchSingle.jsonOrThrow(_body, {
268269
unrecognizedObjectKeys: "passthrough",
269270
allowUnrecognizedUnionMembers: true,
270271
allowUnrecognizedEnumValues: true,
271272
}),
272-
timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
273-
maxRetries: requestOptions?.maxRetries,
273+
timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
274+
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
274275
abortSignal: requestOptions?.abortSignal,
275276
});
276277
if (_response.ok) {
@@ -428,32 +429,33 @@ export class Client extends Items {
428429
const { skipInvalidFiles, ..._body } = request;
429430
const _queryParams: Record<string, string | string[] | object | object[] | null> = {};
430431
if (skipInvalidFiles != null) {
431-
_queryParams["skipInvalidFiles"] = skipInvalidFiles.toString();
432+
_queryParams.skipInvalidFiles = skipInvalidFiles.toString();
432433
}
433434

435+
const _headers: core.Fetcher.Args["headers"] = mergeHeaders(
436+
this._options?.headers,
437+
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
438+
requestOptions?.headers,
439+
);
434440
const _response = await core.fetcher({
435-
url: urlJoin(
441+
url: core.url.join(
436442
(await core.Supplier.get(this._options.baseUrl)) ??
437443
((await core.Supplier.get(this._options.environment)) ?? environments.WebflowEnvironment.DataApi)
438444
.base,
439-
`collections/${encodeURIComponent(collectionId)}/items/live`,
445+
`collections/${core.url.encodePathParam(collectionId)}/items/live`,
440446
),
441447
method: "POST",
442-
headers: mergeHeaders(
443-
this._options?.headers,
444-
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
445-
requestOptions?.headers,
446-
),
448+
headers: _headers,
447449
contentType: "application/json",
448-
queryParameters: _queryParams,
450+
queryParameters: { ..._queryParams, ...requestOptions?.queryParams },
449451
requestType: "json",
450452
body: serializers.collections.ItemsCreateItemLiveRequestBody.jsonOrThrow(_body, {
451453
unrecognizedObjectKeys: "passthrough",
452454
allowUnrecognizedUnionMembers: true,
453455
allowUnrecognizedEnumValues: true,
454456
}),
455-
timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
456-
maxRetries: requestOptions?.maxRetries,
457+
timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
458+
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
457459
abortSignal: requestOptions?.abortSignal,
458460
});
459461
if (_response.ok) {
@@ -592,32 +594,33 @@ export class Client extends Items {
592594
const { skipInvalidFiles, ..._body } = request;
593595
const _queryParams: Record<string, string | string[] | object | object[] | null> = {};
594596
if (skipInvalidFiles != null) {
595-
_queryParams["skipInvalidFiles"] = skipInvalidFiles.toString();
597+
_queryParams.skipInvalidFiles = skipInvalidFiles.toString();
596598
}
597599

600+
const _headers: core.Fetcher.Args["headers"] = mergeHeaders(
601+
this._options?.headers,
602+
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
603+
requestOptions?.headers,
604+
);
598605
const _response = await core.fetcher({
599-
url: urlJoin(
606+
url: core.url.join(
600607
(await core.Supplier.get(this._options.baseUrl)) ??
601608
((await core.Supplier.get(this._options.environment)) ?? environments.WebflowEnvironment.DataApi)
602609
.base,
603-
`collections/${encodeURIComponent(collectionId)}/items/${encodeURIComponent(itemId)}/live`,
610+
`collections/${core.url.encodePathParam(collectionId)}/items/${core.url.encodePathParam(itemId)}/live`,
604611
),
605612
method: "PATCH",
606-
headers: mergeHeaders(
607-
this._options?.headers,
608-
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
609-
requestOptions?.headers,
610-
),
613+
headers: _headers,
611614
contentType: "application/json",
612-
queryParameters: _queryParams,
615+
queryParameters: { ..._queryParams, ...requestOptions?.queryParams },
613616
requestType: "json",
614617
body: serializers.CollectionItemPatchSingle.jsonOrThrow(_body, {
615618
unrecognizedObjectKeys: "passthrough",
616619
allowUnrecognizedUnionMembers: true,
617620
allowUnrecognizedEnumValues: true,
618621
}),
619-
timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
620-
maxRetries: requestOptions?.maxRetries,
622+
timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
623+
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
621624
abortSignal: requestOptions?.abortSignal,
622625
});
623626
if (_response.ok) {

‎src/wrapper/PagesClient.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import urlJoin from "url-join";
21
import { Pages } from "../api/resources/pages/client/Client";
32
import * as core from "../core";
43
import * as Webflow from "../api";
54
import * as environments from "../environments";
65
import * as errors from "../errors";
76
import * as serializers from "../serialization";
8-
import { mergeHeaders, mergeOnlyDefinedHeaders } from "../core/headers.js";
7+
import { mergeHeaders, mergeOnlyDefinedHeaders } from "../core/headers";
98
import * as SchemaOverrides from "./schemas";
109

1110
declare module "../api/resources/pages/client/Client" {
@@ -72,32 +71,33 @@ export class Client extends Pages {
7271
const { localeId, ..._body } = request;
7372
const _queryParams: Record<string, string | string[] | object | object[] | null> = {};
7473
if (localeId != null) {
75-
_queryParams["localeId"] = localeId;
74+
_queryParams.localeId = localeId;
7675
}
7776

77+
const _headers: core.Fetcher.Args["headers"] = mergeHeaders(
78+
this._options?.headers,
79+
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
80+
requestOptions?.headers,
81+
);
7882
const _response = await core.fetcher({
79-
url: urlJoin(
83+
url: core.url.join(
8084
(await core.Supplier.get(this._options.baseUrl)) ??
8185
((await core.Supplier.get(this._options.environment)) ?? environments.WebflowEnvironment.DataApi)
8286
.base,
83-
`pages/${encodeURIComponent(pageId)}`,
87+
`pages/${core.url.encodePathParam(pageId)}`,
8488
),
8589
method: "PUT",
86-
headers: mergeHeaders(
87-
this._options?.headers,
88-
mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
89-
requestOptions?.headers,
90-
),
90+
headers: _headers,
9191
contentType: "application/json",
92-
queryParameters: _queryParams,
92+
queryParameters: { ..._queryParams, ...requestOptions?.queryParams },
9393
requestType: "json",
9494
body: serializers.PageMetadataWrite.jsonOrThrow(_body, {
9595
unrecognizedObjectKeys: "passthrough",
9696
allowUnrecognizedUnionMembers: true,
9797
allowUnrecognizedEnumValues: true,
9898
}),
99-
timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
100-
maxRetries: requestOptions?.maxRetries,
99+
timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
100+
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
101101
abortSignal: requestOptions?.abortSignal,
102102
});
103103
if (_response.ok) {

‎src/wrapper/WebflowClient.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import qs from "qs";
21
import { WebflowClient as FernClient } from "../Client";
32
import { OauthScope } from "../api/types/OAuthScope";
43
import * as core from "../core";
@@ -75,7 +74,7 @@ export class WebflowClient extends FernClient {
7574
} else {
7675
params["scope"] = scope.join(" ");
7776
}
78-
return `https://webflow.com/oauth/authorize?${qs.stringify(params)}`;
77+
return `https://webflow.com/oauth/authorize?${core.url.toQueryString(params)}`;
7978
}
8079

8180
/**

0 commit comments

Comments
 (0)