From 8630465d340378dd0cfc43f080058ae429648e86 Mon Sep 17 00:00:00 2001
From: Alireza Hassani <alirezahassani@Meshkees-Mac-mini.local>
Date: Fri, 18 Sep 2026 14:26:05 +0330
Subject: [PATCH] Allow Email DNS updates with RSA-only DKIM paste.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../src/components/EmailDnsModal.tsx          | 46 ++++++++++++-------
 .../super-admin/src/services/domainService.ts |  2 +-
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/apps/super-admin/src/components/EmailDnsModal.tsx b/apps/super-admin/src/components/EmailDnsModal.tsx
index 0c9c925..e884d12 100644
--- a/apps/super-admin/src/components/EmailDnsModal.tsx
+++ b/apps/super-admin/src/components/EmailDnsModal.tsx
@@ -24,6 +24,12 @@ function keyReady(paste: string, selector: string) {
   return pasteIncludesDomainkey(trimmed) || Boolean(selector.trim())
 }
 
+/** Empty = skip Ed25519; otherwise same rules as RSA. */
+function optionalKeyReady(paste: string, selector: string) {
+  if (!paste.trim()) return true
+  return keyReady(paste, selector)
+}
+
 export function EmailDnsModal({ domain, onClose }: EmailDnsModalProps) {
   const { showToast } = useToast()
   const [dnsProvider, setDnsProvider] = useState<ParkedDnsProvider>('arvan')
@@ -48,17 +54,19 @@ export function EmailDnsModal({ domain, onClose }: EmailDnsModalProps) {
   if (!domain) return null
   const target = domain
   const canSubmit =
-    keyReady(ed25519Key, ed25519Selector) && keyReady(rsaKey, rsaSelector)
+    keyReady(rsaKey, rsaSelector) &&
+    optionalKeyReady(ed25519Key, ed25519Selector)
 
   async function submit() {
     setSubmitting(true)
     setError('')
     try {
+      const ed25519Paste = ed25519Key.trim()
       const result = await applyMailDns(target.id, {
         dnsProvider,
-        ed25519Key,
         rsaKey,
-        ...(ed25519Selector.trim()
+        ...(ed25519Paste ? { ed25519Key: ed25519Paste } : {}),
+        ...(ed25519Paste && ed25519Selector.trim()
           ? { ed25519Selector: ed25519Selector.trim() }
           : {}),
         ...(rsaSelector.trim() ? { rsaSelector: rsaSelector.trim() } : {}),
@@ -85,14 +93,16 @@ export function EmailDnsModal({ domain, onClose }: EmailDnsModalProps) {
       }}
     >
       <p className={parkedStyles.hint}>
-        Paste each DKIM <strong>TXT value</strong> (<code>v=DKIM1; …</code>) from
-        Stalwart, or the full zone line. For value-only pastes, fill the selector
-        (for example <code>v1-ed25519-20260901</code>). We upsert common mail
-        records on {dnsProvider === 'cloudflare' ? 'Cloudflare' : 'Arvan'}{' '}
-        (DNS-only / not proxied): <strong>mail</strong> A → 185.214.101.41, MX →
-        mail.meshkee.com (priority 10), SPF <code>v=spf1 mx -all</code>, both
-        DKIM keys, autoconfig / autodiscover → mail.meshkee.com. Extra MX,{' '}
-        <strong>dkim._domainkey</strong>, and <strong>_dmarc</strong> are removed.
+        Paste the RSA DKIM <strong>TXT value</strong> (<code>v=DKIM1; …</code>) from
+        Stalwart, or the full zone line. Ed25519 is optional — leave it empty to
+        skip. For value-only pastes, fill the selector (for example{' '}
+        <code>v1-rsa-20260901</code>). We upsert common mail records on{' '}
+        {dnsProvider === 'cloudflare' ? 'Cloudflare' : 'Arvan'} (DNS-only / not
+        proxied): <strong>mail</strong> A → 185.214.101.41, MX → mail.meshkee.com
+        (priority 10), SPF <code>v=spf1 mx -all</code>, DKIM (RSA required,
+        Ed25519 if provided), autoconfig / autodiscover → mail.meshkee.com. Extra
+        MX, <strong>dkim._domainkey</strong>, and <strong>_dmarc</strong> are
+        removed.
       </p>
       {error ? (
         <p className={tableStyles.alertError} role="alert">
@@ -115,7 +125,9 @@ export function EmailDnsModal({ domain, onClose }: EmailDnsModalProps) {
       </div>
 
       <div className={tableStyles.field}>
-        <label htmlFor="mail-dkim-ed25519-selector">Ed25519 selector</label>
+        <label htmlFor="mail-dkim-ed25519-selector">
+          Ed25519 selector <span className={tableStyles.helperText}>(optional)</span>
+        </label>
         <input
           id="mail-dkim-ed25519-selector"
           className={styles.selectorInput}
@@ -129,18 +141,20 @@ export function EmailDnsModal({ domain, onClose }: EmailDnsModalProps) {
           autoComplete="off"
         />
         <p className={tableStyles.helperText}>
-          Needed when pasting only the TXT value. Optional if the paste includes{' '}
-          <code>…._domainkey</code>.
+          Only needed with an Ed25519 paste that has no <code>…._domainkey</code>.
         </p>
       </div>
       <div className={tableStyles.field}>
-        <label htmlFor="mail-dkim-ed25519">Ed25519 domain key</label>
+        <label htmlFor="mail-dkim-ed25519">
+          Ed25519 domain key{' '}
+          <span className={tableStyles.helperText}>(optional)</span>
+        </label>
         <textarea
           id="mail-dkim-ed25519"
           className={styles.textarea}
           value={ed25519Key}
           onChange={(e) => setEd25519Key(e.target.value)}
-          placeholder='v=DKIM1; k=ed25519; h=sha256; p=…'
+          placeholder="Leave empty to skip — or paste v=DKIM1; k=ed25519; …"
           disabled={submitting}
           spellCheck={false}
           dir="ltr"
diff --git a/apps/super-admin/src/services/domainService.ts b/apps/super-admin/src/services/domainService.ts
index b0d9ce8..61323e3 100644
--- a/apps/super-admin/src/services/domainService.ts
+++ b/apps/super-admin/src/services/domainService.ts
@@ -112,8 +112,8 @@ export async function applyMailDns(
   domainId: number | string,
   payload: {
     dnsProvider: 'arvan' | 'cloudflare'
-    ed25519Key: string
     rsaKey: string
+    ed25519Key?: string
     ed25519Selector?: string
     rsaSelector?: string
   },