({
response: dataWithRawResponse.data,
rawResponse: dataWithRawResponse.rawResponse,
- hasNextPage: (response) => (response?.clients ?? []).length >= (request?.per_page ?? 1),
+ hasNextPage: (response) => (response?.clients ?? []).length >= Math.floor(request?.per_page ?? 1),
getItems: (response) => response?.clients ?? [],
- loadPage: (response) => {
- _offset += response?.clients != null ? response.clients.length : 1;
+ loadPage: (_response) => {
+ _offset += 1;
return list(core.setObjectProperty(request, "page", _offset));
},
});
@@ -236,7 +226,7 @@ export class Clients {
* SSO Integrations created via this endpoint will accept login requests and share user profile information.
*
* @param {Management.CreateClientRequestContent} request
- * @param {Clients.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {ClientsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -251,18 +241,19 @@ export class Clients {
*/
public create(
request: Management.CreateClientRequestContent,
- requestOptions?: Clients.RequestOptions,
+ requestOptions?: ClientsClient.RequestOptions,
): core.HttpResponsePromise {
return core.HttpResponsePromise.fromPromise(this.__create(request, requestOptions));
}
private async __create(
request: Management.CreateClientRequestContent,
- requestOptions?: Clients.RequestOptions,
+ requestOptions?: ClientsClient.RequestOptions,
): Promise> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -282,6 +273,7 @@ export class Clients {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return {
@@ -311,21 +303,7 @@ export class Clients {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError("Timeout exceeded when calling POST /clients.");
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "POST", "/clients");
}
/**
@@ -363,7 +341,7 @@ export class Clients {
*
* @param {string} id - ID of the client to retrieve.
* @param {Management.GetClientRequestParameters} request
- * @param {Clients.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {ClientsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -380,7 +358,7 @@ export class Clients {
public get(
id: string,
request: Management.GetClientRequestParameters = {},
- requestOptions?: Clients.RequestOptions,
+ requestOptions?: ClientsClient.RequestOptions,
): core.HttpResponsePromise {
return core.HttpResponsePromise.fromPromise(this.__get(id, request, requestOptions));
}
@@ -388,7 +366,7 @@ export class Clients {
private async __get(
id: string,
request: Management.GetClientRequestParameters = {},
- requestOptions?: Clients.RequestOptions,
+ requestOptions?: ClientsClient.RequestOptions,
): Promise> {
const { fields, include_fields: includeFields } = request;
const _queryParams: Record = {};
@@ -400,9 +378,10 @@ export class Clients {
_queryParams["include_fields"] = includeFields?.toString() ?? null;
}
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -419,6 +398,7 @@ export class Clients {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return { data: _response.body as Management.GetClientResponseContent, rawResponse: _response.rawResponse };
@@ -445,28 +425,14 @@ export class Clients {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError("Timeout exceeded when calling GET /clients/{id}.");
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/clients/{id}");
}
/**
* Delete a client and related configuration (rules, connections, etc).
*
* @param {string} id - ID of the client to delete.
- * @param {Clients.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {ClientsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -476,14 +442,18 @@ export class Clients {
* @example
* await client.clients.delete("id")
*/
- public delete(id: string, requestOptions?: Clients.RequestOptions): core.HttpResponsePromise {
+ public delete(id: string, requestOptions?: ClientsClient.RequestOptions): core.HttpResponsePromise {
return core.HttpResponsePromise.fromPromise(this.__delete(id, requestOptions));
}
- private async __delete(id: string, requestOptions?: Clients.RequestOptions): Promise> {
+ private async __delete(
+ id: string,
+ requestOptions?: ClientsClient.RequestOptions,
+ ): Promise> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -500,6 +470,7 @@ export class Clients {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return { data: undefined, rawResponse: _response.rawResponse };
@@ -524,21 +495,7 @@ export class Clients {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError("Timeout exceeded when calling DELETE /clients/{id}.");
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "DELETE", "/clients/{id}");
}
/**
@@ -554,7 +511,7 @@ export class Clients {
*
* @param {string} id - ID of the client to update.
* @param {Management.UpdateClientRequestContent} request
- * @param {Clients.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {ClientsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -568,7 +525,7 @@ export class Clients {
public update(
id: string,
request: Management.UpdateClientRequestContent = {},
- requestOptions?: Clients.RequestOptions,
+ requestOptions?: ClientsClient.RequestOptions,
): core.HttpResponsePromise {
return core.HttpResponsePromise.fromPromise(this.__update(id, request, requestOptions));
}
@@ -576,11 +533,12 @@ export class Clients {
private async __update(
id: string,
request: Management.UpdateClientRequestContent = {},
- requestOptions?: Clients.RequestOptions,
+ requestOptions?: ClientsClient.RequestOptions,
): Promise> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -600,6 +558,7 @@ export class Clients {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return {
@@ -629,21 +588,7 @@ export class Clients {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError("Timeout exceeded when calling PATCH /clients/{id}.");
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "PATCH", "/clients/{id}");
}
/**
@@ -654,7 +599,7 @@ export class Clients {
* For more information, read Rotate Client Secrets.
*
* @param {string} id - ID of the client that will rotate secrets.
- * @param {Clients.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {ClientsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -667,18 +612,19 @@ export class Clients {
*/
public rotateSecret(
id: string,
- requestOptions?: Clients.RequestOptions,
+ requestOptions?: ClientsClient.RequestOptions,
): core.HttpResponsePromise {
return core.HttpResponsePromise.fromPromise(this.__rotateSecret(id, requestOptions));
}
private async __rotateSecret(
id: string,
- requestOptions?: Clients.RequestOptions,
+ requestOptions?: ClientsClient.RequestOptions,
): Promise> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -695,6 +641,7 @@ export class Clients {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return {
@@ -724,26 +671,6 @@ export class Clients {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError(
- "Timeout exceeded when calling POST /clients/{id}/rotate-secret.",
- );
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
- }
-
- protected async _getAuthorizationHeader(): Promise {
- return `Bearer ${await core.Supplier.get(this._options.token)}`;
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "POST", "/clients/{id}/rotate-secret");
}
}
diff --git a/src/management/api/resources/clients/resources/connections/client/Client.ts b/src/management/api/resources/clients/resources/connections/client/Client.ts
index 2a32aeb069..579593dce5 100644
--- a/src/management/api/resources/clients/resources/connections/client/Client.ts
+++ b/src/management/api/resources/clients/resources/connections/client/Client.ts
@@ -1,23 +1,25 @@
// This file was auto-generated by Fern from our API Definition.
import type { BaseClientOptions, BaseRequestOptions } from "../../../../../../BaseClient.js";
+import { type NormalizedClientOptionsWithAuth, normalizeClientOptionsWithAuth } from "../../../../../../BaseClient.js";
import * as environments from "../../../../../../environments.js";
import * as core from "../../../../../../core/index.js";
import * as Management from "../../../../../index.js";
-import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../../../core/headers.js";
+import { mergeHeaders } from "../../../../../../core/headers.js";
import * as errors from "../../../../../../errors/index.js";
+import { handleNonStatusCodeError } from "../../../../../../errors/handleNonStatusCodeError.js";
-export declare namespace Connections {
+export declare namespace ConnectionsClient {
export interface Options extends BaseClientOptions {}
export interface RequestOptions extends BaseRequestOptions {}
}
-export class Connections {
- protected readonly _options: Connections.Options;
+export class ConnectionsClient {
+ protected readonly _options: NormalizedClientOptionsWithAuth;
- constructor(_options: Connections.Options) {
- this._options = _options;
+ constructor(options: ConnectionsClient.Options) {
+ this._options = normalizeClientOptionsWithAuth(options);
}
/**
@@ -33,7 +35,7 @@ export class Connections {
*
* @param {string} id - ID of the client for which to retrieve enabled connections.
* @param {Management.ConnectionsGetRequest} request
- * @param {Connections.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {ConnectionsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -52,7 +54,7 @@ export class Connections {
public async get(
id: string,
request: Management.ConnectionsGetRequest = {},
- requestOptions?: Connections.RequestOptions,
+ requestOptions?: ConnectionsClient.RequestOptions,
): Promise> {
const list = core.HttpResponsePromise.interceptFunction(
async (
@@ -79,9 +81,10 @@ export class Connections {
if (includeFields !== undefined) {
_queryParams["include_fields"] = includeFields?.toString() ?? null;
}
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -98,6 +101,7 @@ export class Connections {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return {
@@ -134,23 +138,12 @@ export class Connections {
});
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError(
- "Timeout exceeded when calling GET /clients/{id}/connections.",
- );
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(
+ _response.error,
+ _response.rawResponse,
+ "GET",
+ "/clients/{id}/connections",
+ );
},
);
const dataWithRawResponse = await list(request).withRawResponse();
@@ -165,8 +158,4 @@ export class Connections {
},
});
}
-
- protected async _getAuthorizationHeader(): Promise {
- return `Bearer ${await core.Supplier.get(this._options.token)}`;
- }
}
diff --git a/src/management/api/resources/clients/resources/credentials/client/Client.ts b/src/management/api/resources/clients/resources/credentials/client/Client.ts
index aa8e33b1fe..74acaafb85 100644
--- a/src/management/api/resources/clients/resources/credentials/client/Client.ts
+++ b/src/management/api/resources/clients/resources/credentials/client/Client.ts
@@ -1,23 +1,25 @@
// This file was auto-generated by Fern from our API Definition.
import type { BaseClientOptions, BaseRequestOptions } from "../../../../../../BaseClient.js";
+import { type NormalizedClientOptionsWithAuth, normalizeClientOptionsWithAuth } from "../../../../../../BaseClient.js";
import * as environments from "../../../../../../environments.js";
import * as core from "../../../../../../core/index.js";
import * as Management from "../../../../../index.js";
-import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../../../core/headers.js";
+import { mergeHeaders } from "../../../../../../core/headers.js";
import * as errors from "../../../../../../errors/index.js";
+import { handleNonStatusCodeError } from "../../../../../../errors/handleNonStatusCodeError.js";
-export declare namespace Credentials {
+export declare namespace CredentialsClient {
export interface Options extends BaseClientOptions {}
export interface RequestOptions extends BaseRequestOptions {}
}
-export class Credentials {
- protected readonly _options: Credentials.Options;
+export class CredentialsClient {
+ protected readonly _options: NormalizedClientOptionsWithAuth;
- constructor(_options: Credentials.Options) {
- this._options = _options;
+ constructor(options: CredentialsClient.Options) {
+ this._options = normalizeClientOptionsWithAuth(options);
}
/**
@@ -25,8 +27,8 @@ export class Credentials {
*
* Important: To enable credentials to be used for a client authentication method, set the client_authentication_methods property on the client. To enable credentials to be used for JWT-Secured Authorization requests set the signed_request_object property on the client.
*
- * @param {string} clientId - ID of the client.
- * @param {Credentials.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {string} client_id - ID of the client.
+ * @param {CredentialsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.UnauthorizedError}
* @throws {@link Management.ForbiddenError}
@@ -37,19 +39,20 @@ export class Credentials {
* await client.clients.credentials.list("client_id")
*/
public list(
- clientId: string,
- requestOptions?: Credentials.RequestOptions,
+ client_id: string,
+ requestOptions?: CredentialsClient.RequestOptions,
): core.HttpResponsePromise {
- return core.HttpResponsePromise.fromPromise(this.__list(clientId, requestOptions));
+ return core.HttpResponsePromise.fromPromise(this.__list(client_id, requestOptions));
}
private async __list(
- clientId: string,
- requestOptions?: Credentials.RequestOptions,
+ client_id: string,
+ requestOptions?: CredentialsClient.RequestOptions,
): Promise> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -57,7 +60,7 @@ export class Credentials {
(await core.Supplier.get(this._options.baseUrl)) ??
(await core.Supplier.get(this._options.environment)) ??
environments.ManagementEnvironment.Default,
- `clients/${core.url.encodePathParam(clientId)}/credentials`,
+ `clients/${core.url.encodePathParam(client_id)}/credentials`,
),
method: "GET",
headers: _headers,
@@ -66,6 +69,7 @@ export class Credentials {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return { data: _response.body as Management.ClientCredential[], rawResponse: _response.rawResponse };
@@ -90,23 +94,12 @@ export class Credentials {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError(
- "Timeout exceeded when calling GET /clients/{client_id}/credentials.",
- );
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(
+ _response.error,
+ _response.rawResponse,
+ "GET",
+ "/clients/{client_id}/credentials",
+ );
}
/**
@@ -144,9 +137,9 @@ export class Credentials {
* To enable the credential for JWT-secured Authorization requests, set the signed_request_objectproperty on the client. For more information, read Configure JWT-secured Authorization Requests (JAR)
*
*
- * @param {string} clientId - ID of the client.
+ * @param {string} client_id - ID of the client.
* @param {Management.PostClientCredentialRequestContent} request
- * @param {Credentials.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {CredentialsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -160,21 +153,22 @@ export class Credentials {
* })
*/
public create(
- clientId: string,
+ client_id: string,
request: Management.PostClientCredentialRequestContent,
- requestOptions?: Credentials.RequestOptions,
+ requestOptions?: CredentialsClient.RequestOptions,
): core.HttpResponsePromise {
- return core.HttpResponsePromise.fromPromise(this.__create(clientId, request, requestOptions));
+ return core.HttpResponsePromise.fromPromise(this.__create(client_id, request, requestOptions));
}
private async __create(
- clientId: string,
+ client_id: string,
request: Management.PostClientCredentialRequestContent,
- requestOptions?: Credentials.RequestOptions,
+ requestOptions?: CredentialsClient.RequestOptions,
): Promise> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -182,7 +176,7 @@ export class Credentials {
(await core.Supplier.get(this._options.baseUrl)) ??
(await core.Supplier.get(this._options.environment)) ??
environments.ManagementEnvironment.Default,
- `clients/${core.url.encodePathParam(clientId)}/credentials`,
+ `clients/${core.url.encodePathParam(client_id)}/credentials`,
),
method: "POST",
headers: _headers,
@@ -194,6 +188,7 @@ export class Credentials {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return {
@@ -223,23 +218,12 @@ export class Credentials {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError(
- "Timeout exceeded when calling POST /clients/{client_id}/credentials.",
- );
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(
+ _response.error,
+ _response.rawResponse,
+ "POST",
+ "/clients/{client_id}/credentials",
+ );
}
/**
@@ -247,9 +231,9 @@ export class Credentials {
*
* Important: To enable credentials to be used for a client authentication method, set the client_authentication_methods property on the client. To enable credentials to be used for JWT-Secured Authorization requests set the signed_request_object property on the client.
*
- * @param {string} clientId - ID of the client.
- * @param {string} credentialId - ID of the credential.
- * @param {Credentials.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {string} client_id - ID of the client.
+ * @param {string} credential_id - ID of the credential.
+ * @param {CredentialsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.UnauthorizedError}
* @throws {@link Management.ForbiddenError}
@@ -260,21 +244,22 @@ export class Credentials {
* await client.clients.credentials.get("client_id", "credential_id")
*/
public get(
- clientId: string,
- credentialId: string,
- requestOptions?: Credentials.RequestOptions,
+ client_id: string,
+ credential_id: string,
+ requestOptions?: CredentialsClient.RequestOptions,
): core.HttpResponsePromise {
- return core.HttpResponsePromise.fromPromise(this.__get(clientId, credentialId, requestOptions));
+ return core.HttpResponsePromise.fromPromise(this.__get(client_id, credential_id, requestOptions));
}
private async __get(
- clientId: string,
- credentialId: string,
- requestOptions?: Credentials.RequestOptions,
+ client_id: string,
+ credential_id: string,
+ requestOptions?: CredentialsClient.RequestOptions,
): Promise> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -282,7 +267,7 @@ export class Credentials {
(await core.Supplier.get(this._options.baseUrl)) ??
(await core.Supplier.get(this._options.environment)) ??
environments.ManagementEnvironment.Default,
- `clients/${core.url.encodePathParam(clientId)}/credentials/${core.url.encodePathParam(credentialId)}`,
+ `clients/${core.url.encodePathParam(client_id)}/credentials/${core.url.encodePathParam(credential_id)}`,
),
method: "GET",
headers: _headers,
@@ -291,6 +276,7 @@ export class Credentials {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return {
@@ -318,31 +304,20 @@ export class Credentials {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError(
- "Timeout exceeded when calling GET /clients/{client_id}/credentials/{credential_id}.",
- );
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(
+ _response.error,
+ _response.rawResponse,
+ "GET",
+ "/clients/{client_id}/credentials/{credential_id}",
+ );
}
/**
* Delete a client credential you previously created. May be enabled or disabled. For more information, read Client Credential Flow.
*
- * @param {string} clientId - ID of the client.
- * @param {string} credentialId - ID of the credential to delete.
- * @param {Credentials.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {string} client_id - ID of the client.
+ * @param {string} credential_id - ID of the credential to delete.
+ * @param {CredentialsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -353,21 +328,22 @@ export class Credentials {
* await client.clients.credentials.delete("client_id", "credential_id")
*/
public delete(
- clientId: string,
- credentialId: string,
- requestOptions?: Credentials.RequestOptions,
+ client_id: string,
+ credential_id: string,
+ requestOptions?: CredentialsClient.RequestOptions,
): core.HttpResponsePromise {
- return core.HttpResponsePromise.fromPromise(this.__delete(clientId, credentialId, requestOptions));
+ return core.HttpResponsePromise.fromPromise(this.__delete(client_id, credential_id, requestOptions));
}
private async __delete(
- clientId: string,
- credentialId: string,
- requestOptions?: Credentials.RequestOptions,
+ client_id: string,
+ credential_id: string,
+ requestOptions?: CredentialsClient.RequestOptions,
): Promise> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -375,7 +351,7 @@ export class Credentials {
(await core.Supplier.get(this._options.baseUrl)) ??
(await core.Supplier.get(this._options.environment)) ??
environments.ManagementEnvironment.Default,
- `clients/${core.url.encodePathParam(clientId)}/credentials/${core.url.encodePathParam(credentialId)}`,
+ `clients/${core.url.encodePathParam(client_id)}/credentials/${core.url.encodePathParam(credential_id)}`,
),
method: "DELETE",
headers: _headers,
@@ -384,6 +360,7 @@ export class Credentials {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return { data: undefined, rawResponse: _response.rawResponse };
@@ -408,32 +385,21 @@ export class Credentials {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError(
- "Timeout exceeded when calling DELETE /clients/{client_id}/credentials/{credential_id}.",
- );
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(
+ _response.error,
+ _response.rawResponse,
+ "DELETE",
+ "/clients/{client_id}/credentials/{credential_id}",
+ );
}
/**
* Change a client credential you previously created. May be enabled or disabled. For more information, read Client Credential Flow.
*
- * @param {string} clientId - ID of the client.
- * @param {string} credentialId - ID of the credential.
+ * @param {string} client_id - ID of the client.
+ * @param {string} credential_id - ID of the credential.
* @param {Management.PatchClientCredentialRequestContent} request
- * @param {Credentials.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {CredentialsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -445,23 +411,24 @@ export class Credentials {
* await client.clients.credentials.update("client_id", "credential_id")
*/
public update(
- clientId: string,
- credentialId: string,
+ client_id: string,
+ credential_id: string,
request: Management.PatchClientCredentialRequestContent = {},
- requestOptions?: Credentials.RequestOptions,
+ requestOptions?: CredentialsClient.RequestOptions,
): core.HttpResponsePromise {
- return core.HttpResponsePromise.fromPromise(this.__update(clientId, credentialId, request, requestOptions));
+ return core.HttpResponsePromise.fromPromise(this.__update(client_id, credential_id, request, requestOptions));
}
private async __update(
- clientId: string,
- credentialId: string,
+ client_id: string,
+ credential_id: string,
request: Management.PatchClientCredentialRequestContent = {},
- requestOptions?: Credentials.RequestOptions,
+ requestOptions?: CredentialsClient.RequestOptions,
): Promise> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -469,7 +436,7 @@ export class Credentials {
(await core.Supplier.get(this._options.baseUrl)) ??
(await core.Supplier.get(this._options.environment)) ??
environments.ManagementEnvironment.Default,
- `clients/${core.url.encodePathParam(clientId)}/credentials/${core.url.encodePathParam(credentialId)}`,
+ `clients/${core.url.encodePathParam(client_id)}/credentials/${core.url.encodePathParam(credential_id)}`,
),
method: "PATCH",
headers: _headers,
@@ -481,6 +448,7 @@ export class Credentials {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return {
@@ -510,26 +478,11 @@ export class Credentials {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError(
- "Timeout exceeded when calling PATCH /clients/{client_id}/credentials/{credential_id}.",
- );
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
- }
-
- protected async _getAuthorizationHeader(): Promise {
- return `Bearer ${await core.Supplier.get(this._options.token)}`;
+ return handleNonStatusCodeError(
+ _response.error,
+ _response.rawResponse,
+ "PATCH",
+ "/clients/{client_id}/credentials/{credential_id}",
+ );
}
}
diff --git a/src/management/api/resources/connections/client/Client.ts b/src/management/api/resources/connections/client/Client.ts
index 5891d0c2cf..d49ca14347 100644
--- a/src/management/api/resources/connections/client/Client.ts
+++ b/src/management/api/resources/connections/client/Client.ts
@@ -1,47 +1,49 @@
// This file was auto-generated by Fern from our API Definition.
import type { BaseClientOptions, BaseRequestOptions } from "../../../../BaseClient.js";
+import { type NormalizedClientOptionsWithAuth, normalizeClientOptionsWithAuth } from "../../../../BaseClient.js";
import * as environments from "../../../../environments.js";
import * as core from "../../../../core/index.js";
import * as Management from "../../../index.js";
-import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../core/headers.js";
+import { mergeHeaders } from "../../../../core/headers.js";
import * as errors from "../../../../errors/index.js";
-import { Clients } from "../resources/clients/client/Client.js";
-import { Keys } from "../resources/keys/client/Client.js";
-import { ScimConfiguration } from "../resources/scimConfiguration/client/Client.js";
-import { Users } from "../resources/users/client/Client.js";
+import { handleNonStatusCodeError } from "../../../../errors/handleNonStatusCodeError.js";
+import { ClientsClient } from "../resources/clients/client/Client.js";
+import { KeysClient } from "../resources/keys/client/Client.js";
+import { ScimConfigurationClient } from "../resources/scimConfiguration/client/Client.js";
+import { UsersClient } from "../resources/users/client/Client.js";
-export declare namespace Connections {
+export declare namespace ConnectionsClient {
export interface Options extends BaseClientOptions {}
export interface RequestOptions extends BaseRequestOptions {}
}
-export class Connections {
- protected readonly _options: Connections.Options;
- protected _clients: Clients | undefined;
- protected _keys: Keys | undefined;
- protected _scimConfiguration: ScimConfiguration | undefined;
- protected _users: Users | undefined;
+export class ConnectionsClient {
+ protected readonly _options: NormalizedClientOptionsWithAuth;
+ protected _clients: ClientsClient | undefined;
+ protected _keys: KeysClient | undefined;
+ protected _scimConfiguration: ScimConfigurationClient | undefined;
+ protected _users: UsersClient | undefined;
- constructor(_options: Connections.Options) {
- this._options = _options;
+ constructor(options: ConnectionsClient.Options) {
+ this._options = normalizeClientOptionsWithAuth(options);
}
- public get clients(): Clients {
- return (this._clients ??= new Clients(this._options));
+ public get clients(): ClientsClient {
+ return (this._clients ??= new ClientsClient(this._options));
}
- public get keys(): Keys {
- return (this._keys ??= new Keys(this._options));
+ public get keys(): KeysClient {
+ return (this._keys ??= new KeysClient(this._options));
}
- public get scimConfiguration(): ScimConfiguration {
- return (this._scimConfiguration ??= new ScimConfiguration(this._options));
+ public get scimConfiguration(): ScimConfigurationClient {
+ return (this._scimConfiguration ??= new ScimConfigurationClient(this._options));
}
- public get users(): Users {
- return (this._users ??= new Users(this._options));
+ public get users(): UsersClient {
+ return (this._users ??= new UsersClient(this._options));
}
/**
@@ -66,7 +68,7 @@ export class Connections {
* Note: The first time you call this endpoint using checkpoint pagination, omit the from parameter. If there are more results, a next value is included in the response. You can use this for subsequent API calls. When next is no longer included in the response, no pages are remaining.
*
* @param {Management.ListConnectionsQueryParameters} request
- * @param {Connections.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {ConnectionsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -84,7 +86,7 @@ export class Connections {
*/
public async list(
request: Management.ListConnectionsQueryParameters = {},
- requestOptions?: Connections.RequestOptions,
+ requestOptions?: ConnectionsClient.RequestOptions,
): Promise> {
const list = core.HttpResponsePromise.interceptFunction(
async (
@@ -114,9 +116,10 @@ export class Connections {
if (includeFields !== undefined) {
_queryParams["include_fields"] = includeFields?.toString() ?? null;
}
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -133,6 +136,7 @@ export class Connections {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return {
@@ -167,21 +171,7 @@ export class Connections {
});
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError("Timeout exceeded when calling GET /connections.");
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/connections");
},
);
const dataWithRawResponse = await list(request).withRawResponse();
@@ -204,7 +194,7 @@ export class Connections {
* Creates a new connection according to the JSON object received in body.
*
* @param {Management.CreateConnectionRequestContent} request
- * @param {Connections.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {ConnectionsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -220,18 +210,19 @@ export class Connections {
*/
public create(
request: Management.CreateConnectionRequestContent,
- requestOptions?: Connections.RequestOptions,
+ requestOptions?: ConnectionsClient.RequestOptions,
): core.HttpResponsePromise {
return core.HttpResponsePromise.fromPromise(this.__create(request, requestOptions));
}
private async __create(
request: Management.CreateConnectionRequestContent,
- requestOptions?: Connections.RequestOptions,
+ requestOptions?: ConnectionsClient.RequestOptions,
): Promise> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -251,6 +242,7 @@ export class Connections {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return {
@@ -280,21 +272,7 @@ export class Connections {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError("Timeout exceeded when calling POST /connections.");
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "POST", "/connections");
}
/**
@@ -302,7 +280,7 @@ export class Connections {
*
* @param {string} id - The id of the connection to retrieve
* @param {Management.GetConnectionRequestParameters} request
- * @param {Connections.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {ConnectionsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -319,7 +297,7 @@ export class Connections {
public get(
id: string,
request: Management.GetConnectionRequestParameters = {},
- requestOptions?: Connections.RequestOptions,
+ requestOptions?: ConnectionsClient.RequestOptions,
): core.HttpResponsePromise {
return core.HttpResponsePromise.fromPromise(this.__get(id, request, requestOptions));
}
@@ -327,7 +305,7 @@ export class Connections {
private async __get(
id: string,
request: Management.GetConnectionRequestParameters = {},
- requestOptions?: Connections.RequestOptions,
+ requestOptions?: ConnectionsClient.RequestOptions,
): Promise> {
const { fields, include_fields: includeFields } = request;
const _queryParams: Record = {};
@@ -339,9 +317,10 @@ export class Connections {
_queryParams["include_fields"] = includeFields?.toString() ?? null;
}
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -358,6 +337,7 @@ export class Connections {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return {
@@ -387,28 +367,14 @@ export class Connections {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError("Timeout exceeded when calling GET /connections/{id}.");
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/connections/{id}");
}
/**
* Removes a specific connection from your tenant. This action cannot be undone. Once removed, users can no longer use this connection to authenticate.
*
* @param {string} id - The id of the connection to delete
- * @param {Connections.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {ConnectionsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -418,17 +384,18 @@ export class Connections {
* @example
* await client.connections.delete("id")
*/
- public delete(id: string, requestOptions?: Connections.RequestOptions): core.HttpResponsePromise {
+ public delete(id: string, requestOptions?: ConnectionsClient.RequestOptions): core.HttpResponsePromise {
return core.HttpResponsePromise.fromPromise(this.__delete(id, requestOptions));
}
private async __delete(
id: string,
- requestOptions?: Connections.RequestOptions,
+ requestOptions?: ConnectionsClient.RequestOptions,
): Promise> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
let _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
this._options?.headers,
- mergeOnlyDefinedHeaders({ Authorization: await this._getAuthorizationHeader() }),
requestOptions?.headers,
);
const _response = await (this._options.fetcher ?? core.fetcher)({
@@ -445,6 +412,7 @@ export class Connections {
maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
abortSignal: requestOptions?.abortSignal,
fetchFn: this._options?.fetch,
+ logging: this._options.logging,
});
if (_response.ok) {
return { data: undefined, rawResponse: _response.rawResponse };
@@ -469,21 +437,7 @@ export class Connections {
}
}
- switch (_response.error.reason) {
- case "non-json":
- throw new errors.ManagementError({
- statusCode: _response.error.statusCode,
- body: _response.error.rawBody,
- rawResponse: _response.rawResponse,
- });
- case "timeout":
- throw new errors.ManagementTimeoutError("Timeout exceeded when calling DELETE /connections/{id}.");
- case "unknown":
- throw new errors.ManagementError({
- message: _response.error.errorMessage,
- rawResponse: _response.rawResponse,
- });
- }
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "DELETE", "/connections/{id}");
}
/**
@@ -493,7 +447,7 @@ export class Connections {
*
* @param {string} id - The id of the connection to update
* @param {Management.UpdateConnectionRequestContent} request
- * @param {Connections.RequestOptions} requestOptions - Request-specific configuration.
+ * @param {ConnectionsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link Management.BadRequestError}
* @throws {@link Management.UnauthorizedError}
@@ -508,7 +462,7 @@ export class Connections {
public update(
id: string,
request: Management.UpdateConnectionRequestContent = {},
- requestOptions?: Connections.RequestOptions,
+ requestOptions?: ConnectionsClient.RequestOptions,
): core.HttpResponsePromise