diff --git a/api.md b/api.md
index b1683150ae..1b2e6d9b31 100644
--- a/api.md
+++ b/api.md
@@ -10,6 +10,7 @@ Types:
- PaginationInfo
- ResponseInfo
- Result
+- User
# Accounts
@@ -30,7 +31,6 @@ Methods:
Types:
-- Member
- MemberRole
- MemberWithInviteCode
- MemberListResponse
@@ -39,10 +39,10 @@ Types:
Methods:
- client.accounts.members.create({ ...params }) -> MemberWithInviteCode
-- client.accounts.members.update(memberId, { ...params }) -> Member
+- client.accounts.members.update(memberId, { ...params }) -> User
- client.accounts.members.list({ ...params }) -> MemberListResponsesV4PagePaginationArray
- client.accounts.members.delete(memberId, { ...params }) -> MemberDeleteResponse | null
-- client.accounts.members.get(memberId, { ...params }) -> Member
+- client.accounts.members.get(memberId, { ...params }) -> User
## Roles
diff --git a/src/index.ts b/src/index.ts
index 7228dad9c7..88bd5e996f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -557,6 +557,7 @@ export namespace Cloudflare {
export import PaginationInfo = API.PaginationInfo;
export import ResponseInfo = API.ResponseInfo;
export import Result = API.Result;
+ export import User = API.User;
}
export default Cloudflare;
diff --git a/src/resources/accounts/accounts.ts b/src/resources/accounts/accounts.ts
index e5c6182fea..a5e13435b7 100644
--- a/src/resources/accounts/accounts.ts
+++ b/src/resources/accounts/accounts.ts
@@ -192,7 +192,6 @@ export interface AccountGetParams {
export namespace Accounts {
export import Members = MembersAPI.Members;
- export import Member = MembersAPI.Member;
export import MemberRole = MembersAPI.MemberRole;
export import MemberWithInviteCode = MembersAPI.MemberWithInviteCode;
export import MemberListResponse = MembersAPI.MemberListResponse;
diff --git a/src/resources/accounts/index.ts b/src/resources/accounts/index.ts
index 386a614b6c..93723942e6 100644
--- a/src/resources/accounts/index.ts
+++ b/src/resources/accounts/index.ts
@@ -2,7 +2,6 @@
export { Accounts } from './accounts';
export {
- Member,
MemberRole,
MemberWithInviteCode,
MemberListResponse,
diff --git a/src/resources/accounts/members.ts b/src/resources/accounts/members.ts
index eee2e3a042..843abe7166 100644
--- a/src/resources/accounts/members.ts
+++ b/src/resources/accounts/members.ts
@@ -3,6 +3,7 @@
import * as Core from 'cloudflare/core';
import { APIResource } from 'cloudflare/resource';
import * as MembersAPI from 'cloudflare/resources/accounts/members';
+import * as Shared from 'cloudflare/resources/shared';
import * as RolesAPI from 'cloudflare/resources/accounts/roles';
import * as PermissionGroupsAPI from 'cloudflare/resources/user/tokens/permission-groups';
import { V4PagePaginationArray, type V4PagePaginationArrayParams } from 'cloudflare/pagination';
@@ -27,13 +28,13 @@ export class Members extends APIResource {
memberId: string,
params: MemberUpdateParams,
options?: Core.RequestOptions,
- ): Core.APIPromise {
+ ): Core.APIPromise {
const { account_id, ...body } = params;
return (
this._client.put(`/accounts/${account_id}/members/${memberId}`, {
body,
...options,
- }) as Core.APIPromise<{ result: Member }>
+ }) as Core.APIPromise<{ result: Shared.User }>
)._thenUnwrap((obj) => obj.result);
}
@@ -72,11 +73,15 @@ export class Members extends APIResource {
/**
* Get information about a specific member of an account.
*/
- get(memberId: string, params: MemberGetParams, options?: Core.RequestOptions): Core.APIPromise {
+ get(
+ memberId: string,
+ params: MemberGetParams,
+ options?: Core.RequestOptions,
+ ): Core.APIPromise {
const { account_id } = params;
return (
this._client.get(`/accounts/${account_id}/members/${memberId}`, options) as Core.APIPromise<{
- result: Member;
+ result: Shared.User;
}>
)._thenUnwrap((obj) => obj.result);
}
@@ -84,52 +89,6 @@ export class Members extends APIResource {
export class MemberListResponsesV4PagePaginationArray extends V4PagePaginationArray {}
-export interface Member {
- /**
- * Membership identifier tag.
- */
- id: string;
-
- /**
- * Roles assigned to this member.
- */
- roles: Array;
-
- status: unknown;
-
- user: Member.User;
-}
-
-export namespace Member {
- export interface User {
- /**
- * The contact email address of the user.
- */
- email: string;
-
- /**
- * Identifier
- */
- id?: string;
-
- /**
- * User's first name
- */
- first_name?: string | null;
-
- /**
- * User's last name
- */
- last_name?: string | null;
-
- /**
- * Indicates whether two-factor authentication is enabled for the user account.
- * Does not apply to API authentication.
- */
- two_factor_authentication_enabled?: boolean;
- }
-}
-
export interface MemberRole {
/**
* Role identifier tag.
@@ -359,7 +318,6 @@ export interface MemberGetParams {
}
export namespace Members {
- export import Member = MembersAPI.Member;
export import MemberRole = MembersAPI.MemberRole;
export import MemberWithInviteCode = MembersAPI.MemberWithInviteCode;
export import MemberListResponse = MembersAPI.MemberListResponse;
diff --git a/src/resources/shared.ts b/src/resources/shared.ts
index 5e5ee7452c..7c8fa29e8b 100644
--- a/src/resources/shared.ts
+++ b/src/resources/shared.ts
@@ -1,6 +1,7 @@
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
import * as Shared from 'cloudflare/resources/shared';
+import * as MembersAPI from 'cloudflare/resources/accounts/members';
import { V4PagePaginationArray } from 'cloudflare/pagination';
export interface AuditLog {
@@ -296,4 +297,50 @@ export namespace Result {
}
}
+export interface User {
+ /**
+ * Membership identifier tag.
+ */
+ id: string;
+
+ /**
+ * Roles assigned to this member.
+ */
+ roles: Array;
+
+ status: unknown;
+
+ user: User.User;
+}
+
+export namespace User {
+ export interface User {
+ /**
+ * The contact email address of the user.
+ */
+ email: string;
+
+ /**
+ * Identifier
+ */
+ id?: string;
+
+ /**
+ * User's first name
+ */
+ first_name?: string | null;
+
+ /**
+ * User's last name
+ */
+ last_name?: string | null;
+
+ /**
+ * Indicates whether two-factor authentication is enabled for the user account.
+ * Does not apply to API authentication.
+ */
+ two_factor_authentication_enabled?: boolean;
+ }
+}
+
export class AuditLogsV4PagePaginationArray extends V4PagePaginationArray {}