diff --git a/.fernignore b/.fernignore index 9393bbc..11e5282 100644 --- a/.fernignore +++ b/.fernignore @@ -5,6 +5,6 @@ .prettierrc.yml LICENSE -src/api/resources/proxy/client/Client.ts +src/api/resources/proxy/client/* src/index.ts src/wrapper diff --git a/README.md b/README.md index f757e28..4d57d97 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ const client = new PipedreamClient({ clientId: "YOUR_CLIENT_ID", clientSecret: "YOUR_CLIENT_SECRET", projectEnvironment: "YOUR_PROJECT_ENVIRONMENT", + projectId: "YOUR_PROJECT_ID", }); await client.accounts.create({ app_slug: "app_slug", @@ -78,6 +79,7 @@ const client = new PipedreamClient({ clientId: "YOUR_CLIENT_ID", clientSecret: "YOUR_CLIENT_SECRET", projectEnvironment: "YOUR_PROJECT_ENVIRONMENT", + projectId: "YOUR_PROJECT_ID", }); const response = await client.apps.list(); for await (const item of response) { @@ -105,6 +107,18 @@ const response = await client.accounts.create(..., { }); ``` +### Additional Query String Parameters + +If you would like to send additional query string parameters as part of the request, use the `queryParams` request option. + +```typescript +const response = await client.accounts.create(..., { + queryParams: { + 'customQueryParamKey': 'custom query param value' + } +}); +``` + ### Retries The SDK is instrumented with automatic retries with exponential backoff. A request will be retried as long @@ -161,8 +175,7 @@ console.log(rawResponse.headers['X-My-Header']); ### Runtime Compatibility -The SDK defaults to `node-fetch` but will use the global fetch client if present. The SDK works in the following -runtimes: +The SDK works in the following runtimes: - Node.js 18+ - Vercel diff --git a/reference.md b/reference.md index 4d468d2..9e65bab 100644 --- a/reference.md +++ b/reference.md @@ -289,7 +289,7 @@ await client.accounts.create({
-**request:** `Pipedream.CreateAccountRequest` +**request:** `Pipedream.CreateAccountOpts`
@@ -2148,7 +2148,6 @@ await client.proxy.patch("url_64", { ```typescript await client.tokens.create({ external_user_id: "external_user_id", - project_id: "project_id", }); ``` @@ -2165,7 +2164,7 @@ await client.tokens.create({
-**request:** `Pipedream.CreateTokenRequest` +**request:** `Pipedream.CreateTokenOpts`
diff --git a/src/Client.ts b/src/Client.ts index d8db70c..6cece9c 100644 --- a/src/Client.ts +++ b/src/Client.ts @@ -42,6 +42,8 @@ export declare namespace PipedreamClient { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } diff --git a/src/api/resources/accounts/client/Client.ts b/src/api/resources/accounts/client/Client.ts index 8e01065..965a0d2 100644 --- a/src/api/resources/accounts/client/Client.ts +++ b/src/api/resources/accounts/client/Client.ts @@ -30,6 +30,8 @@ export declare namespace Accounts { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } @@ -104,7 +106,7 @@ export class Accounts { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, @@ -157,7 +159,7 @@ export class Accounts { } /** - * @param {Pipedream.CreateAccountRequest} request + * @param {Pipedream.CreateAccountOpts} request * @param {Accounts.RequestOptions} requestOptions - Request-specific configuration. * * @example @@ -168,14 +170,14 @@ export class Accounts { * }) */ public create( - request: Pipedream.CreateAccountRequest, + request: Pipedream.CreateAccountOpts, requestOptions?: Accounts.RequestOptions, ): core.HttpResponsePromise { return core.HttpResponsePromise.fromPromise(this.__create(request, requestOptions)); } private async __create( - request: Pipedream.CreateAccountRequest, + request: Pipedream.CreateAccountOpts, requestOptions?: Accounts.RequestOptions, ): Promise> { const { app_id: appId, external_user_id: externalUserId, oauth_app_id: oauthAppId, ..._body } = request; @@ -209,7 +211,7 @@ export class Accounts { requestOptions?.headers, ), contentType: "application/json", - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, requestType: "json", body: _body, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, @@ -290,7 +292,7 @@ export class Accounts { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -357,6 +359,7 @@ export class Accounts { }), requestOptions?.headers, ), + queryParameters: requestOptions?.queryParams, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -423,6 +426,7 @@ export class Accounts { }), requestOptions?.headers, ), + queryParameters: requestOptions?.queryParams, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, diff --git a/src/api/resources/accounts/client/requests/CreateAccountRequest.ts b/src/api/resources/accounts/client/requests/CreateAccountOpts.ts similarity index 94% rename from src/api/resources/accounts/client/requests/CreateAccountRequest.ts rename to src/api/resources/accounts/client/requests/CreateAccountOpts.ts index 897b993..96f35e7 100644 --- a/src/api/resources/accounts/client/requests/CreateAccountRequest.ts +++ b/src/api/resources/accounts/client/requests/CreateAccountOpts.ts @@ -10,7 +10,7 @@ * connect_token: "connect_token" * } */ -export interface CreateAccountRequest { +export interface CreateAccountOpts { /** * The app slug or ID to filter accounts by. */ diff --git a/src/api/resources/accounts/client/requests/index.ts b/src/api/resources/accounts/client/requests/index.ts index c3f768e..2f1563d 100644 --- a/src/api/resources/accounts/client/requests/index.ts +++ b/src/api/resources/accounts/client/requests/index.ts @@ -1,3 +1,3 @@ export { type AccountsListRequest } from "./AccountsListRequest.js"; -export { type CreateAccountRequest } from "./CreateAccountRequest.js"; +export { type CreateAccountOpts } from "./CreateAccountOpts.js"; export { type AccountsRetrieveRequest } from "./AccountsRetrieveRequest.js"; diff --git a/src/api/resources/actions/client/Client.ts b/src/api/resources/actions/client/Client.ts index c671fcf..4497520 100644 --- a/src/api/resources/actions/client/Client.ts +++ b/src/api/resources/actions/client/Client.ts @@ -30,6 +30,8 @@ export declare namespace Actions { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } @@ -90,7 +92,7 @@ export class Actions { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, @@ -176,6 +178,7 @@ export class Actions { }), requestOptions?.headers, ), + queryParameters: requestOptions?.queryParams, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -254,6 +257,7 @@ export class Actions { requestOptions?.headers, ), contentType: "application/json", + queryParameters: requestOptions?.queryParams, requestType: "json", body: _body, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, @@ -333,6 +337,7 @@ export class Actions { requestOptions?.headers, ), contentType: "application/json", + queryParameters: requestOptions?.queryParams, requestType: "json", body: _body, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, @@ -410,6 +415,7 @@ export class Actions { requestOptions?.headers, ), contentType: "application/json", + queryParameters: requestOptions?.queryParams, requestType: "json", body: _body, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, diff --git a/src/api/resources/appCategories/client/Client.ts b/src/api/resources/appCategories/client/Client.ts index 9b2f185..ee1e5a7 100644 --- a/src/api/resources/appCategories/client/Client.ts +++ b/src/api/resources/appCategories/client/Client.ts @@ -30,6 +30,8 @@ export declare namespace AppCategories { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } @@ -73,6 +75,7 @@ export class AppCategories { }), requestOptions?.headers, ), + queryParameters: requestOptions?.queryParams, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -140,6 +143,7 @@ export class AppCategories { }), requestOptions?.headers, ), + queryParameters: requestOptions?.queryParams, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, diff --git a/src/api/resources/apps/client/Client.ts b/src/api/resources/apps/client/Client.ts index 00df129..b04f5df 100644 --- a/src/api/resources/apps/client/Client.ts +++ b/src/api/resources/apps/client/Client.ts @@ -30,6 +30,8 @@ export declare namespace Apps { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } @@ -106,7 +108,7 @@ export class Apps { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, @@ -187,6 +189,7 @@ export class Apps { }), requestOptions?.headers, ), + queryParameters: requestOptions?.queryParams, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, diff --git a/src/api/resources/components/client/Client.ts b/src/api/resources/components/client/Client.ts index f95cb11..cbe5f52 100644 --- a/src/api/resources/components/client/Client.ts +++ b/src/api/resources/components/client/Client.ts @@ -30,6 +30,8 @@ export declare namespace Components { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } @@ -90,7 +92,7 @@ export class Components { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, @@ -176,6 +178,7 @@ export class Components { }), requestOptions?.headers, ), + queryParameters: requestOptions?.queryParams, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -254,6 +257,7 @@ export class Components { requestOptions?.headers, ), contentType: "application/json", + queryParameters: requestOptions?.queryParams, requestType: "json", body: _body, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, @@ -333,6 +337,7 @@ export class Components { requestOptions?.headers, ), contentType: "application/json", + queryParameters: requestOptions?.queryParams, requestType: "json", body: _body, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, diff --git a/src/api/resources/deployedTriggers/client/Client.ts b/src/api/resources/deployedTriggers/client/Client.ts index 7e312a7..fddfcee 100644 --- a/src/api/resources/deployedTriggers/client/Client.ts +++ b/src/api/resources/deployedTriggers/client/Client.ts @@ -30,6 +30,8 @@ export declare namespace DeployedTriggers { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } @@ -87,7 +89,7 @@ export class DeployedTriggers { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, @@ -181,7 +183,7 @@ export class DeployedTriggers { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -260,7 +262,7 @@ export class DeployedTriggers { requestOptions?.headers, ), contentType: "application/json", - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, requestType: "json", body: _body, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, @@ -344,7 +346,7 @@ export class DeployedTriggers { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -426,7 +428,7 @@ export class DeployedTriggers { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -504,7 +506,7 @@ export class DeployedTriggers { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -587,7 +589,7 @@ export class DeployedTriggers { requestOptions?.headers, ), contentType: "application/json", - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, requestType: "json", body: _body, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, @@ -670,7 +672,7 @@ export class DeployedTriggers { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -750,7 +752,7 @@ export class DeployedTriggers { requestOptions?.headers, ), contentType: "application/json", - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, requestType: "json", body: _body, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, diff --git a/src/api/resources/oauthTokens/client/Client.ts b/src/api/resources/oauthTokens/client/Client.ts index 6810d49..845dcf7 100644 --- a/src/api/resources/oauthTokens/client/Client.ts +++ b/src/api/resources/oauthTokens/client/Client.ts @@ -30,6 +30,8 @@ export declare namespace OauthTokens { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } @@ -80,6 +82,7 @@ export class OauthTokens { requestOptions?.headers, ), contentType: "application/json", + queryParameters: requestOptions?.queryParams, requestType: "json", body: { ...request, grant_type: "client_credentials" }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, diff --git a/src/api/resources/projects/client/Client.ts b/src/api/resources/projects/client/Client.ts index 07b37f4..e8946f5 100644 --- a/src/api/resources/projects/client/Client.ts +++ b/src/api/resources/projects/client/Client.ts @@ -30,6 +30,8 @@ export declare namespace Projects { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } @@ -73,6 +75,7 @@ export class Projects { }), requestOptions?.headers, ), + queryParameters: requestOptions?.queryParams, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, diff --git a/src/api/resources/tokens/client/Client.ts b/src/api/resources/tokens/client/Client.ts index cb6c2a8..ffa987a 100644 --- a/src/api/resources/tokens/client/Client.ts +++ b/src/api/resources/tokens/client/Client.ts @@ -30,6 +30,8 @@ export declare namespace Tokens { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } @@ -43,24 +45,23 @@ export class Tokens { } /** - * @param {Pipedream.CreateTokenRequest} request + * @param {Pipedream.CreateTokenOpts} request * @param {Tokens.RequestOptions} requestOptions - Request-specific configuration. * * @example * await client.tokens.create({ - * external_user_id: "external_user_id", - * project_id: "project_id" + * external_user_id: "external_user_id" * }) */ public create( - request: Pipedream.CreateTokenRequest, + request: Pipedream.CreateTokenOpts, requestOptions?: Tokens.RequestOptions, ): core.HttpResponsePromise { return core.HttpResponsePromise.fromPromise(this.__create(request, requestOptions)); } private async __create( - request: Pipedream.CreateTokenRequest, + request: Pipedream.CreateTokenOpts, requestOptions?: Tokens.RequestOptions, ): Promise> { const _response = await core.fetcher({ @@ -68,7 +69,7 @@ export class Tokens { (await core.Supplier.get(this._options.baseUrl)) ?? (await core.Supplier.get(this._options.environment)) ?? environments.PipedreamEnvironment.Prod, - "v1/connect/tokens", + `v1/connect/${encodeURIComponent(this._options.projectId)}/tokens`, ), method: "POST", headers: mergeHeaders( @@ -80,6 +81,7 @@ export class Tokens { requestOptions?.headers, ), contentType: "application/json", + queryParameters: requestOptions?.queryParams, requestType: "json", body: request, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, @@ -106,7 +108,9 @@ export class Tokens { rawResponse: _response.rawResponse, }); case "timeout": - throw new errors.PipedreamTimeoutError("Timeout exceeded when calling POST /v1/connect/tokens."); + throw new errors.PipedreamTimeoutError( + "Timeout exceeded when calling POST /v1/connect/{project_id}/tokens.", + ); case "unknown": throw new errors.PipedreamError({ message: _response.error.errorMessage, @@ -147,7 +151,7 @@ export class Tokens { (await core.Supplier.get(this._options.baseUrl)) ?? (await core.Supplier.get(this._options.environment)) ?? environments.PipedreamEnvironment.Prod, - `v1/connect/tokens/${encodeURIComponent(ctok)}/validate`, + `v1/connect/${encodeURIComponent(this._options.projectId)}/tokens/${encodeURIComponent(ctok)}/validate`, ), method: "GET", headers: mergeHeaders( @@ -158,7 +162,7 @@ export class Tokens { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -184,7 +188,7 @@ export class Tokens { }); case "timeout": throw new errors.PipedreamTimeoutError( - "Timeout exceeded when calling GET /v1/connect/tokens/{ctok}/validate.", + "Timeout exceeded when calling GET /v1/connect/{project_id}/tokens/{ctok}/validate.", ); case "unknown": throw new errors.PipedreamError({ diff --git a/src/api/resources/tokens/client/requests/CreateTokenRequest.ts b/src/api/resources/tokens/client/requests/CreateTokenOpts.ts similarity index 73% rename from src/api/resources/tokens/client/requests/CreateTokenRequest.ts rename to src/api/resources/tokens/client/requests/CreateTokenOpts.ts index 1aafa6f..72807f6 100644 --- a/src/api/resources/tokens/client/requests/CreateTokenRequest.ts +++ b/src/api/resources/tokens/client/requests/CreateTokenOpts.ts @@ -5,19 +5,16 @@ /** * @example * { - * external_user_id: "external_user_id", - * project_id: "project_id" + * external_user_id: "external_user_id" * } */ -export interface CreateTokenRequest { +export interface CreateTokenOpts { /** List of allowed origins for CORS */ allowed_origins?: string[]; /** URI to redirect to on error */ error_redirect_uri?: string; /** Your end user ID, for whom you're creating the token */ external_user_id: string; - /** The ID of the project */ - project_id: string; /** URI to redirect to on success */ success_redirect_uri?: string; /** Webhook URI for notifications */ diff --git a/src/api/resources/tokens/client/requests/index.ts b/src/api/resources/tokens/client/requests/index.ts index 3b9d249..e4d6f73 100644 --- a/src/api/resources/tokens/client/requests/index.ts +++ b/src/api/resources/tokens/client/requests/index.ts @@ -1,2 +1,2 @@ -export { type CreateTokenRequest } from "./CreateTokenRequest.js"; +export { type CreateTokenOpts } from "./CreateTokenOpts.js"; export { type TokensValidateRequest } from "./TokensValidateRequest.js"; diff --git a/src/api/resources/triggers/client/Client.ts b/src/api/resources/triggers/client/Client.ts index a9ca79a..8872395 100644 --- a/src/api/resources/triggers/client/Client.ts +++ b/src/api/resources/triggers/client/Client.ts @@ -30,6 +30,8 @@ export declare namespace Triggers { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } @@ -90,7 +92,7 @@ export class Triggers { }), requestOptions?.headers, ), - queryParameters: _queryParams, + queryParameters: { ..._queryParams, ...requestOptions?.queryParams }, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, @@ -176,6 +178,7 @@ export class Triggers { }), requestOptions?.headers, ), + queryParameters: requestOptions?.queryParams, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, @@ -254,6 +257,7 @@ export class Triggers { requestOptions?.headers, ), contentType: "application/json", + queryParameters: requestOptions?.queryParams, requestType: "json", body: _body, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, @@ -333,6 +337,7 @@ export class Triggers { requestOptions?.headers, ), contentType: "application/json", + queryParameters: requestOptions?.queryParams, requestType: "json", body: _body, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, @@ -408,6 +413,7 @@ export class Triggers { requestOptions?.headers, ), contentType: "application/json", + queryParameters: requestOptions?.queryParams, requestType: "json", body: request, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, diff --git a/src/api/resources/users/client/Client.ts b/src/api/resources/users/client/Client.ts index d182e48..beab37a 100644 --- a/src/api/resources/users/client/Client.ts +++ b/src/api/resources/users/client/Client.ts @@ -30,6 +30,8 @@ export declare namespace Users { abortSignal?: AbortSignal; /** Override the x-pd-environment header */ projectEnvironment?: Pipedream.ProjectEnvironment | undefined; + /** Additional query string parameters to include in the request. */ + queryParams?: Record; /** Additional headers to include in the request. */ headers?: Record | undefined>; } @@ -76,6 +78,7 @@ export class Users { }), requestOptions?.headers, ), + queryParameters: requestOptions?.queryParams, timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, diff --git a/src/api/types/ConnectTokenCreateOpts.ts b/src/api/types/ConnectTokenCreateOpts.ts index 2828bc0..944319a 100644 --- a/src/api/types/ConnectTokenCreateOpts.ts +++ b/src/api/types/ConnectTokenCreateOpts.ts @@ -8,8 +8,6 @@ export interface ConnectTokenCreateOpts { /** Your end user ID, for whom you're creating the token */ external_user_id: string; - /** The ID of the project */ - project_id: string; /** List of allowed origins for CORS */ allowed_origins?: string[]; /** URI to redirect to on error */ diff --git a/src/core/fetcher/Fetcher.ts b/src/core/fetcher/Fetcher.ts index dd9a40f..693dad8 100644 --- a/src/core/fetcher/Fetcher.ts +++ b/src/core/fetcher/Fetcher.ts @@ -18,7 +18,7 @@ export declare namespace Fetcher { method: string; contentType?: string; headers?: Record | undefined>; - queryParameters?: Record; + queryParameters?: Record; body?: unknown; timeoutMs?: number; maxRetries?: number; diff --git a/yarn.lock b/yarn.lock index 1dd1f71..adbe087 100644 --- a/yarn.lock +++ b/yarn.lock @@ -110,12 +110,12 @@ integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg== "@babel/helpers@^7.27.6": - version "7.27.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.6.tgz#6456fed15b2cb669d2d1fabe84b66b34991d812c" - integrity sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug== + version "7.28.2" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.2.tgz#80f0918fecbfebea9af856c419763230040ee850" + integrity sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw== dependencies: "@babel/template" "^7.27.2" - "@babel/types" "^7.27.6" + "@babel/types" "^7.28.2" "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.27.2", "@babel/parser@^7.28.0": version "7.28.0" @@ -265,10 +265,10 @@ "@babel/types" "^7.28.0" debug "^4.3.1" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.27.1", "@babel/types@^7.27.6", "@babel/types@^7.28.0", "@babel/types@^7.3.3": - version "7.28.1" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.1.tgz#2aaf3c10b31ba03a77ac84f52b3912a0edef4cf9" - integrity sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.27.1", "@babel/types@^7.28.0", "@babel/types@^7.28.2", "@babel/types@^7.3.3": + version "7.28.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.2.tgz#da9db0856a9a88e0a13b019881d7513588cf712b" + integrity sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ== dependencies: "@babel/helper-string-parser" "^7.27.1" "@babel/helper-validator-identifier" "^7.27.1" @@ -1364,9 +1364,9 @@ ejs@^3.1.10: jake "^10.8.5" electron-to-chromium@^1.5.173: - version "1.5.190" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.190.tgz#f0ac8be182291a45e8154dbb12f18d2b2318e4ac" - integrity sha512-k4McmnB2091YIsdCgkS0fMVMPOJgxl93ltFzaryXqwip1AaxeDqKCGLxkXODDA5Ab/D+tV5EL5+aTx76RvLRxw== + version "1.5.191" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.191.tgz#8ae49a471447b1ceaf1d4d183a9000082f52363c" + integrity sha512-xcwe9ELcuxYLUFqZZxL19Z6HVKcvNkIwhbHUz7L3us6u12yR+7uY89dSl570f/IqNthx8dAw3tojG7i4Ni4tDA== emittery@^0.13.1: version "0.13.1" @@ -2802,9 +2802,9 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== source-map@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== + version "0.7.6" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.6.tgz#a3658ab87e5b6429c8a1f3ba0083d4c61ca3ef02" + integrity sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ== sprintf-js@~1.0.2: version "1.0.3"