From 9cd76350b15f6a4eb37b5e306cccab95a6588d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ebubekir=20Y=C4=B1lmaz?= Date: Thu, 19 Nov 2026 15:40:52 +0300 Subject: [PATCH 1/6] Add canConnectNodes helper to validate manual execution-edge connections --- dashboard/src/components/BlueprintFlow/helper.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dashboard/src/components/BlueprintFlow/helper.ts b/dashboard/src/components/BlueprintFlow/helper.ts index e1136ea1..4557577f 100644 --- a/dashboard/src/components/BlueprintFlow/helper.ts +++ b/dashboard/src/components/BlueprintFlow/helper.ts @@ -201,6 +201,19 @@ export function getAncestorNodes( .filter((node): node is DefinitionGraphNode => Boolean(node)); } +export function canConnectNodes( + graph: DefinitionGraph, + sourceNodeId: string, + targetNodeId: string +): boolean { + if (sourceNodeId === targetNodeId) return false; + const targetNode = graph.nodes[targetNodeId]; + if (!targetNode || targetNode.nodeType === "START") return false; + const ancestorsOfSource = getAncestorNodes(graph, sourceNodeId); + if (ancestorsOfSource.some((n) => n.id === targetNodeId)) return false; + return true; +} + const BY_NODE_REF_PATTERN = /^byNode\.([^.]+)\.result(?:\.(.+))?$/; export function isRefValue(value: unknown): value is { $ref: string } { From a662e8bee1318c58154c86f70a6c1177f0bfcf1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ebubekir=20Y=C4=B1lmaz?= Date: Thu, 19 Nov 2026 15:41:16 +0300 Subject: [PATCH 2/6] Extend NodeConnectionOverlay to support node-level edge dragging --- api/src/lib/twoFactorToken.ts | 48 ++++++++ api/src/models/TwoFactorChallenge.ts | 32 ++++++ .../BlueprintFlow/BlueprintFlow.types.ts | 1 + .../BlueprintFlow/NodeConnectionOverlay.tsx | 103 +++++++++++++++--- 4 files changed, 166 insertions(+), 18 deletions(-) create mode 100644 api/src/lib/twoFactorToken.ts create mode 100644 api/src/models/TwoFactorChallenge.ts diff --git a/api/src/lib/twoFactorToken.ts b/api/src/lib/twoFactorToken.ts new file mode 100644 index 00000000..bd660568 --- /dev/null +++ b/api/src/lib/twoFactorToken.ts @@ -0,0 +1,48 @@ +import { createHash, randomBytes, timingSafeEqual } from "node:crypto"; + +export function createToken() { + return randomBytes(32).toString("hex"); +} +export function hashToken(token: string) { + return createHash("sha256").update(token).digest("hex"); +} +export function matchesToken(token: string, hash: string) { + return ( + /^[a-f0-9]{64}$/.test(token) && + /^[a-f0-9]{64}$/.test(hash) && + timingSafeEqual( + Buffer.from(hashToken(token), "hex"), + Buffer.from(hash, "hex"), + ) + ); +} +export function approvalLinks( + base: string | undefined, + sessionId: string, + stepId: string, + token: string, +) { + if (!base) + throw new Error( + "TWO_FACTOR_PUBLIC_URL is required for email approval links", + ); + const url = new URL( + `${base.replace(/\/$/, "")}/sessions/${encodeURIComponent( + sessionId, + )}/two-factor/email`, + ); + if ( + url.protocol !== "https:" && + !( + url.protocol === "http:" && + ["localhost", "127.0.0.1"].includes(url.hostname) + ) + ) + throw new Error("TWO_FACTOR_PUBLIC_URL must use HTTPS"); + url.searchParams.set("stepId", stepId); + url.searchParams.set("token", token); + url.searchParams.set("decision", "APPROVED"); + const approve = url.toString(); + url.searchParams.set("decision", "REJECTED"); + return { approve, reject: url.toString() }; +} diff --git a/api/src/models/TwoFactorChallenge.ts b/api/src/models/TwoFactorChallenge.ts new file mode 100644 index 00000000..b151ea67 --- /dev/null +++ b/api/src/models/TwoFactorChallenge.ts @@ -0,0 +1,32 @@ +import { + Table, + Column, + Model, + DataType, + PrimaryKey, + AllowNull, +} from "@canmingir/link-express/sequelize"; + +@Table({ + tableName: "TwoFactorChallenge", + timestamps: false, + underscored: true, +}) +class TwoFactorChallenge extends Model { + @PrimaryKey + @Column(DataType.UUID) + declare stepId: string; + + @AllowNull(false) + @Column(DataType.STRING) + declare tokenHash: string; + + @AllowNull(false) + @Column(DataType.DATE) + declare expiresAt: Date; + + @AllowNull(false) + @Column(DataType.BOOLEAN) + declare consumed: boolean; +} +export default TwoFactorChallenge; diff --git a/dashboard/src/components/BlueprintFlow/BlueprintFlow.types.ts b/dashboard/src/components/BlueprintFlow/BlueprintFlow.types.ts index f5688eb3..05d12cb7 100644 --- a/dashboard/src/components/BlueprintFlow/BlueprintFlow.types.ts +++ b/dashboard/src/components/BlueprintFlow/BlueprintFlow.types.ts @@ -37,6 +37,7 @@ export interface BlueprintFlowProps { showConnections?: boolean; onConnectParameter?: (binding: ParameterBinding) => void; onDisconnectParameter?: (targetNodeId: string, targetField: string) => void; + onConnectNode?: (sourceNodeId: string, targetNodeId: string) => void; onOverrideParameter?: (nodeId: string, field: string, value: unknown) => void; onToggleForceNode?: (node: { id: string }) => void; liteMode?: boolean; diff --git a/dashboard/src/components/BlueprintFlow/NodeConnectionOverlay.tsx b/dashboard/src/components/BlueprintFlow/NodeConnectionOverlay.tsx index 3bda23d2..6f112af5 100644 --- a/dashboard/src/components/BlueprintFlow/NodeConnectionOverlay.tsx +++ b/dashboard/src/components/BlueprintFlow/NodeConnectionOverlay.tsx @@ -17,6 +17,10 @@ export interface DragState { sourceField: string; } +export interface NodeDragState { + sourceNodeId: string; +} + interface PathInfo { id: string; d: string; @@ -83,15 +87,21 @@ export default function NodeConnectionOverlay({ containerRef, graphData, dragging, + nodeDragging, onDragEnd, + onNodeDragEnd, onConnect, + onConnectNode, onDisconnect, }: { containerRef: React.RefObject; graphData: DefinitionGraph; dragging: DragState | null; + nodeDragging?: NodeDragState | null; onDragEnd: () => void; + onNodeDragEnd?: () => void; onConnect: (binding: ParameterBinding) => void; + onConnectNode?: (sourceNodeId: string, targetNodeId: string) => void; onDisconnect: (targetNodeId: string, targetField: string) => void; }) { const theme = useTheme(); @@ -185,13 +195,44 @@ export default function NodeConnectionOverlay({ } } + if (nodeDragging && mousePosRef.current) { + const sourceNodeEl = container.querySelector( + `[data-node-id="${nodeDragging.sourceNodeId}"]` + ); + if (sourceNodeEl) { + const s = sourceAnchor( + sourceNodeEl.getBoundingClientRect(), + containerRect + ); + nextPaths.push({ + id: "__node_dragging__", + d: bezierPath( + s.x, + s.y, + mousePosRef.current.x - containerRect.left, + mousePosRef.current.y - containerRect.top + ), + targetNodeId: "", + targetField: "", + temp: true, + }); + } + } + setPaths(nextPaths); rafRef.current = requestAnimationFrame(tick); }; rafRef.current = requestAnimationFrame(tick); return () => cancelAnimationFrame(rafRef.current); - }, [containerRef, graphData, bindings, dragging, directParents]); + }, [ + containerRef, + graphData, + bindings, + dragging, + nodeDragging, + directParents, + ]); useEffect(() => { const container = containerRef.current; @@ -228,31 +269,50 @@ export default function NodeConnectionOverlay({ }, [containerRef]); useEffect(() => { - if (!dragging) return; + if (!dragging && !nodeDragging) return; const handleMouseMove = (e: MouseEvent) => { mousePosRef.current = { x: e.clientX, y: e.clientY }; }; const handleMouseUp = (e: MouseEvent) => { - const dropped = ( - document.elementFromPoint(e.clientX, e.clientY) as HTMLElement | null - )?.closest("[data-in-bindable]") as HTMLElement | null; - - if (dropped) { - const { nodeId, field } = dropped.dataset; - if (nodeId && field && nodeId !== dragging.sourceNodeId) { - onConnect({ - sourceNodeId: dragging.sourceNodeId, - sourceField: dragging.sourceField, - targetNodeId: nodeId, - targetField: field, - }); + if (dragging) { + const dropped = ( + document.elementFromPoint(e.clientX, e.clientY) as HTMLElement | null + )?.closest("[data-in-bindable]") as HTMLElement | null; + + if (dropped) { + const { nodeId, field } = dropped.dataset; + if (nodeId && field && nodeId !== dragging.sourceNodeId) { + onConnect({ + sourceNodeId: dragging.sourceNodeId, + sourceField: dragging.sourceField, + targetNodeId: nodeId, + targetField: field, + }); + } } + + mousePosRef.current = null; + onDragEnd(); + return; } - mousePosRef.current = null; - onDragEnd(); + if (nodeDragging) { + const dropped = ( + document.elementFromPoint(e.clientX, e.clientY) as HTMLElement | null + )?.closest("[data-node-connect-target]") as HTMLElement | null; + + if (dropped) { + const targetNodeId = dropped.dataset.nodeConnectTarget; + if (targetNodeId && targetNodeId !== nodeDragging.sourceNodeId) { + onConnectNode?.(nodeDragging.sourceNodeId, targetNodeId); + } + } + + mousePosRef.current = null; + onNodeDragEnd?.(); + } }; window.addEventListener("mousemove", handleMouseMove); @@ -261,7 +321,14 @@ export default function NodeConnectionOverlay({ window.removeEventListener("mousemove", handleMouseMove); window.removeEventListener("mouseup", handleMouseUp); }; - }, [dragging, onConnect, onDragEnd]); + }, [ + dragging, + nodeDragging, + onConnect, + onConnectNode, + onDragEnd, + onNodeDragEnd, + ]); return ( Date: Thu, 19 Nov 2026 15:41:41 +0300 Subject: [PATCH 3/6] Wire up manual drag-to-connect handle for Blueprint flow nodes --- .../BlueprintFlow/BlueprintFlow.tsx | 19 ++++++++++-- .../BlueprintFlowPlugin.styles.tsx | 22 +++++++++++++ .../BlueprintFlow/FlowNodeRenderer.tsx | 19 ++++++++++++ .../BlueprintFlowWidget.tsx | 31 +++++++++++++++++++ 4 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dashboard/src/components/BlueprintFlow/BlueprintFlow.tsx b/dashboard/src/components/BlueprintFlow/BlueprintFlow.tsx index 1fa34dbd..18add501 100644 --- a/dashboard/src/components/BlueprintFlow/BlueprintFlow.tsx +++ b/dashboard/src/components/BlueprintFlow/BlueprintFlow.tsx @@ -15,7 +15,10 @@ import { toInputProperty, } from "../ApiNode/apiNodes"; import { Flow, FlowMiniMap } from "@canmingir/link/platform/components"; -import NodeConnectionOverlay, { type DragState } from "./NodeConnectionOverlay"; +import NodeConnectionOverlay, { + type DragState, + type NodeDragState, +} from "./NodeConnectionOverlay"; import { useCallback, useEffect, useMemo, useRef, useState } from "react"; type FlowHandle = { @@ -53,6 +56,7 @@ export default function BlueprintFlow({ showConnections = false, onConnectParameter, onDisconnectParameter, + onConnectNode, onOverrideParameter, onToggleForceNode, liteMode = false, @@ -61,6 +65,7 @@ export default function BlueprintFlow({ const flowContainerRef = useRef(null); const flowRef = useRef(null); const [dragging, setDragging] = useState(null); + const [nodeDragging, setNodeDragging] = useState(null); const allIntegrations = useAllIntegrations(); useEffect(() => { @@ -323,17 +328,25 @@ export default function BlueprintFlow({ setDragging({ sourceNodeId: nodeId, sourceField: field }), onToggleForce: readOnly ? undefined : onToggleForceNode, onOverrideParameter: readOnly ? undefined : onOverrideParameter, + onNodeHandleDragStart: readOnly + ? undefined + : (nodeId: string) => setNodeDragging({ sourceNodeId: nodeId }), liteMode, })} /> - {!readOnly && showConnections && ( + {!readOnly && ( setDragging(null)} + onNodeDragEnd={() => setNodeDragging(null)} onConnect={(binding) => onConnectParameter?.(binding)} + onConnectNode={(sourceId, targetId) => + onConnectNode?.(sourceId, targetId) + } onDisconnect={(targetNodeId, targetField) => onDisconnectParameter?.(targetNodeId, targetField) } diff --git a/dashboard/src/components/BlueprintFlow/BlueprintFlowPlugin.styles.tsx b/dashboard/src/components/BlueprintFlow/BlueprintFlowPlugin.styles.tsx index 38327a59..7b8170b8 100644 --- a/dashboard/src/components/BlueprintFlow/BlueprintFlowPlugin.styles.tsx +++ b/dashboard/src/components/BlueprintFlow/BlueprintFlowPlugin.styles.tsx @@ -555,5 +555,27 @@ export const NodeWrapper = styled("div", { "perspective(1500px) rotateX(0deg) rotateY(-10deg) rotateZ(0deg)", boxShadow: steppedShadow, }, + "&:hover .node-connect-handle": { + opacity: 1, + }, }; }); + +export const NodeConnectHandle = styled("div")(({ theme }) => ({ + position: "absolute", + top: "50%", + right: "-10px", + transform: "translateY(-50%)", + width: "16px", + height: "16px", + borderRadius: "50%", + backgroundColor: theme.palette?.background.paper, + border: `2px solid ${theme.palette.text.secondary}`, + cursor: "crosshair", + zIndex: 11, + opacity: 0, + transition: "opacity 0.15s ease, transform 0.15s ease", + "&:hover": { + transform: "translateY(-50%) scale(1.25)", + }, +})); diff --git a/dashboard/src/components/BlueprintFlow/FlowNodeRenderer.tsx b/dashboard/src/components/BlueprintFlow/FlowNodeRenderer.tsx index 10e93b87..24f42241 100644 --- a/dashboard/src/components/BlueprintFlow/FlowNodeRenderer.tsx +++ b/dashboard/src/components/BlueprintFlow/FlowNodeRenderer.tsx @@ -8,6 +8,7 @@ import { ForceBadge, ForceIndicatorWrapper, HighlightOverlay, + NodeConnectHandle, NodeWrapper, PinnedBadge, StatusBadge, @@ -176,6 +177,7 @@ export default function FlowNodeRenderer({ field: string, value: unknown ) => void; + onNodeHandleDragStart?: (nodeId: string, e: React.PointerEvent) => void; liteMode?: boolean; [key: string]: unknown; }; @@ -193,6 +195,7 @@ export default function FlowNodeRenderer({ onHandleDragStart, onToggleForce, onOverrideParameter, + onNodeHandleDragStart, liteMode, } = nodeStyle || {}; const isLocked = isApiNode(node); @@ -285,8 +288,24 @@ export default function FlowNodeRenderer({ title={isForceNode ? "Force node: action is guaranteed" : undefined} onContextMenu={handleContextMenu} onMouseDownCapture={handleMouseDownCapture} + {...(node.nodeType !== "START" + ? { "data-node-connect-target": node.id } + : {})} > {isPinned && Pinned} + {!isLocked && !isReadOnly && node.nodeType === "NORMAL" && ( + { + e.stopPropagation(); + e.preventDefault(); + onNodeHandleDragStart?.(node.id, e); + }} + /> + )} {isForceNode && isReadOnly && ( { + setGraphData((prev) => { + if (!prev) return prev; + const sourceNode = prev.nodes[sourceNodeId]; + const targetNode = prev.nodes[targetNodeId]; + if (!sourceNode || !targetNode) return prev; + if (sourceNode.nodeType !== "NORMAL") return prev; + if (!canConnectNodes(prev, sourceNodeId, targetNodeId)) return prev; + + const existingNextIds = nextIdsOf(sourceNode); + if (existingNextIds.includes(targetNodeId)) return prev; + + const newNextIds = [...existingNextIds, targetNodeId]; + const currentNodes = { ...prev.nodes }; + currentNodes[sourceNodeId] = { + ...sourceNode, + next: newNextIds.length === 1 ? newNextIds[0] : newNextIds, + raw: { ...sourceNode.raw, next: newNextIds }, + }; + + const newRoots = prev.roots.includes(targetNodeId) + ? prev.roots.filter((id) => id !== targetNodeId) + : prev.roots; + + return { ...prev, nodes: currentNodes, roots: newRoots }; + }); + setHasLocalChanges(true); + }; + const handleConnectParameter = ({ sourceNodeId, sourceField, @@ -2140,6 +2170,7 @@ function BlueprintFlowWidget({ showConnections={showConnections} onConnectParameter={handleConnectParameter} onDisconnectParameter={handleDisconnectParameter} + onConnectNode={handleConnectNode} onOverrideParameter={handleOverrideParameter} onToggleForceNode={handleToggleForceNode} liteMode={liteMode} From 49ede6e9c0f3a4df935ae746fb5a36fed7b94c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ebubekir=20Y=C4=B1lmaz?= Date: Thu, 19 Nov 2026 15:50:10 +0300 Subject: [PATCH 4/6] Remove accidentally committed two-factor files from flow-edge commit --- api/src/lib/twoFactorToken.ts | 48 ---------------------------- api/src/models/TwoFactorChallenge.ts | 32 ------------------- 2 files changed, 80 deletions(-) delete mode 100644 api/src/lib/twoFactorToken.ts delete mode 100644 api/src/models/TwoFactorChallenge.ts diff --git a/api/src/lib/twoFactorToken.ts b/api/src/lib/twoFactorToken.ts deleted file mode 100644 index bd660568..00000000 --- a/api/src/lib/twoFactorToken.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { createHash, randomBytes, timingSafeEqual } from "node:crypto"; - -export function createToken() { - return randomBytes(32).toString("hex"); -} -export function hashToken(token: string) { - return createHash("sha256").update(token).digest("hex"); -} -export function matchesToken(token: string, hash: string) { - return ( - /^[a-f0-9]{64}$/.test(token) && - /^[a-f0-9]{64}$/.test(hash) && - timingSafeEqual( - Buffer.from(hashToken(token), "hex"), - Buffer.from(hash, "hex"), - ) - ); -} -export function approvalLinks( - base: string | undefined, - sessionId: string, - stepId: string, - token: string, -) { - if (!base) - throw new Error( - "TWO_FACTOR_PUBLIC_URL is required for email approval links", - ); - const url = new URL( - `${base.replace(/\/$/, "")}/sessions/${encodeURIComponent( - sessionId, - )}/two-factor/email`, - ); - if ( - url.protocol !== "https:" && - !( - url.protocol === "http:" && - ["localhost", "127.0.0.1"].includes(url.hostname) - ) - ) - throw new Error("TWO_FACTOR_PUBLIC_URL must use HTTPS"); - url.searchParams.set("stepId", stepId); - url.searchParams.set("token", token); - url.searchParams.set("decision", "APPROVED"); - const approve = url.toString(); - url.searchParams.set("decision", "REJECTED"); - return { approve, reject: url.toString() }; -} diff --git a/api/src/models/TwoFactorChallenge.ts b/api/src/models/TwoFactorChallenge.ts deleted file mode 100644 index b151ea67..00000000 --- a/api/src/models/TwoFactorChallenge.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { - Table, - Column, - Model, - DataType, - PrimaryKey, - AllowNull, -} from "@canmingir/link-express/sequelize"; - -@Table({ - tableName: "TwoFactorChallenge", - timestamps: false, - underscored: true, -}) -class TwoFactorChallenge extends Model { - @PrimaryKey - @Column(DataType.UUID) - declare stepId: string; - - @AllowNull(false) - @Column(DataType.STRING) - declare tokenHash: string; - - @AllowNull(false) - @Column(DataType.DATE) - declare expiresAt: Date; - - @AllowNull(false) - @Column(DataType.BOOLEAN) - declare consumed: boolean; -} -export default TwoFactorChallenge; From 33dfa4da4f823718f5e38a5e230b2277d32dac6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ebubekir=20Y=C4=B1lmaz?= Date: Thu, 19 Nov 2026 15:57:22 +0300 Subject: [PATCH 5/6] Fix node-connect handle drag not completing --- .../BlueprintFlow/NodeConnectionOverlay.tsx | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dashboard/src/components/BlueprintFlow/NodeConnectionOverlay.tsx b/dashboard/src/components/BlueprintFlow/NodeConnectionOverlay.tsx index 6f112af5..3caf7373 100644 --- a/dashboard/src/components/BlueprintFlow/NodeConnectionOverlay.tsx +++ b/dashboard/src/components/BlueprintFlow/NodeConnectionOverlay.tsx @@ -271,11 +271,11 @@ export default function NodeConnectionOverlay({ useEffect(() => { if (!dragging && !nodeDragging) return; - const handleMouseMove = (e: MouseEvent) => { + const handlePointerMove = (e: PointerEvent) => { mousePosRef.current = { x: e.clientX, y: e.clientY }; }; - const handleMouseUp = (e: MouseEvent) => { + const handlePointerUp = (e: PointerEvent) => { if (dragging) { const dropped = ( document.elementFromPoint(e.clientX, e.clientY) as HTMLElement | null @@ -315,11 +315,19 @@ export default function NodeConnectionOverlay({ } }; - window.addEventListener("mousemove", handleMouseMove); - window.addEventListener("mouseup", handleMouseUp); + const handlePointerCancel = () => { + mousePosRef.current = null; + if (dragging) onDragEnd(); + if (nodeDragging) onNodeDragEnd?.(); + }; + + window.addEventListener("pointermove", handlePointerMove); + window.addEventListener("pointerup", handlePointerUp); + window.addEventListener("pointercancel", handlePointerCancel); return () => { - window.removeEventListener("mousemove", handleMouseMove); - window.removeEventListener("mouseup", handleMouseUp); + window.removeEventListener("pointermove", handlePointerMove); + window.removeEventListener("pointerup", handlePointerUp); + window.removeEventListener("pointercancel", handlePointerCancel); }; }, [ dragging, From 164efdc3067ea9a50a69c5db17b9791d931a7739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ebubekir=20Y=C4=B1lmaz?= Date: Thu, 19 Nov 2026 16:09:29 +0300 Subject: [PATCH 6/6] Avoid mounting NodeConnectionOverlay when idle --- dashboard/src/components/BlueprintFlow/BlueprintFlow.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboard/src/components/BlueprintFlow/BlueprintFlow.tsx b/dashboard/src/components/BlueprintFlow/BlueprintFlow.tsx index 18add501..a11979d1 100644 --- a/dashboard/src/components/BlueprintFlow/BlueprintFlow.tsx +++ b/dashboard/src/components/BlueprintFlow/BlueprintFlow.tsx @@ -335,7 +335,7 @@ export default function BlueprintFlow({ })} /> - {!readOnly && ( + {!readOnly && (showConnections || dragging || nodeDragging) && (