Merge branch 'main' into elef/sdk-1574-joining-an-organization-does-n…

…ot-update-the-organization
clerk · Apr 3, 2024 · d0f8df5 · d0f8df5
2 parents 51af601 + d22e616
commit d0f8df5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/.changeset/famous-plums-fold.md b/.changeset/famous-plums-fold.md
@@ -0,0 +1,6 @@
+---
+'@clerk/clerk-js': minor
+'@clerk/types': minor
+---
+
+Deprecate `supported_identifiers` and remove `supported_external_accounts`.
diff --git a/.changeset/slow-taxis-poke.md b/.changeset/slow-taxis-poke.md
@@ -0,0 +1,5 @@
+---
+'@clerk/backend': major
+---
+
+Rename property `members_count` to `membersCount` for `Organization` resource
diff --git a/packages/backend/src/api/resources/Organization.ts b/packages/backend/src/api/resources/Organization.ts
@@ -14,7 +14,7 @@ export class Organization {
     readonly privateMetadata: OrganizationPrivateMetadata = {},
     readonly maxAllowedMemberships: number,
     readonly adminDeleteEnabled: boolean,
-    readonly members_count?: number,
+    readonly membersCount?: number,
   ) {}
 
   static fromJSON(data: OrganizationJSON): Organization {

diff --git a/packages/clerk-js/src/core/test/fixtures.ts b/packages/clerk-js/src/core/test/fixtures.ts
@@ -204,9 +204,7 @@ export const createSignIn = (signInParams: Partial<SignInJSON> = {}, user: Parti
     identifier: signInParams.identifier,
     object: 'sign_in',
     second_factor_verification: signInParams.second_factor_verification,
-    supported_external_accounts: signInParams.supported_external_accounts,
     supported_first_factors: signInParams.supported_first_factors,
-    supported_identifiers: signInParams.supported_identifiers,
     supported_second_factors: signInParams.supported_second_factors,
     user_data: {
       first_name: user.first_name,
@@ -235,7 +233,6 @@ export const createSignUp = (signUpParams: Partial<SignUpJSON> = {}) => {
     optional_fields: signUpParams.optional_fields,
     phone_number: signUpParams.phone_number,
     required_fields: signUpParams.required_fields,
-    supported_external_accounts: signUpParams.supported_external_accounts,
     unsafe_metadata: signUpParams.unsafe_metadata,
     unverified_fields: signUpParams.unverified_fields,
     username: signUpParams.username,

diff --git a/packages/types/src/json.ts b/packages/types/src/json.ts
@@ -14,7 +14,6 @@ import type { SamlIdpSlug } from './saml';
 import type { SessionStatus } from './session';
 import type { SignInFirstFactor, SignInJSON, SignInSecondFactor } from './signIn';
 import type { SignUpField, SignUpIdentificationField, SignUpStatus } from './signUp';
-import type { OAuthStrategy } from './strategies';
 import type { BoxShadow, Color, EmUnit, FontWeight, HexColor } from './theme';
 import type { UserSettingsJSON } from './userSettings';
 import type { CamelToSnake } from './utils';
@@ -80,7 +79,6 @@ export interface SignUpJSON extends ClerkResourceJSON {
   optional_fields: SignUpField[];
   missing_fields: SignUpField[];
   unverified_fields: SignUpIdentificationField[];
-  supported_external_accounts: OAuthStrategy[];
   username: string | null;
   first_name: string | null;
   last_name: string | null;

diff --git a/packages/types/src/signIn.ts b/packages/types/src/signIn.ts
@@ -63,6 +63,9 @@ import type { AuthenticateWithWeb3Params } from './web3Wallet';
 
 export interface SignInResource extends ClerkResource {
   status: SignInStatus | null;
+  /**
+   * @deprecated This attribute will be removed in the next major version
+   */
   supportedIdentifiers: SignInIdentifier[];
   supportedFirstFactors: SignInFirstFactor[];
   supportedSecondFactors: SignInSecondFactor[];
@@ -227,8 +230,10 @@ export interface SignInJSON extends ClerkResourceJSON {
   object: 'sign_in';
   id: string;
   status: SignInStatus;
+  /**
+   * @deprecated This attribute will be removed in the next major version
+   */
   supported_identifiers: SignInIdentifier[];
-  supported_external_accounts: OAuthStrategy[];
   identifier: string;
   user_data: UserDataJSON;
   supported_first_factors: SignInFirstFactorJSON[];