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.

Apply staging access checks to delete workspace and logo upload

Kiran Kc32dbbc5068d
diff --git a/apps/web/ui/workspaces/delete-workspace.tsx b/apps/web/ui/workspaces/delete-workspace.tsx
index 23c2c78dad..678994f44e 100644
--- a/apps/web/ui/workspaces/delete-workspace.tsx
+++ b/apps/web/ui/workspaces/delete-workspace.tsx
@@ -10,19 +10,21 @@ export default function DeleteWorkspace() {
const { setShowDeleteWorkspaceModal, DeleteWorkspaceModal } =
useDeleteWorkspaceModal();
- const { role } = useWorkspace();
+ const { role, environment } = useWorkspace();
- const permissionsError = clientAccessCheck({
+ const { error } = clientAccessCheck({
action: "workspaces.write",
role,
- }).error;
+ environment,
+ stagingBehavior: "blocked",
+ });
return (
<div
className={cn(
"overflow-hidden rounded-xl border border-red-200 bg-white",
{
- "border-neutral-200": permissionsError,
+ "border-neutral-200": error,
},
)}
>
@@ -37,7 +39,7 @@ export default function DeleteWorkspace() {
</div>
<div
className={cn("border-b border-red-200", {
- "border-neutral-200": permissionsError,
+ "border-neutral-200": error,
})}
/>
@@ -47,7 +49,7 @@ export default function DeleteWorkspace() {
text="Delete Workspace"
variant="danger"
onClick={() => setShowDeleteWorkspaceModal(true)}
- disabledTooltip={permissionsError || undefined}
+ disabledTooltip={error}
/>
</div>
</div>
diff --git a/apps/web/ui/workspaces/upload-logo.tsx b/apps/web/ui/workspaces/upload-logo.tsx
index c8fc8a7ff3..284c14b517 100644
--- a/apps/web/ui/workspaces/upload-logo.tsx
+++ b/apps/web/ui/workspaces/upload-logo.tsx
@@ -1,5 +1,6 @@
"use client";
+import { clientAccessCheck } from "@/lib/client-access-check";
import useWorkspace from "@/lib/swr/use-workspace";
import { Button, FileUpload } from "@dub/ui";
import { useEffect, useState } from "react";
@@ -7,15 +8,20 @@ import { toast } from "sonner";
import { mutate } from "swr";
export default function UploadLogo() {
- const { id, logo, isOwner } = useWorkspace();
-
+ const { id, logo, role, isOwner, environment } = useWorkspace();
const [image, setImage] = useState<string | null>();
+ const [uploading, setUploading] = useState(false);
useEffect(() => {
setImage(logo || null);
}, [logo]);
- const [uploading, setUploading] = useState(false);
+ const { error } = clientAccessCheck({
+ action: "workspaces.write",
+ role,
+ environment,
+ stagingBehavior: "live-only",
+ });
return (
<form
@@ -79,11 +85,8 @@ export default function UploadLogo() {
<Button
text="Save changes"
loading={uploading}
- disabled={!isOwner || !image || logo === image}
- {...(!isOwner && {
- disabledTooltip:
- "Only workspace owners can change the workspace logo.",
- })}
+ disabled={!image || logo === image || Boolean(error)}
+ disabledTooltip={error}
/>
</div>
</div>