mirror of
https://github.com/willchen96/mike.git
synced 2026-06-10 20:35:12 +02:00
feat: enhance workflow sharing by preventing users from sharing with themselves and normalizing email inputs
This commit is contained in:
parent
a2368a7479
commit
08d996781a
2 changed files with 32 additions and 4 deletions
|
|
@ -370,10 +370,27 @@ workflowsRouter.delete("/:workflowId/shares/:shareId", requireAuth, asyncRoute(a
|
|||
// POST /workflows/:workflowId/share
|
||||
workflowsRouter.post("/:workflowId/share", requireAuth, asyncRoute(async (req, res) => {
|
||||
const userId = res.locals.userId as string;
|
||||
const userEmail = res.locals.userEmail as string | undefined;
|
||||
const { workflowId } = req.params;
|
||||
const { emails, allow_edit } = req.body as { emails: string[]; allow_edit: boolean };
|
||||
|
||||
if (!emails?.length) return void res.status(400).json({ detail: "emails is required" });
|
||||
const normalizedEmails = [
|
||||
...new Set(
|
||||
emails
|
||||
.map((email) => email.trim().toLowerCase())
|
||||
.filter(Boolean),
|
||||
),
|
||||
];
|
||||
if (normalizedEmails.length === 0) {
|
||||
return void res.status(400).json({ detail: "emails is required" });
|
||||
}
|
||||
const normalizedUserEmail = userEmail?.trim().toLowerCase();
|
||||
if (normalizedUserEmail && normalizedEmails.includes(normalizedUserEmail)) {
|
||||
return void res
|
||||
.status(400)
|
||||
.json({ detail: "You cannot share a workflow with yourself." });
|
||||
}
|
||||
|
||||
const db = createServerSupabase();
|
||||
// Verify ownership
|
||||
|
|
@ -386,10 +403,10 @@ workflowsRouter.post("/:workflowId/share", requireAuth, asyncRoute(async (req, r
|
|||
.single();
|
||||
if (!wf) return void res.status(404).json({ detail: "Workflow not found or not editable" });
|
||||
|
||||
const rows = emails.map((email: string) => ({
|
||||
const rows = normalizedEmails.map((email: string) => ({
|
||||
workflow_id: workflowId,
|
||||
shared_by_user_id: userId,
|
||||
shared_with_email: email.trim().toLowerCase(),
|
||||
shared_with_email: email,
|
||||
allow_edit: allow_edit ?? false,
|
||||
}));
|
||||
// Upsert on (workflow_id, shared_with_email) so re-sharing to the same
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import {
|
|||
listWorkflowShares,
|
||||
shareWorkflow,
|
||||
} from "@/app/lib/mikeApi";
|
||||
import { useAuth } from "@/contexts/AuthContext";
|
||||
import { EmailPillInput } from "../shared/EmailPillInput";
|
||||
|
||||
interface Share {
|
||||
|
|
@ -33,6 +34,8 @@ export function ShareWorkflowModal({
|
|||
const [existingShares, setExistingShares] = useState<Share[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [saving, setSaving] = useState(false);
|
||||
const { user } = useAuth();
|
||||
const ownEmail = user?.email?.trim().toLowerCase() ?? null;
|
||||
|
||||
useEffect(() => {
|
||||
listWorkflowShares(workflowId)
|
||||
|
|
@ -47,10 +50,13 @@ export function ShareWorkflowModal({
|
|||
}
|
||||
|
||||
async function handleConfirm() {
|
||||
if (pendingEmails.length === 0) return;
|
||||
const emails = ownEmail
|
||||
? pendingEmails.filter((email) => email !== ownEmail)
|
||||
: pendingEmails;
|
||||
if (emails.length === 0) return;
|
||||
setSaving(true);
|
||||
try {
|
||||
await shareWorkflow(workflowId, { emails: pendingEmails, allow_edit: allowEdit });
|
||||
await shareWorkflow(workflowId, { emails, allow_edit: allowEdit });
|
||||
const updated = await listWorkflowShares(workflowId);
|
||||
setExistingShares(updated);
|
||||
setPendingEmails([]);
|
||||
|
|
@ -84,6 +90,11 @@ export function ShareWorkflowModal({
|
|||
<EmailPillInput
|
||||
emails={pendingEmails}
|
||||
onChange={setPendingEmails}
|
||||
validate={async (email) =>
|
||||
ownEmail && email === ownEmail
|
||||
? "You cannot share a workflow with yourself."
|
||||
: null
|
||||
}
|
||||
placeholder="Add people by email…"
|
||||
autoFocus
|
||||
/>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue