imapkit 5.3.0 → 5.3.2

package/dist/cjs/oauth/pages.js

@@ -46,7 +46,8 @@ ul.scopes{list-style:none;padding:0;margin:0 0 12px;border:1px solid var(--line)
 ul.scopes li{display:flex;gap:10px;padding:8px 12px;border-top:1px solid var(--line);align-items:baseline}
 ul.scopes li:first-child{border-top:0}
 .ck{color:var(--ok);font-weight:700}
-.raw{margin-left:auto;font-family:ui-monospace,Menlo,monospace;font-size:11.5px;color:var(--muted);text-align:right;overflow-wrap:anywhere}
+ul.scopes li>span:nth-child(2){flex:1;min-width:0}
+.raw{margin-left:auto;font-family:ui-monospace,Menlo,monospace;font-size:11.5px;color:var(--muted);text-align:right;white-space:nowrap}
 .redir{font-size:13px;color:var(--muted);margin:0 0 16px;overflow-wrap:anywhere}
 .btns{display:flex;flex-direction:row-reverse;gap:10px;margin:0 0 12px}
 button{flex:1;font:inherit;font-weight:600;padding:10px 14px;border-radius:8px;border:1px solid var(--line);background:var(--card);color:var(--text);cursor:pointer;text-align:center;text-decoration:none}
@@ -70,6 +71,7 @@ table{width:100%;border-collapse:collapse;font-size:13.5px;margin:0 0 6px}
 th,td{text-align:left;padding:7px 8px;border-bottom:1px solid var(--line);vertical-align:top}
 th{font-size:12px;color:var(--muted);text-transform:uppercase;letter-spacing:.04em}
 footer{border-top:1px solid var(--line);padding:12px 26px;font-size:12.5px;color:var(--muted)}
+footer a{color:var(--accent)}
 @media (max-width:480px){body{padding:0}main{border-radius:0;border-left:0;border-right:0}.body{padding:20px 16px}footer{padding:12px 16px}}
 `;
 const AVATAR_COLORS = ['#7c5cf6', '#0e9f6e', '#d9480f', '#1c7ed6', '#c2255c', '#5c7cfa', '#2b8a3e'];
@@ -146,7 +148,8 @@ function consentPage(data) {
         checks.push({ level: 'note', text: 'ignored parameters: ' + request.ignored.join(', ') });
     }
     const passed = checks.filter(check => check.level === 'ok').length;
-    const flagged = checks.length - passed;
+    const warnings = checks.filter(check => check.level === 'warn').length;
+    const notes = checks.length - passed - warnings;
     const hasWarning = checks.some(check => check.level === 'warn');
     let target = request.redirectUri;
     let loopback = false;
@@ -228,7 +231,8 @@ function consentPage(data) {
         '><summary>Request details (' +
         passed +
         ' passed' +
-        (flagged ? ', ' + flagged + ' to look at' : '') +
+        (warnings ? ', ' + warnings + (warnings === 1 ? ' warning' : ' warnings') : '') +
+        (notes ? ', ' + notes + (notes === 1 ? ' note' : ' notes') : '') +
         ')</summary><ul class="checks">' +
         checks.map(check => '<li>' + checkTag(check) + '<span>' + escapeHtml(check.text) + '</span></li>').join('') +
         '</ul><p class="kv">' +
@@ -243,7 +247,7 @@ function consentPage(data) {
         '<button type="submit" name="action" value="outcome" formnovalidate>Send</button></div></details>' +
         '</form>';
     return layout('Sign in to ' + client.name, body, {
-        footer: 'Decision source if not answered here: ' + escapeHtml(request.source) + '. This request stays open for 10 minutes.'
+        footer: 'Shown because the sign-in policy is prompt (' + escapeHtml(request.source) + '). This request stays open for 10 minutes.'
     });
 }
 /**
@@ -306,5 +310,8 @@ function indexPage(data) {
         '</p><h2>Endpoints</h2><p class="small">' +
         endpoints.map(path => '<code>' + escapeHtml(path) + '</code>').join(' ') +
         '</p>';
-    return layout('OAuth provider', body, { wide: true, footer: 'Documentation: https://imapkit.com/docs/guides/oauth' });
+    return layout('OAuth provider', body, {
+        wide: true,
+        footer: 'Documentation: <a href="https://imapkit.com/docs/guides/oauth" rel="noreferrer">imapkit.com/docs/guides/oauth</a>'
+    });
 }

package/dist/cjs/server.js

@@ -819,7 +819,11 @@ class IMAPServer extends node_stream_1.Stream {
         const levels = mailbox.path.split(storage.separator);
         const folderName = levels.pop();
         const parentKey = levels.join(storage.separator);
-        const parent = (parentKey !== 'INBOX' && this.folderCache[parentKey]) || storage;
+        // A child of INBOX lives in INBOX's own folders, unless the personal namespace is "INBOX." itself, where its
+        // mailboxes are the namespace's
+        const inboxParent = parentKey.toUpperCase() === 'INBOX';
+        const holdsNamespace = namespace === this.referenceNamespace && this.inboxHoldsNamespace();
+        const parent = ((!inboxParent || !holdsNamespace) && this.folderCache[parentKey]) || storage;
         if (mailbox.folders && Object.keys(mailbox.folders).length && !keepContents) {
             // Sessions that have the mailbox selected keep the old object, a new SELECT finds the
             // placeholder. The placeholder only keeps the children. Plugin data (MAILBOXID, special-use, metadata, ACL,

package/dist/esm/oauth/pages.js

@@ -41,7 +41,8 @@ ul.scopes{list-style:none;padding:0;margin:0 0 12px;border:1px solid var(--line)
 ul.scopes li{display:flex;gap:10px;padding:8px 12px;border-top:1px solid var(--line);align-items:baseline}
 ul.scopes li:first-child{border-top:0}
 .ck{color:var(--ok);font-weight:700}
-.raw{margin-left:auto;font-family:ui-monospace,Menlo,monospace;font-size:11.5px;color:var(--muted);text-align:right;overflow-wrap:anywhere}
+ul.scopes li>span:nth-child(2){flex:1;min-width:0}
+.raw{margin-left:auto;font-family:ui-monospace,Menlo,monospace;font-size:11.5px;color:var(--muted);text-align:right;white-space:nowrap}
 .redir{font-size:13px;color:var(--muted);margin:0 0 16px;overflow-wrap:anywhere}
 .btns{display:flex;flex-direction:row-reverse;gap:10px;margin:0 0 12px}
 button{flex:1;font:inherit;font-weight:600;padding:10px 14px;border-radius:8px;border:1px solid var(--line);background:var(--card);color:var(--text);cursor:pointer;text-align:center;text-decoration:none}
@@ -65,6 +66,7 @@ table{width:100%;border-collapse:collapse;font-size:13.5px;margin:0 0 6px}
 th,td{text-align:left;padding:7px 8px;border-bottom:1px solid var(--line);vertical-align:top}
 th{font-size:12px;color:var(--muted);text-transform:uppercase;letter-spacing:.04em}
 footer{border-top:1px solid var(--line);padding:12px 26px;font-size:12.5px;color:var(--muted)}
+footer a{color:var(--accent)}
 @media (max-width:480px){body{padding:0}main{border-radius:0;border-left:0;border-right:0}.body{padding:20px 16px}footer{padding:12px 16px}}
 `;
 const AVATAR_COLORS = ['#7c5cf6', '#0e9f6e', '#d9480f', '#1c7ed6', '#c2255c', '#5c7cfa', '#2b8a3e'];
@@ -141,7 +143,8 @@ export function consentPage(data) {
         checks.push({ level: 'note', text: 'ignored parameters: ' + request.ignored.join(', ') });
     }
     const passed = checks.filter(check => check.level === 'ok').length;
-    const flagged = checks.length - passed;
+    const warnings = checks.filter(check => check.level === 'warn').length;
+    const notes = checks.length - passed - warnings;
     const hasWarning = checks.some(check => check.level === 'warn');
     let target = request.redirectUri;
     let loopback = false;
@@ -223,7 +226,8 @@ export function consentPage(data) {
         '><summary>Request details (' +
         passed +
         ' passed' +
-        (flagged ? ', ' + flagged + ' to look at' : '') +
+        (warnings ? ', ' + warnings + (warnings === 1 ? ' warning' : ' warnings') : '') +
+        (notes ? ', ' + notes + (notes === 1 ? ' note' : ' notes') : '') +
         ')</summary><ul class="checks">' +
         checks.map(check => '<li>' + checkTag(check) + '<span>' + escapeHtml(check.text) + '</span></li>').join('') +
         '</ul><p class="kv">' +
@@ -238,7 +242,7 @@ export function consentPage(data) {
         '<button type="submit" name="action" value="outcome" formnovalidate>Send</button></div></details>' +
         '</form>';
     return layout('Sign in to ' + client.name, body, {
-        footer: 'Decision source if not answered here: ' + escapeHtml(request.source) + '. This request stays open for 10 minutes.'
+        footer: 'Shown because the sign-in policy is prompt (' + escapeHtml(request.source) + '). This request stays open for 10 minutes.'
     });
 }
 /**
@@ -301,5 +305,8 @@ export function indexPage(data) {
         '</p><h2>Endpoints</h2><p class="small">' +
         endpoints.map(path => '<code>' + escapeHtml(path) + '</code>').join(' ') +
         '</p>';
-    return layout('OAuth provider', body, { wide: true, footer: 'Documentation: https://imapkit.com/docs/guides/oauth' });
+    return layout('OAuth provider', body, {
+        wide: true,
+        footer: 'Documentation: <a href="https://imapkit.com/docs/guides/oauth" rel="noreferrer">imapkit.com/docs/guides/oauth</a>'
+    });
 }

package/dist/esm/server.js

@@ -778,7 +778,11 @@ class IMAPServer extends Stream {
         const levels = mailbox.path.split(storage.separator);
         const folderName = levels.pop();
         const parentKey = levels.join(storage.separator);
-        const parent = (parentKey !== 'INBOX' && this.folderCache[parentKey]) || storage;
+        // A child of INBOX lives in INBOX's own folders, unless the personal namespace is "INBOX." itself, where its
+        // mailboxes are the namespace's
+        const inboxParent = parentKey.toUpperCase() === 'INBOX';
+        const holdsNamespace = namespace === this.referenceNamespace && this.inboxHoldsNamespace();
+        const parent = ((!inboxParent || !holdsNamespace) && this.folderCache[parentKey]) || storage;
         if (mailbox.folders && Object.keys(mailbox.folders).length && !keepContents) {
             // Sessions that have the mailbox selected keep the old object, a new SELECT finds the
             // placeholder. The placeholder only keeps the children. Plugin data (MAILBOXID, special-use, metadata, ACL,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapkit",
-    "version": "5.3.0",
+    "version": "5.3.2",
     "description": "Scriptable, strictly RFC compliant in-memory IMAP server for testing IMAP clients",
     "type": "module",
     "main": "./dist/cjs/index.js",