Switch contact email to Resend
This commit is contained in:
parent
909a416311
commit
8f900ce7c0
1 changed files with 15 additions and 51 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
type Env = {
|
type Env = {
|
||||||
TURNSTILE_SECRET_KEY?: string;
|
TURNSTILE_SECRET_KEY?: string;
|
||||||
AZURE_COMMUNICATION_CONNECTION_STRING?: string;
|
RESEND_API_KEY?: string;
|
||||||
CONTACT_FROM_EMAIL?: string;
|
CONTACT_FROM_EMAIL?: string;
|
||||||
CONTACT_TO_EMAIL?: string;
|
CONTACT_TO_EMAIL?: string;
|
||||||
ASSETS: Fetcher;
|
ASSETS: Fetcher;
|
||||||
|
|
@ -15,23 +15,6 @@ const jsonResponse = (data: Record<string, unknown>, status = 200) =>
|
||||||
const readFormField = (value: FormDataEntryValue | null) =>
|
const readFormField = (value: FormDataEntryValue | null) =>
|
||||||
typeof value === "string" ? value.trim() : "";
|
typeof value === "string" ? value.trim() : "";
|
||||||
|
|
||||||
const parseConnectionString = (connectionString: string) => {
|
|
||||||
const parts = connectionString.split(";").filter(Boolean);
|
|
||||||
const map = new Map<string, string>();
|
|
||||||
for (const part of parts) {
|
|
||||||
const [rawKey, ...rest] = part.split("=");
|
|
||||||
const key = rawKey?.trim().toLowerCase();
|
|
||||||
const value = rest.join("=").trim();
|
|
||||||
if (key && value) {
|
|
||||||
map.set(key, value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
endpoint: map.get("endpoint") ?? "",
|
|
||||||
accessKey: map.get("accesskey") ?? map.get("access_key") ?? "",
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleContact = async (request: Request, env: Env) => {
|
const handleContact = async (request: Request, env: Env) => {
|
||||||
const formData = await request.formData();
|
const formData = await request.formData();
|
||||||
const name = readFormField(formData.get("name"));
|
const name = readFormField(formData.get("name"));
|
||||||
|
|
@ -84,7 +67,7 @@ const handleContact = async (request: Request, env: Env) => {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!env.AZURE_COMMUNICATION_CONNECTION_STRING) {
|
if (!env.RESEND_API_KEY) {
|
||||||
return jsonResponse(
|
return jsonResponse(
|
||||||
{ ok: false, error: "Email provider not configured." },
|
{ ok: false, error: "Email provider not configured." },
|
||||||
500,
|
500,
|
||||||
|
|
@ -100,39 +83,22 @@ const handleContact = async (request: Request, env: Env) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const toEmail = env.CONTACT_TO_EMAIL ?? "calum@muir.in";
|
const toEmail = env.CONTACT_TO_EMAIL ?? "calum@muir.in";
|
||||||
const { endpoint, accessKey } = parseConnectionString(
|
|
||||||
env.AZURE_COMMUNICATION_CONNECTION_STRING,
|
|
||||||
);
|
|
||||||
if (!endpoint || !accessKey) {
|
|
||||||
return jsonResponse(
|
|
||||||
{ ok: false, error: "Email provider not configured." },
|
|
||||||
500,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const emailPayload = {
|
const emailPayload = {
|
||||||
senderAddress: fromEmail,
|
from: fromEmail,
|
||||||
content: {
|
to: [toEmail],
|
||||||
|
reply_to: email,
|
||||||
subject: "New contact form submission",
|
subject: "New contact form submission",
|
||||||
plainText: `Name: ${name}\nEmail: ${email}\n\n${message}`,
|
text: `Name: ${name}\nEmail: ${email}\n\n${message}`,
|
||||||
},
|
|
||||||
recipients: {
|
|
||||||
to: [{ address: toEmail }],
|
|
||||||
},
|
|
||||||
replyTo: [{ address: email }],
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const response = await fetch(
|
const response = await fetch("https://api.resend.com/emails", {
|
||||||
`${endpoint.replace(/\/$/, "")}/emails:send?api-version=2023-03-31`,
|
|
||||||
{
|
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
|
Authorization: `Bearer ${env.RESEND_API_KEY}`,
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
"api-key": accessKey,
|
|
||||||
},
|
},
|
||||||
body: JSON.stringify(emailPayload),
|
body: JSON.stringify(emailPayload),
|
||||||
},
|
});
|
||||||
);
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const contentType = response.headers.get("content-type") ?? "";
|
const contentType = response.headers.get("content-type") ?? "";
|
||||||
const errorText = contentType.includes("application/json")
|
const errorText = contentType.includes("application/json")
|
||||||
|
|
@ -177,9 +143,7 @@ export default {
|
||||||
return jsonResponse({
|
return jsonResponse({
|
||||||
ok: true,
|
ok: true,
|
||||||
hasTurnstileSecret: Boolean(env.TURNSTILE_SECRET_KEY),
|
hasTurnstileSecret: Boolean(env.TURNSTILE_SECRET_KEY),
|
||||||
hasAzureConnectionString: Boolean(
|
hasResendApiKey: Boolean(env.RESEND_API_KEY),
|
||||||
env.AZURE_COMMUNICATION_CONNECTION_STRING,
|
|
||||||
),
|
|
||||||
hasContactFromEmail: Boolean(env.CONTACT_FROM_EMAIL),
|
hasContactFromEmail: Boolean(env.CONTACT_FROM_EMAIL),
|
||||||
hasContactToEmail: Boolean(env.CONTACT_TO_EMAIL),
|
hasContactToEmail: Boolean(env.CONTACT_TO_EMAIL),
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue