Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Restrict member invites to live and skip staging invite codes

Kiran Ked1579db5d62
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx
index 23219f981b..2b85bd4dd2 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx
@@ -51,7 +51,6 @@ export function WorkspaceMembersClient() {
const { setShowInviteCodeModal, InviteCodeModal } = useInviteCodeModal();
const { role, plan, environment } = useWorkspace();
- const isStaging = environment === WorkspaceEnvironment.staging;
const { data: session } = useSession();
const { id: workspaceId } = useWorkspace();
@@ -91,6 +90,7 @@ export function WorkspaceMembersClient() {
}, [plan]);
const isCurrentUserOwner = role === "owner";
+ const isStaging = environment === WorkspaceEnvironment.staging;
const filters = useMemo(
() => [
@@ -244,6 +244,22 @@ export function WorkspaceMembersClient() {
});
};
+ const { error: inviteNewTeammatesError } = clientAccessCheck({
+ action: "workspaces.write",
+ role,
+ environment,
+ customPermissionDescription: "invite new teammates",
+ stagingBehavior: "live-only",
+ });
+
+ const { error: generateInviteLinksError } = clientAccessCheck({
+ action: "workspaces.write",
+ role,
+ environment,
+ customPermissionDescription: "generate invite links",
+ stagingBehavior: "live-only",
+ });
+
return (
<>
<InviteWorkspaceUserModal />
@@ -261,28 +277,14 @@ export function WorkspaceMembersClient() {
onClick={() => setShowInviteWorkspaceUserModal(true)}
className="h-9 w-fit"
shortcut="M"
- disabledTooltip={
- clientAccessCheck({
- action: "workspaces.write",
- role,
- environment,
- customPermissionDescription: "invite new teammates",
- }).error || undefined
- }
+ disabledTooltip={inviteNewTeammatesError}
/>
<Button
icon={<LinkIcon className="h-4 w-4 text-neutral-800" />}
variant="secondary"
onClick={() => setShowInviteCodeModal(true)}
className="h-9 space-x-0"
- disabledTooltip={
- clientAccessCheck({
- action: "workspaces.write",
- role,
- environment,
- customPermissionDescription: "generate invite links",
- }).error || undefined
- }
+ disabledTooltip={generateInviteLinksError}
/>
</div>
}
@@ -371,10 +373,7 @@ function RoleCell({
role,
});
- const isDisabled =
- isStaging ||
- !isCurrentUserOwner ||
- isCurrentUser;
+ const isDisabled = isStaging || !isCurrentUserOwner || isCurrentUser;
return (
<>
diff --git a/apps/web/lib/sandbox/create-staging-workspace.ts b/apps/web/lib/sandbox/create-staging-workspace.ts
index 91409d74dd..5d98f442df 100644
--- a/apps/web/lib/sandbox/create-staging-workspace.ts
+++ b/apps/web/lib/sandbox/create-staging-workspace.ts
@@ -1,7 +1,7 @@
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import { prisma } from "@dub/prisma";
import { WorkspaceEnvironment } from "@dub/prisma/client";
-import { nanoid, TRIAL_LIMITS } from "@dub/utils";
+import { TRIAL_LIMITS } from "@dub/utils";
import { generateRandomString } from "../api/utils/generate-random-string";
import { createWorkspaceId } from "../api/workspaces/create-workspace-id";
@@ -58,7 +58,6 @@ export async function createStagingWorkspace(workspaceId: string) {
plan: workspace.plan,
billingCycleStart: new Date().getDate(),
invoicePrefix: generateRandomString(8),
- inviteCode: nanoid(24),
usageLimit: TRIAL_LIMITS.clicks,
linksLimit: TRIAL_LIMITS.links,
domainsLimit: TRIAL_LIMITS.domains,