user:${string} \| org:${string} \> | The [feature](/docs/guides/billing/overview) to check for. |
-| `permission?` | `DisallowSystemPermissions`\<`P`\> | The [permission](/docs/guides/organizations/roles-and-permissions) to check for. |
+| `permission?` | `DisallowSystemPermissions`\<`P`\> | The [permission](/docs/guides/organizations/control-access/roles-and-permissions) to check for. |
| `plan?` | `Autocomplete`\< user:${string} \| org:${string} \> | The [plan](/docs/guides/billing/overview) to check for. |
| `reverification?` | [`ReverificationConfig`](reverification-config.mdx) | The reverification configuration to check for. This feature is currently in public beta. **It is not recommended for production use.** |
-| `role?` | `string` | The [role](/docs/guides/organizations/roles-and-permissions) to check for. |
+| `role?` | `string` | The [role](/docs/guides/organizations/control-access/roles-and-permissions) to check for. |
diff --git a/clerk-typedoc/shared/organization-custom-role-key.mdx b/clerk-typedoc/shared/organization-custom-role-key.mdx
index 5a0af4dce8..942f239fca 100644
--- a/clerk-typedoc/shared/organization-custom-role-key.mdx
+++ b/clerk-typedoc/shared/organization-custom-role-key.mdx
@@ -1,3 +1,3 @@
`OrganizationCustomRoleKey` is a type that represents the user's role in an organization. It will be string unless the developer has provided their own types through [`ClerkAuthorization`](/docs/guides/development/override-clerk-types-interfaces#example-custom-roles-and-permissions).
-Clerk provides the [default roles](/docs/guides/organizations/roles-and-permissions#default-roles) `org:admin` and `org:member`. However, you can create [custom roles](/docs/guides/organizations/roles-and-permissions#custom-roles) as well.
+Clerk provides the [default roles](/docs/guides/organizations/control-access/roles-and-permissions#default-roles) `org:admin` and `org:member`. However, you can create [custom roles](/docs/guides/organizations/control-access/roles-and-permissions#custom-roles) as well.
diff --git a/clerk-typedoc/shared/organization-resource.mdx b/clerk-typedoc/shared/organization-resource.mdx
index b5128e2f6a..edbf573c5f 100644
--- a/clerk-typedoc/shared/organization-resource.mdx
+++ b/clerk-typedoc/shared/organization-resource.mdx
@@ -1,6 +1,6 @@
The `Organization` object holds information about an organization, as well as methods for managing it.
-To use these methods, you must have the **Organizations** feature [enabled in your app's settings in the Clerk Dashboard](/docs/guides/organizations/overview#enable-organizations-in-your-application).
+To use these methods, you must have the **Organizations** feature [enabled in your app's settings in the Clerk Dashboard](/docs/guides/organizations/overview).
## Properties
diff --git a/clerk-typedoc/shared/use-organization-params.mdx b/clerk-typedoc/shared/use-organization-params.mdx
index a08d9628b9..25b5c53b0e 100644
--- a/clerk-typedoc/shared/use-organization-params.mdx
+++ b/clerk-typedoc/shared/use-organization-params.mdx
@@ -1,6 +1,6 @@
| Property | Type | Description |
| ----------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `domains?` | true \| \{ initialPage?: number; pageSize?: number; \} & \{ enrollmentMode?: "manual_invitation" \| "automatic_invitation" \| "automatic_suggestion"; \} & \{ infinite?: boolean; keepPreviousData?: boolean; \} | If set to `true`, all default properties will be used.true \| \{ initialPage?: number; pageSize?: number; \} & \{ enrollmentMode?: "manual_invitation" \| "automatic_invitation" \| "automatic_suggestion"; \} & \{ infinite?: boolean; keepPreviousData?: boolean; \} | If set to `true`, all default properties will be used.true \| \{ initialPage?: number; pageSize?: number; \} & \{ status?: ("expired" \| "pending" \| "accepted" \| "revoked")[]; \} & \{ infinite?: boolean; keepPreviousData?: boolean; \} | If set to `true`, all default properties will be used.true \| \{ initialPage?: number; pageSize?: number; \} & \{ status?: "expired" \| "pending" \| "accepted" \| "revoked"; \} & \{ infinite?: boolean; keepPreviousData?: boolean; \} | If set to `true`, all default properties will be used.true \| \{ initialPage?: number; pageSize?: number; \} & \{ query?: string; role?: string[]; \} & \{ infinite?: boolean; keepPreviousData?: boolean; \} | If set to `true`, all default properties will be used.[Pattern](#pattern)\[]
- URL patterns for resources that exist within the context of a user's [Personal Account](/docs/guides/organizations/overview#allow-personal-accounts).
+ URL patterns for resources that exist within the context of a user's [Personal Account](/docs/guides/organizations/configure#allow-personal-accounts).
If the route also matches the `organizationPattern` prop, the `organizationPattern` prop takes precedence.
diff --git a/docs/_tooltips/choose-organization.mdx b/docs/_tooltips/choose-organization.mdx
new file mode 100644
index 0000000000..65b7151b8b
--- /dev/null
+++ b/docs/_tooltips/choose-organization.mdx
@@ -0,0 +1 @@
+This happens because the choose-organization session task must be completed before the user's authentication process can be considered complete. Session tasks are pending requirements that users must complete after authentication. Learn more about [session tasks](/docs/guides/configure/session-tasks).
diff --git a/docs/getting-started/quickstart.expo.mdx b/docs/getting-started/quickstart.expo.mdx
index ca7517323e..6a78fbb326 100644
--- a/docs/getting-started/quickstart.expo.mdx
+++ b/docs/getting-started/quickstart.expo.mdx
@@ -6,23 +6,23 @@ sdk: expo
You must be signed in to access this page.
+ } + + // Check if there is an Active Organization + if (!organization) { + return ( + <> +Set an Active Organization to access this page.
+You must be an admin to access this page.
+ } + + // Check if Organization name matches (e.g., "Acme Corp") + const requiredOrgName = 'Acme Corp' + if (organization.name !== requiredOrgName) { + return ( + <> ++ This page is only accessible in the {requiredOrgName} Organization. + Switch to the {requiredOrgName} Organization to access this page. +
++ You are currently signed in as an admin in the{' '} + {organization.name} Organization. +
+ ) + } + ``` + + For more examples on how to perform authorization checks, see the [dedicated guide](/docs/guides/secure/authorization-checks). +You must be signed in to access this page.
+ } + + // Check if there is an Active Organization + if (!orgId) { + return ( + <> +Set an Active Organization to access this page.
+You must be an admin to access this page.
+ } + + // To fetch the Active Organization server-side, + // first initialize the JS Backend SDK. + // This varies depending on the SDK you're using + // https://clerk.com/docs/js-backend/getting-started/quickstart + // Then use the `clerkClient()` to access the `getOrganization()` method + const client = await clerkClient() + const organization = await client.organizations.getOrganization({ organizationId: orgId }) + + // Check if Organization name matches (e.g., "Acme Corp") + const requiredOrgName = 'Acme Corp' + if (organization.name !== requiredOrgName) { + return ( + <> ++ This page is only accessible in the {requiredOrgName} Organization. + Switch to the {requiredOrgName} Organization to access this page. +
++ You are currently signed in as an admin in the{' '} + {organization.name} Organization. +
+ ) + } + ``` + + For more examples on how to perform authorization checks, see the [dedicated guide](/docs/guides/secure/authorization-checks). ++ Your role in this organization:{' '} + + { + userMemberships?.data?.find( + (membership) => membership.organization.id === organization?.id, + )?.role + } + +
+You must be signed in to access this page.
+ } + + // Check if there is an Active Organization + if (!organization) { + return ( + <> +Set an Active Organization to access this page.
+You must be an admin to access this page.
+ } + + // Check if Organization name matches (e.g., "Acme Corp") + const requiredOrgName = 'Acme Corp' + if (organization.name !== requiredOrgName) { + return ( + <> ++ This page is only accessible in the {requiredOrgName} organization. + Switch to the {requiredOrgName} organization to access this page. +
++ You are currently signed in as an admin in the{' '} + {organization.name} organization. +
+ ) + } + ``` + + Navigate to [`localhost:3000/protected`](localhost:3000/protected). You should see a green message confirming you are an admin in `Acme Corp`. Use the `+ Your role in this organization:{' '} + + {/* Find the organization membership that matches the + currently active organization and return the role */} + { + userMemberships?.data?.find( + (membership) => membership.organization.id === organization?.id, + )?.role + } + +
+Set an active organization to access this page.
+Hello {organization.name}
+ } + ``` +You must be signed in to access this page.
+ } + + // Check if there is an active organization + if (!organization) { + return ( + <> +Set an active organization to access this page.
+You must be an admin to access this page.
+ } + + // Check if organization name matches (e.g., "Acme Corp") + const requiredOrgName = 'Acme Corp' + if (organization.name !== requiredOrgName) { + return ( + <> ++ This page is only accessible in the {requiredOrgName} organization. + Switch to the {requiredOrgName} organization to access this page. +
++ You are currently signed in as an admin in the{' '} + {organization.name} organization. +
+ ) + } + ``` + + For more examples on how to perform authorization checks, see the [dedicated guide](/docs/guides/secure/authorization-checks). +You must be signed in to access this page.
+ } + + // Check if there is an active organization + if (!orgId) { + return ( + <> +Set an active organization to access this page.
+You must be an admin to access this page.
+ } + + // To fetch the active organization server-side, + // first initialize the JS Backend SDK. + // This varies depending on the SDK you're using + // https://clerk.com/docs/js-backend/getting-started/quickstart + // Then use the `clerkClient()` to access the `getOrganization()` method + const client = await clerkClient() + const organization = await client.organizations.getOrganization({ organizationId: orgId }) + + // Check if organization name matches (e.g., "Acme Corp") + const requiredOrgName = 'Acme Corp' + if (organization.name !== requiredOrgName) { + return ( + <> ++ This page is only accessible in the {requiredOrgName} organization. + Switch to the {requiredOrgName} organization to access this page. +
++ You are currently signed in as an admin in the{' '} + {organization.name} organization. +
+ ) + } + ``` + + For more examples on how to perform authorization checks, see the [dedicated guide](/docs/guides/secure/authorization-checks). +Sorry, organization {slug} is not valid.
+Sorry, Organization {slug} is not valid.
Sorry, organization {slug} is not valid.
+Sorry, Organization {slug} is not valid.
Sorry, organization {params.slug} is not valid.
+Sorry, Organization {params.slug} is not valid.
((org: [Organization][org-ref]) => string) | string
- The full URL or path to navigate to after selecting the [Personal Account](/docs/guides/organizations/overview#allow-personal-accounts). Defaults to `undefined`.
+ The full URL or path to navigate to after selecting the [Personal Account](/docs/guides/organizations/configure#allow-personal-accounts). Defaults to `undefined`.
---
@@ -308,7 +308,7 @@ The `