Skip to content

Automate browser based workflows with AI

Gate passkey 2FA behind the enterprise plan with a visible book-a-demo upsell tile (SKY-14535) (#8587)

Shuchang Zheng92976292e24b
diff --git a/skyvern-frontend/src/routes/credentials/CredentialAuthenticatorSupportContext.ts b/skyvern-frontend/src/routes/credentials/CredentialAuthenticatorSupportContext.ts
index 1d41b71e2..d0784e762 100644
--- a/skyvern-frontend/src/routes/credentials/CredentialAuthenticatorSupportContext.ts
+++ b/skyvern-frontend/src/routes/credentials/CredentialAuthenticatorSupportContext.ts
@@ -19,8 +19,18 @@ type CredentialAdditionalTwoFactorMethod = {
icon?: ReactNode;
flagName?: string;
supportsInlineTest?: boolean;
+ saveBeforeCredentialUpdate?: boolean;
removalConfirmation?: string;
initialState?: CredentialAdditionalTwoFactorState;
+ gate?: {
+ locked: boolean;
+ badgeLabel: string;
+ description: ReactNode;
+ cta: {
+ label: string;
+ href: string;
+ };
+ };
renderFields: (props: {
state: CredentialAdditionalTwoFactorState;
setState: (next: CredentialAdditionalTwoFactorState) => void;
diff --git a/skyvern-frontend/src/routes/credentials/CredentialsModal.tsx b/skyvern-frontend/src/routes/credentials/CredentialsModal.tsx
index c7b342cc9..36069391c 100644
--- a/skyvern-frontend/src/routes/credentials/CredentialsModal.tsx
+++ b/skyvern-frontend/src/routes/credentials/CredentialsModal.tsx
@@ -100,6 +100,19 @@ const PASSWORD_CREDENTIAL_INITIAL_VALUES = {
totp_type: "none",
totp_identifier: "",
};
+class AdditionalTwoFactorSaveError extends Error {
+ readonly cause: unknown;
+
+ constructor(cause: unknown) {
+ super("The additional two-factor method could not be saved.");
+ this.name = "AdditionalTwoFactorSaveError";
+ this.cause = cause;
+ }
+}
+
+type RunAdditionalTwoFactorSaveOptions = {
+ throwOnError?: boolean;
+};
function createAdditionalTwoFactorStates(
methods: CredentialAdditionalTwoFactorMethod[],
@@ -391,7 +404,9 @@ function CredentialsModal({
)
: undefined;
const selectedAdditionalTwoFactorMethod = additionalTwoFactorMethods.find(
- ({ value }) => value === passwordCredentialValues.totp_type,
+ ({ value, gate }) =>
+ value === passwordCredentialValues.totp_type &&
+ !(gate?.locked && value !== configuredAdditionalTwoFactorMethod?.value),
);
const supportsInlineTest =
selectedAdditionalTwoFactorMethod?.supportsInlineTest !== false;
@@ -537,6 +552,7 @@ function CredentialsModal({
proxyLocation: ProxyLocation | null;
proxySessionId?: string | null;
proxyPinChanged: boolean;
+ additionalTwoFactorSaveBeforeUpdate?: boolean;
additionalTwoFactor?: {
selectedValue?: string;
configuredValue?: string;
@@ -555,7 +571,10 @@ function CredentialsModal({
});
const runAdditionalTwoFactorSave = useCallback(
- async (credentialId: string): Promise<boolean> => {
+ async (
+ credentialId: string,
+ options: RunAdditionalTwoFactorSaveOptions = {},
+ ): Promise<boolean> => {
const snapshot = saveIntentRef.current.additionalTwoFactor;
if (!snapshot) {
return true;
@@ -588,6 +607,9 @@ function CredentialsModal({
}
return true;
} catch (error) {
+ if (options.throwOnError) {
+ throw error;
+ }
reportCredentialSaveError(error, "Partial save");
return false;
}
@@ -1069,9 +1091,23 @@ function CredentialsModal({
const updateCredentialMutation = useMutation({
mutationFn: async (request: CreateCredentialRequest) => {
+ const credentialId = editingCredential?.credential_id;
+ if (
+ saveIntentRef.current.additionalTwoFactorSaveBeforeUpdate &&
+ credentialId
+ ) {
+ try {
+ await runAdditionalTwoFactorSave(credentialId, {
+ throwOnError: true,
+ });
+ } catch (error) {
+ throw new AdditionalTwoFactorSaveError(error);
+ }
+ }
+
const client = await getClient(credentialGetter, "sans-api-v1");
const response = await client.post(
- `/credentials/${editingCredential?.credential_id}/update`,
+ `/credentials/${credentialId}/update`,
request,
);
return response.data;
@@ -1126,10 +1162,11 @@ function CredentialsModal({
}
}
- const additionalTwoFactorSaved = editingCredential?.credential_id
- ? await runAdditionalTwoFactorSave(editingCredential.credential_id)
- : true;
-
+ const additionalTwoFactorSaved =
+ !saveIntentRef.current.additionalTwoFactorSaveBeforeUpdate &&
+ editingCredential?.credential_id
+ ? await runAdditionalTwoFactorSave(editingCredential.credential_id)
+ : true;
queryClient.invalidateQueries({
queryKey: ["credentials"],
});
@@ -1173,8 +1210,10 @@ function CredentialsModal({
});
}
},
- onError: (error: AxiosError) => {
- reportCredentialSaveError(error);
+ onError: (error: unknown) => {
+ reportCredentialSaveError(
+ error instanceof AdditionalTwoFactorSaveError ? error.cause : error,
+ );
},
});
@@ -1437,6 +1476,10 @@ function CredentialsModal({
editingGroups.values ||
userContext.trim() !== (editingCredential?.user_context ?? "") ||
testUrl.trim() !== (editingCredential?.tested_url ?? "");
+ const saveAdditionalTwoFactorBeforeUpdate =
+ isEditMode &&
+ Boolean(editingCredential?.credential_id) &&
+ selectedAdditionalTwoFactorMethod?.saveBeforeCredentialUpdate === true;
saveIntentRef.current = {
shouldTestAfterSave:
supportsInlineTest &&
@@ -1453,6 +1496,8 @@ function CredentialsModal({
proxyLocation: proxyPinPayload.proxy_location,
proxySessionId: proxyPinPayload.proxy_session_id,
proxyPinChanged,
+ additionalTwoFactorSaveBeforeUpdate:
+ saveAdditionalTwoFactorBeforeUpdate,
additionalTwoFactor:
selectedAdditionalTwoFactorMethod ||
configuredAdditionalTwoFactorMethod
@@ -1489,14 +1534,15 @@ function CredentialsModal({
username,
...(preservesStoredPassword ? {} : { password }),
totp: selectedAdditionalTwoFactorMethod || totp === "" ? null : totp,
- // When newly selecting an additional method, stage "none" so the dedicated endpoint sets type
- // and material atomically; a rejection then can't leave a 2FA type with no material behind.
- // For an already-configured replacement, keep the type so the old material survives a failure.
+ // Stage "none" for methods that attach after the base update. Methods
+ // that opt into attach-first keep their server-written type here.
totp_type:
selectedAdditionalTwoFactorMethod &&
selectedAdditionalTwoFactorMethod.value !==
configuredAdditionalTwoFactorMethod?.value
- ? "none"
+ ? saveAdditionalTwoFactorBeforeUpdate
+ ? selectedAdditionalTwoFactorMethod.requestType
+ : "none"
: toPasswordCredentialTotpType(
passwordCredentialValues.totp_type,
selectedAdditionalTwoFactorMethod,
diff --git a/skyvern-frontend/src/routes/credentials/PasswordCredentialContent.tsx b/skyvern-frontend/src/routes/credentials/PasswordCredentialContent.tsx
index 90f04d390..b42c3ecfc 100644
--- a/skyvern-frontend/src/routes/credentials/PasswordCredentialContent.tsx
+++ b/skyvern-frontend/src/routes/credentials/PasswordCredentialContent.tsx
@@ -126,35 +126,48 @@ function useAdditionalTwoFactorMethodEnabled(
function AdditionalTwoFactorMethodCard({
method,
selected,
+ configured,
onSelect,
}: {
method: CredentialAdditionalTwoFactorMethod;
selected: boolean;
+ configured: boolean;
onSelect: () => void;
}) {
const enabled = useAdditionalTwoFactorMethodEnabled(method);
if (!enabled) {
return null;
}
+ const locked = Boolean(method.gate?.locked && !configured);
return (
<button
type="button"
- aria-pressed={selected}
+ aria-pressed={selected && !locked}
+ aria-disabled={locked ? true : undefined}
className={cn(
"relative flex h-36 cursor-pointer items-center justify-center gap-2 rounded-lg border border-transparent bg-slate-elevation1 hover:bg-slate-elevation3",
selected &&
+ !locked &&
"border-blue-400 bg-slate-elevation3 ring-1 ring-blue-400/60",
+ locked && "opacity-60",
)}
onClick={onSelect}
>
- {selected && (
+ {selected && !locked && (
<span className="absolute right-3 top-3 flex size-5 items-center justify-center rounded-full bg-blue-500 text-white">
<CheckIcon className="size-3" />
</span>
)}
{method.icon}
- <Label className="cursor-pointer text-center">{method.label}</Label>
+ <div className="flex flex-col items-center gap-2">
+ <Label className="cursor-pointer text-center">{method.label}</Label>
+ {locked && method.gate && (
+ <span className="rounded bg-amber-500/20 px-1.5 py-0.5 text-[10px] font-medium text-amber-400">
+ {method.gate.badgeLabel}
+ </span>
+ )}
+ </div>
</button>
);
}
@@ -166,6 +179,7 @@ function AdditionalTwoFactorMethodFields({
disabled,
isEditMode,
configured,
+ locked,
error,
}: {
method: CredentialAdditionalTwoFactorMethod;
@@ -174,6 +188,7 @@ function AdditionalTwoFactorMethodFields({
disabled: boolean;
isEditMode: boolean;
configured: boolean;
+ locked: boolean;
error?: string | null;
}) {
const enabled = useAdditionalTwoFactorMethodEnabled(method);
@@ -188,6 +203,25 @@ function AdditionalTwoFactorMethodFields({
) : null;
}
+ if (locked && method.gate) {
+ return (
+ <div className="space-y-4 rounded-md border border-input bg-background p-4">
+ <p className="text-sm text-muted-foreground">
+ {method.gate.description}
+ </p>
+ <Button asChild>
+ <a
+ href={method.gate.cta.href}
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ {method.gate.cta.label}
+ </a>
+ </Button>
+ </div>
+ );
+ }
+
return (
<div className="space-y-4">
{method.renderFields({
@@ -256,6 +290,19 @@ function PasswordCredentialContent({
const [totpMethod, setTotpMethod] = useState<string>(
totp_type === "none" ? "authenticator" : totp_type,
);
+ const [lockedMethodValue, setLockedMethodValue] = useState<string | null>(
+ null,
+ );
+ const lockedMethodIsLocked = Boolean(
+ lockedMethodValue &&
+ additionalTwoFactorMethods.some(
+ ({ value, gate }) =>
+ value === lockedMethodValue &&
+ gate?.locked &&
+ configuredAdditionalTwoFactorMethod !== value,
+ ),
+ );
+
const [totpAccordionValue, setTotpAccordionValue] = useState<string>("");
const [showPassword, setShowPassword] = useState(false);
const [qrCodeScanError, setQrCodeScanError] = useState<string | null>(null);
@@ -370,6 +417,13 @@ function PasswordCredentialContent({
setTotpAccordionValue("two-factor-authentication");
}
}, [totp_type]);
+ // A remembered locked method must be cleared when its gate unlocks so fields
+ // return to the selection-driven method instead of rendering uninvited.
+ useEffect(() => {
+ if (lockedMethodValue && !lockedMethodIsLocked) {
+ setLockedMethodValue(null);
+ }
+ }, [lockedMethodIsLocked, lockedMethodValue]);
useEffect(() => {
if (
@@ -442,6 +496,35 @@ function PasswordCredentialContent({
[name, onChange, password, totp, totp_identifier, totp_type, username],
);
+ // A gate can resolve after a user selects an additional method. Do not keep
+ // a newly selected method pending once its gate locks; otherwise save maps
+ // the unsupported value to "none" and silently drops the entered material.
+ useEffect(() => {
+ const pendingMethod = additionalTwoFactorMethods.find(
+ ({ value }) => value === totpMethod && value === totp_type,
+ );
+ if (
+ !pendingMethod?.gate?.locked ||
+ configuredAdditionalTwoFactorMethod === pendingMethod.value
+ ) {
+ return;
+ }
+
+ setTotpMethod("none");
+ setLockedMethodValue(pendingMethod.value);
+ updateValues({ totp: "", totp_type: "none", totp_identifier: "" });
+ onAdditionalTwoFactorStateChange?.(pendingMethod.value, {
+ ...(pendingMethod.initialState ?? {}),
+ });
+ }, [
+ additionalTwoFactorMethods,
+ configuredAdditionalTwoFactorMethod,
+ onAdditionalTwoFactorStateChange,
+ totpMethod,
+ totp_type,
+ updateValues,
+ ]);
+
// Keep totp_identifier in sync ONLY when the user renames their username
// and the identifier was previously auto-filled to match that username.
// Method-change auto-fill lives in handleTotpMethodChange — that path is
@@ -468,6 +551,7 @@ function PasswordCredentialContent({
// defaults here (rather than in a useEffect) so data-hydration setTotpMethod
// calls don't accidentally trigger them.
const handleTotpMethodChange = (method: string) => {
+ setLockedMethodValue(null);
onEnableEditValues?.();
const prevMethod = totpMethod;
setTotpMethod(method);
@@ -501,6 +585,20 @@ function PasswordCredentialContent({
updateValues(updates);
};
+ const handleAdditionalTwoFactorMethodSelect = (
+ method: CredentialAdditionalTwoFactorMethod,
+ ) => {
+ const locked = Boolean(
+ method.gate?.locked &&
+ configuredAdditionalTwoFactorMethod !== method.value,
+ );
+ if (locked) {
+ setLockedMethodValue(method.value);
+ return;
+ }
+ setLockedMethodValue(null);
+ handleTotpMethodChange(method.value);
+ };
const handleTotpAccordionValueChange = (value: string) => {
setTotpAccordionValue(value);
@@ -854,12 +952,18 @@ function PasswordCredentialContent({
key={method.value}
method={method}
selected={totpMethod === method.value}
- onSelect={() => handleTotpMethodChange(method.value)}
+ configured={
+ configuredAdditionalTwoFactorMethod === method.value
+ }
+ onSelect={() =>
+ handleAdditionalTwoFactorMethodSelect(method)
+ }
/>
))}
</div>
{additionalTwoFactorMethods.map((method) =>
- totpMethod === method.value ? (
+ lockedMethodValue === method.value ||
+ (!lockedMethodValue && totpMethod === method.value) ? (
<AdditionalTwoFactorMethodFields
key={method.value}
method={method}
@@ -877,6 +981,10 @@ function PasswordCredentialContent({
configured={
configuredAdditionalTwoFactorMethod === method.value
}
+ locked={Boolean(
+ method.gate?.locked &&
+ configuredAdditionalTwoFactorMethod !== method.value,
+ )}
error={additionalTwoFactorError}
/>
) : null,
diff --git a/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx b/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx
index 90f7c911e..406fa872f 100644
--- a/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx
@@ -80,7 +80,6 @@ import {
CredentialParameterYAML,
OnePasswordCredentialParameterYAML,
AzureVaultCredentialParameterYAML,
- ParameterYAML,
WorkflowParameterYAML,
} from "../types/workflowYamlTypes";
import {
@@ -136,7 +135,6 @@ import {
createNode,
descendants,
generateNodeLabel,
- getAdditionalParametersForEmailBlock,
getOrderedChildrenBlocks,
getOutputParameterKey,
getWorkflowBlocks,
@@ -1014,23 +1012,8 @@ function FlowRenderer({
const echoParameters = convertEchoParameters(filteredParameters);
- const overallParameters = [
- ...parameters,
- ...echoParameters,
- ] as Array<ParameterYAML>;
-
- // if there is an email node, we need to add the email aws secret parameters
- const emailAwsSecretParameters = getAdditionalParametersForEmailBlock(
- upgradedBlocks,
- overallParameters,
- );
-
return {
- parameters: [
- ...echoParameters,
- ...parametersInYAMLConvertibleJSON,
- ...emailAwsSecretParameters,
- ],
+ parameters: [...echoParameters, ...parametersInYAMLConvertibleJSON],
blocks: upgradedBlocks,
workflowDefinitionVersion,
title,
diff --git a/skyvern-frontend/src/routes/workflows/editor/constants.ts b/skyvern-frontend/src/routes/workflows/editor/constants.ts
index 1134585b2..0952f6298 100644
--- a/skyvern-frontend/src/routes/workflows/editor/constants.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/constants.ts
@@ -10,16 +10,6 @@ export const REACT_FLOW_SELECTED_NODE_Z = 1000;
export const SKYVERN_DOWNLOAD_DIRECTORY = "SKYVERN_DOWNLOAD_DIRECTORY";
-export const SMTP_HOST_PARAMETER_KEY = "smtp_host";
-export const SMTP_PORT_PARAMETER_KEY = "smtp_port";
-export const SMTP_USERNAME_PARAMETER_KEY = "smtp_username";
-export const SMTP_PASSWORD_PARAMETER_KEY = "smtp_password";
-
-export const SMTP_HOST_AWS_KEY = "SKYVERN_SMTP_HOST_AWS_SES";
-export const SMTP_PORT_AWS_KEY = "SKYVERN_SMTP_PORT_AWS_SES";
-export const SMTP_USERNAME_AWS_KEY = "SKYVERN_SMTP_USERNAME_SES";
-export const SMTP_PASSWORD_AWS_KEY = "SKYVERN_SMTP_PASSWORD_SES";
-
export const EMAIL_BLOCK_SENDER = "[email protected]";
// Reserved parameters that are always available
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/HumanInteractionNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/HumanInteractionNode/types.ts
index c101fffe5..910f0729e 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/HumanInteractionNode/types.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/HumanInteractionNode/types.ts
@@ -1,11 +1,5 @@
import type { Node } from "@xyflow/react";
-import {
- EMAIL_BLOCK_SENDER,
- SMTP_HOST_PARAMETER_KEY,
- SMTP_PASSWORD_PARAMETER_KEY,
- SMTP_PORT_PARAMETER_KEY,
- SMTP_USERNAME_PARAMETER_KEY,
-} from "../../constants";
+import { EMAIL_BLOCK_SENDER } from "../../constants";
import { NodeBaseData } from "../types";
import {
type EmailBodyFormat,
@@ -22,10 +16,6 @@ export type HumanInteractionNodeData = NodeBaseData & {
body: string;
bodyFormat: EmailBodyFormat;
sender: string;
- smtpHostSecretParameterKey?: string;
- smtpPortSecretParameterKey?: string;
- smtpUsernameSecretParameterKey?: string;
- smtpPasswordSecretParameterKey?: string;
};
export type HumanInteractionNode = Node<
@@ -46,10 +36,6 @@ export const humanInteractionNodeDefaultData: HumanInteractionNodeData = {
editable: true,
label: "",
sender: EMAIL_BLOCK_SENDER,
- smtpHostSecretParameterKey: SMTP_HOST_PARAMETER_KEY,
- smtpPortSecretParameterKey: SMTP_PORT_PARAMETER_KEY,
- smtpUsernameSecretParameterKey: SMTP_USERNAME_PARAMETER_KEY,
- smtpPasswordSecretParameterKey: SMTP_PASSWORD_PARAMETER_KEY,
continueOnFailure: false,
model: null,
} as const;
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/SendEmailNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/SendEmailNode/types.ts
index fec73bfa0..80d48b1cd 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/SendEmailNode/types.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/SendEmailNode/types.ts
@@ -2,10 +2,6 @@ import type { Node } from "@xyflow/react";
import {
EMAIL_BLOCK_SENDER,
SKYVERN_DOWNLOAD_DIRECTORY,
- SMTP_HOST_PARAMETER_KEY,
- SMTP_PASSWORD_PARAMETER_KEY,
- SMTP_PORT_PARAMETER_KEY,
- SMTP_USERNAME_PARAMETER_KEY,
} from "../../constants";
import { NodeBaseData } from "../types";
import {
@@ -42,10 +38,6 @@ export const sendEmailNodeDefaultData: SendEmailNodeData = {
editable: true,
label: "",
sender: EMAIL_BLOCK_SENDER,
- smtpHostSecretParameterKey: SMTP_HOST_PARAMETER_KEY,
- smtpPortSecretParameterKey: SMTP_PORT_PARAMETER_KEY,
- smtpUsernameSecretParameterKey: SMTP_USERNAME_PARAMETER_KEY,
- smtpPasswordSecretParameterKey: SMTP_PASSWORD_PARAMETER_KEY,
customSmtpHost: null,
customSmtpPort: null,
customSmtpUsername: null,
diff --git a/skyvern-frontend/src/routes/workflows/editor/sortable/roundTrip.test.ts b/skyvern-frontend/src/routes/workflows/editor/sortable/roundTrip.test.ts
index d9cfae9e2..248cb4ba2 100644
--- a/skyvern-frontend/src/routes/workflows/editor/sortable/roundTrip.test.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/sortable/roundTrip.test.ts
@@ -11,9 +11,11 @@ import {
getWorkflowSettings,
} from "../workflowEditorUtils";
import {
+ type AWSSecretParameter,
type CodeBlock,
type EmailInboxBlock,
type OutputParameter,
+ type SendEmailBlock,
type WorkflowBlock,
type WorkflowApiResponse,
type WorkflowParameter,
@@ -24,6 +26,81 @@ import type { CodeBlockYAML } from "../../types/workflowYamlTypes";
import { rewireBlockDropInScope } from "./rewire";
import { TOP_LEVEL_SCOPE } from "./scope";
+describe("send email SMTP round trip", () => {
+ test.each([
+ { kind: "placeholders", placeholder: true },
+ { kind: "declared secrets", placeholder: false },
+ ])("clearing a custom host handles $kind", ({ placeholder }) => {
+ const smtpParameter = (name: string): AWSSecretParameter => ({
+ parameter_type: "aws_secret",
+ key: placeholder ? name : `existing_${name}`,
+ description: null,
+ aws_key: placeholder ? "UNUSED_CUSTOM_SMTP_PLACEHOLDER" : name,
+ aws_secret_parameter_id: `secret_${name}`,
+ workflow_id: "wf-fixture",
+ created_at: "2026-04-20T00:00:00Z",
+ modified_at: "2026-04-20T00:00:00Z",
+ deleted_at: null,
+ });
+ const block: SendEmailBlock = {
+ block_type: "send_email",
+ label: "send_email",
+ continue_on_failure: false,
+ model: null,
+ next_block_label: null,
+ output_parameter: makeOutputParameter("send_email"),
+ sender: "[email protected]",
+ recipients: ["[email protected]"],
+ subject: "Workflow complete",
+ body: "<p>Workflow complete</p>",
+ body_format: "html",
+ file_attachments: [],
+ custom_smtp_host: "smtp.example.com",
+ custom_smtp_port: 587,
+ smtp_host: smtpParameter("smtp_host"),
+ smtp_port: smtpParameter("smtp_port"),
+ smtp_username: smtpParameter("smtp_username"),
+ smtp_password: smtpParameter("smtp_password"),
+ };
+
+ const { nodes, edges } = getElements([block], DEFAULT_SETTINGS, true);
+ const emailNode = nodes.find((node) => node.type === "sendEmail");
+ if (!emailNode || emailNode.type !== "sendEmail") {
+ throw new Error("Send Email node was not loaded");
+ }
+ emailNode.data.customSmtpHost = "";
+
+ const [savedFromEditor] = getWorkflowBlocks(nodes, edges);
+ const [savedFromDefinition] = convert({
+ workflow_definition: {
+ version: 2,
+ parameters: [],
+ blocks: [{ ...block, custom_smtp_host: "" }],
+ },
+ } as unknown as WorkflowApiResponse).workflow_definition.blocks;
+ for (const saved of [savedFromEditor, savedFromDefinition]) {
+ expect(saved).toMatchObject({
+ block_type: "send_email",
+ custom_smtp_host: "",
+ custom_smtp_port: 587,
+ body_format: "html",
+ smtp_host_secret_parameter_key: placeholder
+ ? undefined
+ : "existing_smtp_host",
+ smtp_port_secret_parameter_key: placeholder
+ ? undefined
+ : "existing_smtp_port",
+ smtp_username_secret_parameter_key: placeholder
+ ? undefined
+ : "existing_smtp_username",
+ smtp_password_secret_parameter_key: placeholder
+ ? undefined
+ : "existing_smtp_password",
+ });
+ }
+ });
+});
+
/**
* M1 round-trip regression: mirrors the full reorder → save → reload path
* that ships in FlowRenderer. The goal is to catch regressions anywhere
diff --git a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts
index 5fe234c95..2b90bad7d 100644
--- a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts
@@ -7,8 +7,6 @@ import { TSON } from "@/util/tson";
import { getJsonParseErrorDetail } from "@/util/jsonParseError";
import {
- WorkflowBlockType,
- WorkflowBlockTypes,
WorkflowParameterTypes,
WorkflowParameterValueType,
BranchCriteriaTypes,
@@ -61,18 +59,7 @@ import {
PdfFillBlockYAML,
SplitPdfBlockYAML,
} from "../types/workflowYamlTypes";
-import {
- EMAIL_BLOCK_SENDER,
- REACT_FLOW_EDGE_Z_INDEX,
- SMTP_HOST_AWS_KEY,
- SMTP_HOST_PARAMETER_KEY,
- SMTP_PASSWORD_AWS_KEY,
- SMTP_PASSWORD_PARAMETER_KEY,
- SMTP_PORT_AWS_KEY,
- SMTP_PORT_PARAMETER_KEY,
- SMTP_USERNAME_AWS_KEY,
- SMTP_USERNAME_PARAMETER_KEY,
-} from "./constants";
+import { EMAIL_BLOCK_SENDER, REACT_FLOW_EDGE_Z_INDEX } from "./constants";
import { ParametersState } from "./types";
import { AppNode, isWorkflowBlockNode, WorkflowBlockNode } from "./nodes";
import { codeBlockNodeDefaultData } from "./nodes/CodeBlockNode/types";
@@ -655,6 +642,23 @@ function layout(
};
}
+// Keep this sentinel aligned with skyvern/forge/sdk/workflow/models/parameter.py.
+const UNUSED_CUSTOM_SMTP_PLACEHOLDER_AWS_KEY = "UNUSED_CUSTOM_SMTP_PLACEHOLDER";
+
+// Custom SMTP placeholders are undeclared; saving their keys would prevent
+// switching back to the platform sender after clearing the custom host.
+function declaredSmtpParameterKey(
+ parameter: AWSSecretParameter | undefined,
+): string | undefined {
+ if (
+ !parameter ||
+ parameter.aws_key === UNUSED_CUSTOM_SMTP_PLACEHOLDER_AWS_KEY
+ ) {
+ return undefined;
+ }
+ return parameter.key;
+}
+
function convertToNode(
identifiers: { id: string; parentId?: string },
block: WorkflowBlock,
@@ -992,10 +996,14 @@ function convertToNode(
recipients: block.recipients.join(", "),
subject: block.subject,
sender: block.sender,
- smtpHostSecretParameterKey: block.smtp_host?.key,
- smtpPortSecretParameterKey: block.smtp_port?.key,
- smtpUsernameSecretParameterKey: block.smtp_username?.key,
- smtpPasswordSecretParameterKey: block.smtp_password?.key,
+ smtpHostSecretParameterKey: declaredSmtpParameterKey(block.smtp_host),
+ smtpPortSecretParameterKey: declaredSmtpParameterKey(block.smtp_port),
+ smtpUsernameSecretParameterKey: declaredSmtpParameterKey(
+ block.smtp_username,
+ ),
+ smtpPasswordSecretParameterKey: declaredSmtpParameterKey(
+ block.smtp_password,
+ ),
customSmtpHost: block.custom_smtp_host ?? null,
customSmtpPort:
block.custom_smtp_port !== null &&
@@ -4184,72 +4192,6 @@ function getUpdatedParametersAfterLabelUpdateForSourceParameterKey(
});
}
-const sendEmailExpectedParameters = [
- {
- key: SMTP_HOST_PARAMETER_KEY,
- aws_key: SMTP_HOST_AWS_KEY,
- parameter_type: WorkflowParameterTypes.AWS_Secret,
- },
- {
- key: SMTP_PORT_PARAMETER_KEY,
- aws_key: SMTP_PORT_AWS_KEY,
- parameter_type: WorkflowParameterTypes.AWS_Secret,
- },
- {
- key: SMTP_USERNAME_PARAMETER_KEY,
- aws_key: SMTP_USERNAME_AWS_KEY,
- parameter_type: WorkflowParameterTypes.AWS_Secret,
- },
- {
- key: SMTP_PASSWORD_PARAMETER_KEY,
- aws_key: SMTP_PASSWORD_AWS_KEY,
- parameter_type: WorkflowParameterTypes.AWS_Secret,
- },
-] as const;
-
-function getBlocksOfType(
- blocks: Array<BlockYAML>,
- blockType: WorkflowBlockType,
-): Array<BlockYAML> {
- const blocksOfType: Array<BlockYAML> = [];
- for (const block of blocks) {
- if (
- block.block_type === WorkflowBlockTypes.ForLoop ||
- block.block_type === WorkflowBlockTypes.WhileLoop
- ) {
- const subBlocks = block.loop_blocks;
- const subBlocksOfType = getBlocksOfType(subBlocks, blockType);
- blocksOfType.push(...subBlocksOfType);
- } else {
- if (block.block_type === blockType) {
- blocksOfType.push(block);
- }
- }
- }
- return blocksOfType;
-}
-
-function getAdditionalParametersForEmailBlock(
- blocks: Array<BlockYAML>,
- parameters: Array<ParameterYAML>,
-): Array<ParameterYAML> {
- const emailBlocks = getBlocksOfType(blocks, WorkflowBlockTypes.SendEmail);
- if (emailBlocks.length === 0) {
- return [];
- }
- const sendEmailParameters = sendEmailExpectedParameters.flatMap(
- (parameter) => {
- const existingParameter = parameters.find((p) => p.key === parameter.key);
- if (existingParameter) {
- return [];
- }
- return [parameter];
- },
- );
-
- return sendEmailParameters;
-}
-
function getUniqueLabelForExistingNode(
label: string,
existingLabels: Array<string>,
@@ -4927,10 +4869,18 @@ function convertBlocksToBlockYAML(
const blockYaml: SendEmailBlockYAML = {
...base,
block_type: "send_email",
- smtp_host_secret_parameter_key: block.smtp_host?.key,
- smtp_port_secret_parameter_key: block.smtp_port?.key,
- smtp_username_secret_parameter_key: block.smtp_username?.key,
- smtp_password_secret_parameter_key: block.smtp_password?.key,
+ smtp_host_secret_parameter_key: declaredSmtpParameterKey(
+ block.smtp_host,
+ ),
+ smtp_port_secret_parameter_key: declaredSmtpParameterKey(
+ block.smtp_port,
+ ),
+ smtp_username_secret_parameter_key: declaredSmtpParameterKey(
+ block.smtp_username,
+ ),
+ smtp_password_secret_parameter_key: declaredSmtpParameterKey(
+ block.smtp_password,
+ ),
custom_smtp_host: block.custom_smtp_host,
custom_smtp_port: block.custom_smtp_port,
custom_smtp_username: block.custom_smtp_username,
@@ -5518,7 +5468,6 @@ export {
generateNodeLabel,
getAffectedBlocks,
getNestingLevel,
- getAdditionalParametersForEmailBlock,
getAvailableOutputParameterKeys,
isFirstBrowserTaskBlock,
urlMayBeGoogleDrive,