feat(clerk-js): Hide 'create organization' button in org switcher if …

…no permissions
clerk · Jun 16, 2023 · 3c2c4e3 · 3c2c4e3
1 parent e344851
commit 3c2c4e3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/packages/clerk-js/src/core/resources/User.ts b/packages/clerk-js/src/core/resources/User.ts
@@ -80,6 +80,7 @@ export class User extends BaseResource implements UserResource {
   publicMetadata: UserPublicMetadata = {};
   unsafeMetadata: UserUnsafeMetadata = {};
   lastSignInAt: Date | null = null;
+  createOrganizationEnabled = false;
   updatedAt: Date | null = null;
   createdAt: Date | null = null;
 
@@ -320,7 +321,6 @@ export class User extends BaseResource implements UserResource {
     this.twoFactorEnabled = data.two_factor_enabled;
 
     this.createOrganizationEnabled = data.create_organization_enabled;
-    this.deleteSelfEnabled = data.delete_self_enabled;
 
     if (data.last_sign_in_at) {
       this.lastSignInAt = unixEpochToDate(data.last_sign_in_at);

diff --git a/packages/clerk-js/src/core/resources/UserSettings.ts b/packages/clerk-js/src/core/resources/UserSettings.ts
@@ -17,6 +17,10 @@ import { BaseResource } from './internal';
 const defaultMaxPasswordLength = 72;
 const defaultMinPasswordLength = 8;
 
+export type Actions = {
+  create_organization: boolean;
+};
+
 /**
  * @internal
  */

diff --git a/packages/clerk-js/src/ui/components/OrganizationSwitcher/OtherOrganizationActions.tsx b/packages/clerk-js/src/ui/components/OrganizationSwitcher/OtherOrganizationActions.tsx
@@ -84,7 +84,7 @@ export const OrganizationActionList = (props: OrganizationActionListProps) => {
           </PreviewButton>
         ))}
       </Box>
-      {createOrganizationButton}
+      {user.createOrganizationEnabled && createOrganizationButton}
     </SecondaryActions>
   );
 };
diff --git a/packages/types/src/json.ts b/packages/types/src/json.ts
@@ -214,6 +214,7 @@ export interface UserJSON extends ClerkResourceJSON {
   public_metadata: UserPublicMetadata;
   unsafe_metadata: UserUnsafeMetadata;
   last_sign_in_at: number | null;
+  create_organization_enabled: boolean;
   updated_at: number;
   created_at: number;
 }

diff --git a/packages/types/src/user.ts b/packages/types/src/user.ts
@@ -78,7 +78,6 @@ export interface UserResource extends ClerkResource {
   unsafeMetadata: UserUnsafeMetadata;
   lastSignInAt: Date | null;
   createOrganizationEnabled: boolean;
-  deleteSelfEnabled: boolean;
   updatedAt: Date | null;
   createdAt: Date | null;
 

diff --git a/packages/types/src/userSettings.ts b/packages/types/src/userSettings.ts
@@ -83,14 +83,14 @@ export type Attributes = {
 };
 
 export type Actions = {
-  delete_self: boolean;
   create_organization: boolean;
 };
 
 export interface UserSettingsJSON extends ClerkResourceJSON {
   id: never;
   object: never;
   attributes: AttributesJSON;
+  actions: Actions;
   social: OAuthProviders;
 
   /**