Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions apps/OpenSign/src/constant/Utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
buildDownloadFilename,
addPreferenceOpt
} from "../utils";
import { resolveMailFromSender } from "./mailUtils";

export const fontsizeArr = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28];
export const fontColorArr = ["red", "black", "blue", "yellow"];
Expand Down Expand Up @@ -3971,10 +3972,12 @@ export const sendEmailToSigners = async (
const senderName =
pdfDetails?.[0]?.SenderName || pdfDetails?.[0]?.ExtUserPtr?.Name;

const from =
pdfDetails?.[0]?.SenderName || useNameAsSender
? pdfDetails?.[0]?.ExtUserPtr?.Name || ""
: senderEmail;
const from = resolveMailFromSender({
senderName: pdfDetails?.[0]?.SenderName,
useNameAsSender,
extUserName: pdfDetails?.[0]?.ExtUserPtr?.Name,
senderEmail
});

const documentName = `${pdfDetails?.[0].Name}`;
let replaceVar;
Expand Down
16 changes: 16 additions & 0 deletions apps/OpenSign/src/constant/mailUtils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
export function resolveMailFromSender({
senderName,
useNameAsSender,
extUserName,
senderEmail
}) {
if (senderName) {
return senderName;
}

if (useNameAsSender) {
return extUserName || "";
}

return senderEmail;
}
37 changes: 37 additions & 0 deletions apps/OpenSign/src/constant/mailUtils.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { describe, expect, it } from "vitest";
import { resolveMailFromSender } from "./mailUtils";

describe("resolveMailFromSender", () => {
it("prefers the explicit sender name when present", () => {
expect(
resolveMailFromSender({
senderName: "Contract Team",
useNameAsSender: true,
extUserName: "Owner Name",
senderEmail: "owner@example.com"
})
).toBe("Contract Team");
});

it("falls back to the owner name only when UseNameAsSender is enabled", () => {
expect(
resolveMailFromSender({
senderName: "",
useNameAsSender: true,
extUserName: "Owner Name",
senderEmail: "owner@example.com"
})
).toBe("Owner Name");
});

it("falls back to the sender email when no sender name should be used", () => {
expect(
resolveMailFromSender({
senderName: "",
useNameAsSender: false,
extUserName: "Owner Name",
senderEmail: "owner@example.com"
})
).toBe("owner@example.com");
});
});