@rubytech/create-maxy-code 0.1.439 → 0.1.441
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/payload/platform/plugins/admin/skills/platform-architecture/SKILL.md +41 -12
- package/payload/platform/plugins/cloudflare/skills/calendar-site/SKILL.md +15 -5
- package/payload/platform/plugins/cloudflare/skills/calendar-site/template/functions/api/calendar/free-busy.ts +152 -0
- package/payload/platform/plugins/cloudflare/skills/calendar-site/template/public/index.html +6 -3
- package/payload/platform/plugins/cloudflare/skills/calendar-site/template/schema.sql +11 -0
- package/payload/platform/plugins/docs/references/admin-identity-gate.md +32 -17
- package/payload/platform/plugins/docs/references/admin-ui.md +1 -1
- package/payload/platform/plugins/docs/references/calendar-booking.md +1 -1
- package/payload/platform/plugins/docs/references/graph.md +19 -3
- package/payload/platform/plugins/docs/references/internals.md +2 -2
- package/payload/platform/plugins/docs/references/outlook-guide.md +9 -4
- package/payload/platform/plugins/docs/references/troubleshooting.md +8 -0
- package/payload/platform/plugins/graph/.claude-plugin/plugin.json +19 -0
- package/payload/platform/plugins/graph/PLUGIN.md +10 -4
- package/payload/platform/plugins/outlook/.claude-plugin/plugin.json +1 -1
- package/payload/platform/plugins/outlook/PLUGIN.md +7 -3
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/account-register.test.js +100 -10
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/account-register.test.js.map +1 -1
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mail-list.test.d.ts +2 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mail-list.test.d.ts.map +1 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mail-list.test.js +55 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mail-list.test.js.map +1 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mailbox-list.test.d.ts +2 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mailbox-list.test.d.ts.map +1 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mailbox-list.test.js +64 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mailbox-list.test.js.map +1 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mailbox-registry.test.d.ts +2 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mailbox-registry.test.d.ts.map +1 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mailbox-registry.test.js +193 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/mailbox-registry.test.js.map +1 -0
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/token-store.test.js +58 -1
- package/payload/platform/plugins/outlook/mcp/dist/__tests__/token-store.test.js.map +1 -1
- package/payload/platform/plugins/outlook/mcp/dist/auth/mailbox-registry.d.ts +81 -0
- package/payload/platform/plugins/outlook/mcp/dist/auth/mailbox-registry.d.ts.map +1 -0
- package/payload/platform/plugins/outlook/mcp/dist/auth/mailbox-registry.js +171 -0
- package/payload/platform/plugins/outlook/mcp/dist/auth/mailbox-registry.js.map +1 -0
- package/payload/platform/plugins/outlook/mcp/dist/auth/token-store.d.ts +16 -1
- package/payload/platform/plugins/outlook/mcp/dist/auth/token-store.d.ts.map +1 -1
- package/payload/platform/plugins/outlook/mcp/dist/auth/token-store.js +25 -3
- package/payload/platform/plugins/outlook/mcp/dist/auth/token-store.js.map +1 -1
- package/payload/platform/plugins/outlook/mcp/dist/index.js +119 -50
- package/payload/platform/plugins/outlook/mcp/dist/index.js.map +1 -1
- package/payload/platform/plugins/outlook/mcp/dist/lib/graph-client.js +1 -1
- package/payload/platform/plugins/outlook/mcp/dist/lib/graph-client.js.map +1 -1
- package/payload/platform/plugins/outlook/mcp/dist/tools/account-register.d.ts +8 -4
- package/payload/platform/plugins/outlook/mcp/dist/tools/account-register.d.ts.map +1 -1
- package/payload/platform/plugins/outlook/mcp/dist/tools/account-register.js +22 -3
- package/payload/platform/plugins/outlook/mcp/dist/tools/account-register.js.map +1 -1
- package/payload/platform/plugins/outlook/mcp/dist/tools/mail-list.d.ts +17 -0
- package/payload/platform/plugins/outlook/mcp/dist/tools/mail-list.d.ts.map +1 -1
- package/payload/platform/plugins/outlook/mcp/dist/tools/mail-list.js +84 -21
- package/payload/platform/plugins/outlook/mcp/dist/tools/mail-list.js.map +1 -1
- package/payload/platform/plugins/outlook/mcp/dist/tools/mailbox-list.d.ts +26 -0
- package/payload/platform/plugins/outlook/mcp/dist/tools/mailbox-list.d.ts.map +1 -0
- package/payload/platform/plugins/outlook/mcp/dist/tools/mailbox-list.js +28 -0
- package/payload/platform/plugins/outlook/mcp/dist/tools/mailbox-list.js.map +1 -0
- package/payload/platform/plugins/outlook/references/auth.md +36 -8
- package/payload/platform/plugins/outlook/references/graph-surfaces.md +15 -1
- package/payload/platform/plugins/scheduling/mcp/dist/scripts/publish-availability.d.ts +27 -0
- package/payload/platform/plugins/scheduling/mcp/dist/scripts/publish-availability.d.ts.map +1 -0
- package/payload/platform/plugins/scheduling/mcp/dist/scripts/publish-availability.js +241 -0
- package/payload/platform/plugins/scheduling/mcp/dist/scripts/publish-availability.js.map +1 -0
- package/payload/platform/scripts/__tests__/account-schema-owned-dirs.test.sh +100 -0
- package/payload/platform/scripts/lib/account-schema-owned-dirs.py +207 -0
- package/payload/platform/scripts/lib/account-schema-owned-dirs.sh +33 -0
- package/payload/platform/scripts/lib/provision-account-dir.sh +7 -0
- package/payload/platform/scripts/setup-account.sh +10 -0
- package/payload/platform/services/claude-session-manager/dist/canonical-tool-names.generated.d.ts.map +1 -1
- package/payload/platform/services/claude-session-manager/dist/canonical-tool-names.generated.js +1 -0
- package/payload/platform/services/claude-session-manager/dist/canonical-tool-names.generated.js.map +1 -1
- package/payload/platform/services/claude-session-manager/dist/http-server.d.ts.map +1 -1
- package/payload/platform/services/claude-session-manager/dist/http-server.js +6 -4
- package/payload/platform/services/claude-session-manager/dist/http-server.js.map +1 -1
- package/payload/platform/services/claude-session-manager/dist/tool-registration-drift.d.ts +7 -6
- package/payload/platform/services/claude-session-manager/dist/tool-registration-drift.d.ts.map +1 -1
- package/payload/platform/services/claude-session-manager/dist/tool-registration-drift.js +56 -7
- package/payload/platform/services/claude-session-manager/dist/tool-registration-drift.js.map +1 -1
- package/payload/platform/templates/specialists/agents/personal-assistant.md +1 -1
- package/payload/server/{chunk-UGPQCVIW.js → chunk-WC4WJR6X.js} +0 -6
- package/payload/server/maxy-edge.js +1 -1
- package/payload/server/public/assets/{AdminLoginScreens-DeR71H29.js → AdminLoginScreens-CukwQufW.js} +1 -1
- package/payload/server/public/assets/AdminShell-BwEBH6tT.js +2 -0
- package/payload/server/public/assets/{admin-C15h-NL0.js → admin-CdFRCUUZ.js} +1 -1
- package/payload/server/public/assets/{browser-B7xQLIRK.js → browser-BWR59IkB.js} +1 -1
- package/payload/server/public/assets/{calendar-A-vGm6pL.js → calendar-kuTcxX1t.js} +1 -1
- package/payload/server/public/assets/chat-ejnq2rck.js +1 -0
- package/payload/server/public/assets/data-dZbOyLdT.js +1 -0
- package/payload/server/public/assets/{graph-D0orIRAh.js → graph-CboWM2_-.js} +2 -2
- package/payload/server/public/assets/{operator-DZzuotDB.js → operator-oSaB1mya.js} +1 -1
- package/payload/server/public/assets/{page-Ck_pLhAk.js → page-DEkI-Gl1.js} +1 -1
- package/payload/server/public/assets/{page-3g0A19Rv.js → page-DMeJHVfA.js} +5 -5
- package/payload/server/public/assets/{public-WFUQw9AD.js → public-C54tl6V4.js} +1 -1
- package/payload/server/public/assets/{useCopyFeedback-CSk9KjhY.js → useCopyFeedback-DHoYHiK9.js} +1 -1
- package/payload/server/public/assets/{useVoiceRecorder-DCyJQkFK.js → useVoiceRecorder-b7HzTFs0.js} +1 -1
- package/payload/server/public/browser.html +2 -2
- package/payload/server/public/calendar.html +2 -2
- package/payload/server/public/chat.html +5 -5
- package/payload/server/public/data.html +3 -3
- package/payload/server/public/graph.html +3 -3
- package/payload/server/public/index.html +5 -5
- package/payload/server/public/operator.html +6 -6
- package/payload/server/public/public.html +5 -5
- package/payload/server/server.js +255 -112
- package/payload/server/public/assets/AdminShell-DlAVQUda.js +0 -2
- package/payload/server/public/assets/chat-DAae6Z51.js +0 -1
- package/payload/server/public/assets/data-BNWpKx1d.js +0 -1
|
@@ -0,0 +1,193 @@
|
|
|
1
|
+
import test from "node:test";
|
|
2
|
+
import assert from "node:assert/strict";
|
|
3
|
+
import { mkdtempSync, rmSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
|
|
4
|
+
import { tmpdir } from "node:os";
|
|
5
|
+
import { join } from "node:path";
|
|
6
|
+
import { TokenStore } from "../auth/token-store.js";
|
|
7
|
+
import { MailboxRegistry, credResolveEvent } from "../auth/mailbox-registry.js";
|
|
8
|
+
function makeAccountsDir() {
|
|
9
|
+
const dir = mkdtempSync(join(tmpdir(), "outlook-reg-"));
|
|
10
|
+
return { dir, cleanup: () => rmSync(dir, { recursive: true, force: true }) };
|
|
11
|
+
}
|
|
12
|
+
test("MailboxRegistry migrates a legacy single-mailbox layout on read", () => {
|
|
13
|
+
const { dir, cleanup } = makeAccountsDir();
|
|
14
|
+
try {
|
|
15
|
+
// Seed the pre-migration layout: one tokens.enc at the account root.
|
|
16
|
+
new TokenStore("acct", dir).store("access-rob", "refresh-rob", 3600, {
|
|
17
|
+
graphUserId: "rob-guid",
|
|
18
|
+
mail: "rob@ecolecltd.co.uk",
|
|
19
|
+
scopes: ["Mail.Read"],
|
|
20
|
+
});
|
|
21
|
+
const legacyPath = join(dir, "acct", "secrets", "outlook", "tokens.enc");
|
|
22
|
+
assert.ok(existsSync(legacyPath), "precondition: legacy tokens.enc present");
|
|
23
|
+
const reg = new MailboxRegistry("acct", dir);
|
|
24
|
+
const boxes = reg.list();
|
|
25
|
+
assert.ok(!existsSync(legacyPath), "legacy tokens.enc must be moved away");
|
|
26
|
+
assert.ok(existsSync(join(dir, "acct", "secrets", "outlook", "mailboxes", "rob-guid", "tokens.enc")), "migrated blob must live under mailboxes/<graphUserId>");
|
|
27
|
+
assert.equal(boxes.length, 1);
|
|
28
|
+
assert.equal(boxes[0].graphUserId, "rob-guid");
|
|
29
|
+
assert.equal(boxes[0].mail, "rob@ecolecltd.co.uk");
|
|
30
|
+
assert.equal(boxes[0].readable, true);
|
|
31
|
+
// No re-auth: the migrated blob still decrypts to the same tokens.
|
|
32
|
+
assert.equal(reg.resolve("rob-guid").kind, "ok");
|
|
33
|
+
}
|
|
34
|
+
finally {
|
|
35
|
+
cleanup();
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
test("MailboxRegistry lists two coexisting mailboxes", () => {
|
|
39
|
+
const { dir, cleanup } = makeAccountsDir();
|
|
40
|
+
try {
|
|
41
|
+
new TokenStore("acct", dir, "rob-guid").store("a", "r", 3600, {
|
|
42
|
+
graphUserId: "rob-guid", mail: "rob@ecolecltd.co.uk", scopes: [],
|
|
43
|
+
});
|
|
44
|
+
new TokenStore("acct", dir, "info-guid").store("a", "r", 3600, {
|
|
45
|
+
graphUserId: "info-guid", mail: "info@ecolecltd.co.uk", scopes: [],
|
|
46
|
+
});
|
|
47
|
+
const boxes = new MailboxRegistry("acct", dir).list();
|
|
48
|
+
assert.equal(boxes.length, 2);
|
|
49
|
+
const mails = boxes.map((b) => b.mail).sort();
|
|
50
|
+
assert.deepEqual(mails, ["info@ecolecltd.co.uk", "rob@ecolecltd.co.uk"]);
|
|
51
|
+
}
|
|
52
|
+
finally {
|
|
53
|
+
cleanup();
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
test("MailboxRegistry.resolve — none / sole / ambiguous / explicit / notfound", () => {
|
|
57
|
+
const { dir, cleanup } = makeAccountsDir();
|
|
58
|
+
try {
|
|
59
|
+
const reg = new MailboxRegistry("acct", dir);
|
|
60
|
+
assert.equal(reg.resolve().kind, "none", "no mailboxes → none");
|
|
61
|
+
new TokenStore("acct", dir, "rob-guid").store("a", "r", 3600, {
|
|
62
|
+
graphUserId: "rob-guid", mail: "rob@ecolecltd.co.uk", scopes: [],
|
|
63
|
+
});
|
|
64
|
+
const sole = new MailboxRegistry("acct", dir).resolve();
|
|
65
|
+
assert.equal(sole.kind, "ok", "single mailbox, no selector → ok");
|
|
66
|
+
new TokenStore("acct", dir, "info-guid").store("a", "r", 3600, {
|
|
67
|
+
graphUserId: "info-guid", mail: "info@ecolecltd.co.uk", scopes: [],
|
|
68
|
+
});
|
|
69
|
+
const reg2 = new MailboxRegistry("acct", dir);
|
|
70
|
+
const ambiguous = reg2.resolve();
|
|
71
|
+
assert.equal(ambiguous.kind, "ambiguous");
|
|
72
|
+
if (ambiguous.kind === "ambiguous") {
|
|
73
|
+
assert.deepEqual(ambiguous.identities.slice().sort(), ["info@ecolecltd.co.uk", "rob@ecolecltd.co.uk"]);
|
|
74
|
+
}
|
|
75
|
+
// Explicit selection by mail is case-insensitive and picks the right store.
|
|
76
|
+
const byMail = reg2.resolve("ROB@ecolecltd.co.uk");
|
|
77
|
+
assert.equal(byMail.kind, "ok");
|
|
78
|
+
if (byMail.kind === "ok") {
|
|
79
|
+
assert.equal(byMail.descriptor.graphUserId, "rob-guid");
|
|
80
|
+
}
|
|
81
|
+
// Explicit selection by graphUserId.
|
|
82
|
+
assert.equal(reg2.resolve("info-guid").kind, "ok");
|
|
83
|
+
const missing = reg2.resolve("nobody@ecolecltd.co.uk");
|
|
84
|
+
assert.equal(missing.kind, "notfound");
|
|
85
|
+
if (missing.kind === "notfound") {
|
|
86
|
+
assert.equal(missing.selector, "nobody@ecolecltd.co.uk");
|
|
87
|
+
assert.equal(missing.identities.length, 2);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
finally {
|
|
91
|
+
cleanup();
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
test("MailboxRegistry surfaces an unreadable blob without crashing", () => {
|
|
95
|
+
const { dir, cleanup } = makeAccountsDir();
|
|
96
|
+
try {
|
|
97
|
+
// One good mailbox so the account key exists.
|
|
98
|
+
new TokenStore("acct", dir, "good-guid").store("a", "r", 3600, {
|
|
99
|
+
graphUserId: "good-guid", mail: "good@x.com", scopes: [],
|
|
100
|
+
});
|
|
101
|
+
// A corrupt mailbox blob on disk.
|
|
102
|
+
const badDir = join(dir, "acct", "secrets", "outlook", "mailboxes", "bad-guid");
|
|
103
|
+
mkdirSync(badDir, { recursive: true });
|
|
104
|
+
writeFileSync(join(badDir, "tokens.enc"), "garbage-not-a-cipher");
|
|
105
|
+
const boxes = new MailboxRegistry("acct", dir).list();
|
|
106
|
+
assert.equal(boxes.length, 2, "both good and bad mailboxes listed");
|
|
107
|
+
const bad = boxes.find((b) => b.mailboxKey === "bad-guid");
|
|
108
|
+
assert.ok(bad, "corrupt mailbox must still appear");
|
|
109
|
+
assert.equal(bad.readable, false);
|
|
110
|
+
// Safety: a second, unreadable mailbox still forces a selector rather than
|
|
111
|
+
// silently resolving to the one readable mailbox — a no-selector call must
|
|
112
|
+
// not silently send from the wrong mailbox.
|
|
113
|
+
const res = new MailboxRegistry("acct", dir).resolve();
|
|
114
|
+
assert.equal(res.kind, "ambiguous");
|
|
115
|
+
if (res.kind === "ambiguous") {
|
|
116
|
+
assert.ok(res.identities.some((i) => i.includes("bad-guid") && i.includes("unreadable")));
|
|
117
|
+
}
|
|
118
|
+
// Naming the readable mailbox still resolves it.
|
|
119
|
+
assert.equal(new MailboxRegistry("acct", dir).resolve("good@x.com").kind, "ok");
|
|
120
|
+
}
|
|
121
|
+
finally {
|
|
122
|
+
cleanup();
|
|
123
|
+
}
|
|
124
|
+
});
|
|
125
|
+
test("MailboxRegistry resolves a lone unreadable mailbox to none, not a crash", () => {
|
|
126
|
+
const { dir, cleanup } = makeAccountsDir();
|
|
127
|
+
try {
|
|
128
|
+
// Establish the account key, then corrupt the only mailbox.
|
|
129
|
+
new TokenStore("acct", dir, "solo-guid").store("a", "r", 3600, {
|
|
130
|
+
graphUserId: "solo-guid", mail: "solo@x.com", scopes: [],
|
|
131
|
+
});
|
|
132
|
+
writeFileSync(join(dir, "acct", "secrets", "outlook", "mailboxes", "solo-guid", "tokens.enc"), "garbage");
|
|
133
|
+
assert.equal(new MailboxRegistry("acct", dir).resolve().kind, "none");
|
|
134
|
+
}
|
|
135
|
+
finally {
|
|
136
|
+
cleanup();
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
test("credResolveEvent names the resolved mailbox and its source (not a silent default)", () => {
|
|
140
|
+
const { dir, cleanup } = makeAccountsDir();
|
|
141
|
+
try {
|
|
142
|
+
new TokenStore("acct", dir, "rob-guid").store("a", "r", 3600, {
|
|
143
|
+
graphUserId: "rob-guid", mail: "rob@ecolecltd.co.uk", scopes: [],
|
|
144
|
+
});
|
|
145
|
+
new TokenStore("acct", dir, "info-guid").store("a", "r", 3600, {
|
|
146
|
+
graphUserId: "info-guid", mail: "info@ecolecltd.co.uk", scopes: [],
|
|
147
|
+
});
|
|
148
|
+
const reg = new MailboxRegistry("acct", dir);
|
|
149
|
+
// Explicit selection logs the chosen mailbox, source=arg. Proves selection.
|
|
150
|
+
const argEv = credResolveEvent(reg.resolve("info@ecolecltd.co.uk"), "acct", "info@ecolecltd.co.uk");
|
|
151
|
+
assert.equal(argEv.mailbox, "info@ecolecltd.co.uk");
|
|
152
|
+
assert.equal(argEv.source, "arg");
|
|
153
|
+
// Ambiguous refusal logs source=refused, never a silent fall-through.
|
|
154
|
+
const refusedEv = credResolveEvent(reg.resolve(), "acct");
|
|
155
|
+
assert.equal(refusedEv.source, "refused");
|
|
156
|
+
}
|
|
157
|
+
finally {
|
|
158
|
+
cleanup();
|
|
159
|
+
}
|
|
160
|
+
});
|
|
161
|
+
test("credResolveEvent marks the sole mailbox source=sole", () => {
|
|
162
|
+
const { dir, cleanup } = makeAccountsDir();
|
|
163
|
+
try {
|
|
164
|
+
new TokenStore("acct", dir, "only-guid").store("a", "r", 3600, {
|
|
165
|
+
graphUserId: "only-guid", mail: "only@x.com", scopes: [],
|
|
166
|
+
});
|
|
167
|
+
const ev = credResolveEvent(new MailboxRegistry("acct", dir).resolve(), "acct");
|
|
168
|
+
assert.equal(ev.mailbox, "only@x.com");
|
|
169
|
+
assert.equal(ev.source, "sole");
|
|
170
|
+
}
|
|
171
|
+
finally {
|
|
172
|
+
cleanup();
|
|
173
|
+
}
|
|
174
|
+
});
|
|
175
|
+
test("MailboxRegistry.storeFor overwrites the same mailbox in place", () => {
|
|
176
|
+
const { dir, cleanup } = makeAccountsDir();
|
|
177
|
+
try {
|
|
178
|
+
const reg = new MailboxRegistry("acct", dir);
|
|
179
|
+
reg.storeFor("rob-guid").store("access-1", "r", 3600, {
|
|
180
|
+
graphUserId: "rob-guid", mail: "rob@x.com", scopes: [],
|
|
181
|
+
});
|
|
182
|
+
reg.storeFor("rob-guid").store("access-2", "r", 3600, {
|
|
183
|
+
graphUserId: "rob-guid", mail: "rob@x.com", scopes: [],
|
|
184
|
+
});
|
|
185
|
+
const boxes = new MailboxRegistry("acct", dir).list();
|
|
186
|
+
assert.equal(boxes.length, 1, "re-register must not duplicate the mailbox");
|
|
187
|
+
assert.equal(reg.storeFor("rob-guid").read().accessToken, "access-2");
|
|
188
|
+
}
|
|
189
|
+
finally {
|
|
190
|
+
cleanup();
|
|
191
|
+
}
|
|
192
|
+
});
|
|
193
|
+
//# sourceMappingURL=mailbox-registry.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mailbox-registry.test.js","sourceRoot":"","sources":["../../src/__tests__/mailbox-registry.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import test from "node:test";
|
|
2
2
|
import assert from "node:assert/strict";
|
|
3
|
-
import { mkdtempSync, rmSync, statSync, writeFileSync, readFileSync } from "node:fs";
|
|
3
|
+
import { mkdtempSync, rmSync, statSync, writeFileSync, readFileSync, existsSync } from "node:fs";
|
|
4
4
|
import { tmpdir } from "node:os";
|
|
5
5
|
import { join } from "node:path";
|
|
6
6
|
import { TokenStore } from "../auth/token-store.js";
|
|
@@ -111,6 +111,63 @@ test("TokenStore.needsRefresh returns false outside the threshold window", () =>
|
|
|
111
111
|
cleanup();
|
|
112
112
|
}
|
|
113
113
|
});
|
|
114
|
+
test("TokenStore round-trip preserves the mail field", () => {
|
|
115
|
+
const { dir, cleanup } = makeAccountsDir();
|
|
116
|
+
try {
|
|
117
|
+
const store = new TokenStore("acct-mail", dir, "user-1");
|
|
118
|
+
store.store("access-1", "refresh-1", 3600, {
|
|
119
|
+
graphUserId: "user-1",
|
|
120
|
+
mail: "rob@ecolecltd.co.uk",
|
|
121
|
+
scopes: ["Mail.Read"],
|
|
122
|
+
});
|
|
123
|
+
const blob = new TokenStore("acct-mail", dir, "user-1").read();
|
|
124
|
+
assert.equal(blob.mail, "rob@ecolecltd.co.uk");
|
|
125
|
+
}
|
|
126
|
+
finally {
|
|
127
|
+
cleanup();
|
|
128
|
+
}
|
|
129
|
+
});
|
|
130
|
+
test("TokenStore per-mailbox stores share one account key with disjoint token files", () => {
|
|
131
|
+
const { dir, cleanup } = makeAccountsDir();
|
|
132
|
+
try {
|
|
133
|
+
const a = new TokenStore("acct-multi", dir, "user-A");
|
|
134
|
+
const b = new TokenStore("acct-multi", dir, "user-B");
|
|
135
|
+
a.store("access-A", "refresh-A", 3600, { graphUserId: "user-A", mail: "a@x.com", scopes: [] });
|
|
136
|
+
b.store("access-B", "refresh-B", 3600, { graphUserId: "user-B", mail: "b@x.com", scopes: [] });
|
|
137
|
+
const base = join(dir, "acct-multi", "secrets", "outlook");
|
|
138
|
+
// Disjoint token files, one per mailbox.
|
|
139
|
+
assert.ok(existsSync(join(base, "mailboxes", "user-A", "tokens.enc")), "mailbox A tokens missing");
|
|
140
|
+
assert.ok(existsSync(join(base, "mailboxes", "user-B", "tokens.enc")), "mailbox B tokens missing");
|
|
141
|
+
// Exactly one account-level key, shared by both mailboxes.
|
|
142
|
+
assert.ok(existsSync(join(base, ".key")), "shared account key missing");
|
|
143
|
+
assert.ok(!existsSync(join(base, "mailboxes", "user-A", ".key")), "mailbox must not hold its own key");
|
|
144
|
+
// Each store reads back its own blob; the single key decrypts both.
|
|
145
|
+
assert.equal(new TokenStore("acct-multi", dir, "user-A").read().accessToken, "access-A");
|
|
146
|
+
assert.equal(new TokenStore("acct-multi", dir, "user-B").read().accessToken, "access-B");
|
|
147
|
+
}
|
|
148
|
+
finally {
|
|
149
|
+
cleanup();
|
|
150
|
+
}
|
|
151
|
+
});
|
|
152
|
+
test("TokenStore.store preserves mail when omitted (refresh-style call)", () => {
|
|
153
|
+
const { dir, cleanup } = makeAccountsDir();
|
|
154
|
+
try {
|
|
155
|
+
const store = new TokenStore("acct-refresh", dir, "user-1");
|
|
156
|
+
store.store("access-1", "refresh-1", 3600, {
|
|
157
|
+
graphUserId: "user-1",
|
|
158
|
+
mail: "keep@me.com",
|
|
159
|
+
scopes: ["Mail.Read"],
|
|
160
|
+
});
|
|
161
|
+
// Refresh path stores new access token but does not re-pass mail.
|
|
162
|
+
store.store("access-2", "refresh-1", 3600, { graphUserId: "user-1", scopes: ["Mail.Read"] });
|
|
163
|
+
const blob = new TokenStore("acct-refresh", dir, "user-1").read();
|
|
164
|
+
assert.equal(blob.accessToken, "access-2");
|
|
165
|
+
assert.equal(blob.mail, "keep@me.com", "mail must survive a refresh-style store");
|
|
166
|
+
}
|
|
167
|
+
finally {
|
|
168
|
+
cleanup();
|
|
169
|
+
}
|
|
170
|
+
});
|
|
114
171
|
test("TokenStore.clear removes the token blob but leaves the key", () => {
|
|
115
172
|
const { dir, cleanup } = makeAccountsDir();
|
|
116
173
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-store.test.js","sourceRoot":"","sources":["../../src/__tests__/token-store.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"token-store.test.js","sourceRoot":"","sources":["../../src/__tests__/token-store.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Per-account registry of Outlook mailboxes.
|
|
3
|
+
*
|
|
4
|
+
* A sub-account can hold N mailboxes at once. Each mailbox is its own encrypted
|
|
5
|
+
* `tokens.enc` under `secrets/outlook/mailboxes/<graphUserId>/`, sharing the one
|
|
6
|
+
* account-level AES `.key`. This registry enumerates them, migrates the legacy
|
|
7
|
+
* single-mailbox layout on first read, and resolves a caller's mailbox selector
|
|
8
|
+
* down to the right TokenStore.
|
|
9
|
+
*
|
|
10
|
+
* Migration preserves the AES key, so the legacy ciphertext is valid as-is under
|
|
11
|
+
* the new path — migration is a file move, never a re-encrypt, and never forces
|
|
12
|
+
* a re-auth.
|
|
13
|
+
*/
|
|
14
|
+
import { TokenStore } from "./token-store.js";
|
|
15
|
+
export interface MailboxDescriptor {
|
|
16
|
+
/** Sanitized directory name under `mailboxes/` — an opaque handle. */
|
|
17
|
+
mailboxKey: string;
|
|
18
|
+
graphUserId: string | null;
|
|
19
|
+
mail: string | null;
|
|
20
|
+
scopes: string[];
|
|
21
|
+
tokenExpSec: number | null;
|
|
22
|
+
refreshExpired: boolean;
|
|
23
|
+
/** false when the blob failed to decrypt or parse — surfaced, not hidden. */
|
|
24
|
+
readable: boolean;
|
|
25
|
+
}
|
|
26
|
+
export type ResolveResult = {
|
|
27
|
+
kind: "ok";
|
|
28
|
+
store: TokenStore;
|
|
29
|
+
descriptor: MailboxDescriptor;
|
|
30
|
+
} | {
|
|
31
|
+
kind: "none";
|
|
32
|
+
} | {
|
|
33
|
+
kind: "ambiguous";
|
|
34
|
+
identities: string[];
|
|
35
|
+
} | {
|
|
36
|
+
kind: "notfound";
|
|
37
|
+
selector: string;
|
|
38
|
+
identities: string[];
|
|
39
|
+
};
|
|
40
|
+
export interface CredResolveEvent {
|
|
41
|
+
event: "cred-resolve";
|
|
42
|
+
account: string;
|
|
43
|
+
mailbox: string;
|
|
44
|
+
source: "arg" | "sole" | "none" | "refused";
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* The observability line for a resolution: names the *resolved* mailbox and how
|
|
48
|
+
* it was chosen, so a wrong or absent selector is diagnosable from one line
|
|
49
|
+
* without decrypting the store. Pure — computed from the resolve result and the
|
|
50
|
+
* caller's selector, so selection (not a silent default) is testable.
|
|
51
|
+
*/
|
|
52
|
+
export declare function credResolveEvent(resolved: ResolveResult, account: string, selector?: string): CredResolveEvent;
|
|
53
|
+
export declare class MailboxRegistry {
|
|
54
|
+
readonly accountId: string;
|
|
55
|
+
private readonly accountsDir;
|
|
56
|
+
private readonly secretsDir;
|
|
57
|
+
private readonly mailboxesDir;
|
|
58
|
+
private readonly legacyTokensPath;
|
|
59
|
+
constructor(accountId: string, accountsDir: string);
|
|
60
|
+
/**
|
|
61
|
+
* Move a pre-migration `secrets/outlook/tokens.enc` into
|
|
62
|
+
* `mailboxes/<graphUserId>/tokens.enc`. Idempotent: a no-op once the legacy
|
|
63
|
+
* file is gone. Reads the blob only to learn its mailbox key; the ciphertext
|
|
64
|
+
* itself is moved unchanged (same account key).
|
|
65
|
+
*/
|
|
66
|
+
private migrateLegacy;
|
|
67
|
+
/** Every mailbox attached to this account, migrating legacy on first read. */
|
|
68
|
+
list(): MailboxDescriptor[];
|
|
69
|
+
private describe;
|
|
70
|
+
/**
|
|
71
|
+
* Resolve a mailbox selector to a TokenStore. Order: explicit selector
|
|
72
|
+
* (matched against graphUserId or mail, case-insensitive) → the sole readable
|
|
73
|
+
* mailbox → ambiguous (≥2 readable, none named) → none (zero readable).
|
|
74
|
+
* Unreadable mailboxes are never addressable.
|
|
75
|
+
*/
|
|
76
|
+
resolve(selector?: string): ResolveResult;
|
|
77
|
+
/** A TokenStore for a specific mailbox key (a graphUserId at register time, or
|
|
78
|
+
* a descriptor's mailboxKey). Overwrites that mailbox in place on store(). */
|
|
79
|
+
storeFor(mailboxKey: string): TokenStore;
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=mailbox-registry.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mailbox-registry.d.ts","sourceRoot":"","sources":["../../src/auth/mailbox-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,OAAO,EAAE,UAAU,EAAsB,MAAM,kBAAkB,CAAC;AAElE,MAAM,WAAW,iBAAiB;IAChC,sEAAsE;IACtE,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,6EAA6E;IAC7E,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,iBAAiB,CAAA;CAAE,GAChE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAUjE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,cAAc,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CAC7C;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,aAAa,EACvB,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAChB,gBAAgB,CAalB;AAED,qBAAa,eAAe;aAMR,SAAS,EAAE,MAAM;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAN9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;gBAGxB,SAAS,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM;IAOtC;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IA4BrB,8EAA8E;IAC9E,IAAI,IAAI,iBAAiB,EAAE;IAa3B,OAAO,CAAC,QAAQ;IAqBhB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa;IA8BzC;kFAC8E;IAC9E,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU;CAGzC"}
|
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Per-account registry of Outlook mailboxes.
|
|
3
|
+
*
|
|
4
|
+
* A sub-account can hold N mailboxes at once. Each mailbox is its own encrypted
|
|
5
|
+
* `tokens.enc` under `secrets/outlook/mailboxes/<graphUserId>/`, sharing the one
|
|
6
|
+
* account-level AES `.key`. This registry enumerates them, migrates the legacy
|
|
7
|
+
* single-mailbox layout on first read, and resolves a caller's mailbox selector
|
|
8
|
+
* down to the right TokenStore.
|
|
9
|
+
*
|
|
10
|
+
* Migration preserves the AES key, so the legacy ciphertext is valid as-is under
|
|
11
|
+
* the new path — migration is a file move, never a re-encrypt, and never forces
|
|
12
|
+
* a re-auth.
|
|
13
|
+
*/
|
|
14
|
+
import { existsSync, mkdirSync, readdirSync, renameSync, unlinkSync } from "node:fs";
|
|
15
|
+
import { join } from "node:path";
|
|
16
|
+
import { TokenStore, sanitizeMailboxKey } from "./token-store.js";
|
|
17
|
+
/** Human-readable identity for refusal messages: prefer the email, fall back to
|
|
18
|
+
* the graphUserId, then to the directory handle. An unreadable mailbox is tagged
|
|
19
|
+
* so a refusal listing it is honest about why it cannot be selected. */
|
|
20
|
+
function identityOf(d) {
|
|
21
|
+
if (!d.readable)
|
|
22
|
+
return `${d.mailboxKey} (unreadable)`;
|
|
23
|
+
return d.mail ?? d.graphUserId ?? d.mailboxKey;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* The observability line for a resolution: names the *resolved* mailbox and how
|
|
27
|
+
* it was chosen, so a wrong or absent selector is diagnosable from one line
|
|
28
|
+
* without decrypting the store. Pure — computed from the resolve result and the
|
|
29
|
+
* caller's selector, so selection (not a silent default) is testable.
|
|
30
|
+
*/
|
|
31
|
+
export function credResolveEvent(resolved, account, selector) {
|
|
32
|
+
if (resolved.kind === "ok") {
|
|
33
|
+
return {
|
|
34
|
+
event: "cred-resolve",
|
|
35
|
+
account,
|
|
36
|
+
mailbox: identityOf(resolved.descriptor),
|
|
37
|
+
source: selector ? "arg" : "sole",
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
if (resolved.kind === "none") {
|
|
41
|
+
return { event: "cred-resolve", account, mailbox: "", source: "none" };
|
|
42
|
+
}
|
|
43
|
+
return { event: "cred-resolve", account, mailbox: selector ?? "", source: "refused" };
|
|
44
|
+
}
|
|
45
|
+
export class MailboxRegistry {
|
|
46
|
+
accountId;
|
|
47
|
+
accountsDir;
|
|
48
|
+
secretsDir;
|
|
49
|
+
mailboxesDir;
|
|
50
|
+
legacyTokensPath;
|
|
51
|
+
constructor(accountId, accountsDir) {
|
|
52
|
+
this.accountId = accountId;
|
|
53
|
+
this.accountsDir = accountsDir;
|
|
54
|
+
this.secretsDir = join(accountsDir, accountId, "secrets", "outlook");
|
|
55
|
+
this.mailboxesDir = join(this.secretsDir, "mailboxes");
|
|
56
|
+
this.legacyTokensPath = join(this.secretsDir, "tokens.enc");
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Move a pre-migration `secrets/outlook/tokens.enc` into
|
|
60
|
+
* `mailboxes/<graphUserId>/tokens.enc`. Idempotent: a no-op once the legacy
|
|
61
|
+
* file is gone. Reads the blob only to learn its mailbox key; the ciphertext
|
|
62
|
+
* itself is moved unchanged (same account key).
|
|
63
|
+
*/
|
|
64
|
+
migrateLegacy() {
|
|
65
|
+
if (!existsSync(this.legacyTokensPath))
|
|
66
|
+
return;
|
|
67
|
+
let key = "unknown";
|
|
68
|
+
try {
|
|
69
|
+
const blob = new TokenStore(this.accountId, this.accountsDir).read();
|
|
70
|
+
if (blob?.graphUserId)
|
|
71
|
+
key = blob.graphUserId;
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
// Undecryptable legacy blob: park it under a stable handle rather than
|
|
75
|
+
// discard it, so it surfaces as an unreadable mailbox instead of vanishing.
|
|
76
|
+
key = "legacy-unreadable";
|
|
77
|
+
}
|
|
78
|
+
const destDir = join(this.mailboxesDir, sanitizeMailboxKey(key));
|
|
79
|
+
const destPath = join(destDir, "tokens.enc");
|
|
80
|
+
mkdirSync(destDir, { recursive: true, mode: 0o700 });
|
|
81
|
+
try {
|
|
82
|
+
if (existsSync(destPath)) {
|
|
83
|
+
// A mailbox with this key already exists — the legacy copy is redundant.
|
|
84
|
+
unlinkSync(this.legacyTokensPath);
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
renameSync(this.legacyTokensPath, destPath);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
catch (err) {
|
|
91
|
+
// A second process for the same account migrated first, so the legacy
|
|
92
|
+
// source is already gone. Treat as done rather than crashing the tool call.
|
|
93
|
+
if (err.code !== "ENOENT")
|
|
94
|
+
throw err;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
/** Every mailbox attached to this account, migrating legacy on first read. */
|
|
98
|
+
list() {
|
|
99
|
+
this.migrateLegacy();
|
|
100
|
+
if (!existsSync(this.mailboxesDir))
|
|
101
|
+
return [];
|
|
102
|
+
const out = [];
|
|
103
|
+
for (const entry of readdirSync(this.mailboxesDir, { withFileTypes: true })) {
|
|
104
|
+
if (!entry.isDirectory())
|
|
105
|
+
continue;
|
|
106
|
+
const mailboxKey = entry.name;
|
|
107
|
+
if (!existsSync(join(this.mailboxesDir, mailboxKey, "tokens.enc")))
|
|
108
|
+
continue;
|
|
109
|
+
out.push(this.describe(mailboxKey));
|
|
110
|
+
}
|
|
111
|
+
return out;
|
|
112
|
+
}
|
|
113
|
+
describe(mailboxKey) {
|
|
114
|
+
const store = new TokenStore(this.accountId, this.accountsDir, mailboxKey);
|
|
115
|
+
try {
|
|
116
|
+
const blob = store.read();
|
|
117
|
+
if (!blob) {
|
|
118
|
+
return { mailboxKey, graphUserId: null, mail: null, scopes: [], tokenExpSec: null, refreshExpired: false, readable: false };
|
|
119
|
+
}
|
|
120
|
+
return {
|
|
121
|
+
mailboxKey,
|
|
122
|
+
graphUserId: blob.graphUserId,
|
|
123
|
+
mail: blob.mail,
|
|
124
|
+
scopes: blob.scopes,
|
|
125
|
+
tokenExpSec: Math.floor(blob.accessTokenExpiry / 1000),
|
|
126
|
+
refreshExpired: store.refreshTokenExpired(),
|
|
127
|
+
readable: true,
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
catch {
|
|
131
|
+
return { mailboxKey, graphUserId: null, mail: null, scopes: [], tokenExpSec: null, refreshExpired: false, readable: false };
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
/**
|
|
135
|
+
* Resolve a mailbox selector to a TokenStore. Order: explicit selector
|
|
136
|
+
* (matched against graphUserId or mail, case-insensitive) → the sole readable
|
|
137
|
+
* mailbox → ambiguous (≥2 readable, none named) → none (zero readable).
|
|
138
|
+
* Unreadable mailboxes are never addressable.
|
|
139
|
+
*/
|
|
140
|
+
resolve(selector) {
|
|
141
|
+
const all = this.list();
|
|
142
|
+
const addressable = all.filter((d) => d.readable);
|
|
143
|
+
if (selector) {
|
|
144
|
+
const needle = selector.toLowerCase();
|
|
145
|
+
const match = addressable.find((d) => d.graphUserId?.toLowerCase() === needle ||
|
|
146
|
+
d.mail?.toLowerCase() === needle);
|
|
147
|
+
if (match) {
|
|
148
|
+
return { kind: "ok", store: this.storeFor(match.mailboxKey), descriptor: match };
|
|
149
|
+
}
|
|
150
|
+
return { kind: "notfound", selector, identities: all.map(identityOf) };
|
|
151
|
+
}
|
|
152
|
+
// Ambiguity is decided by the number of mailboxes *attached* (readable or
|
|
153
|
+
// not), never the readable subset. If a second mailbox is transiently
|
|
154
|
+
// unreadable, this still refuses rather than silently resolving to the one
|
|
155
|
+
// that happens to be readable — which would send from the wrong mailbox.
|
|
156
|
+
if (all.length === 0)
|
|
157
|
+
return { kind: "none" };
|
|
158
|
+
if (all.length === 1) {
|
|
159
|
+
return addressable.length === 1
|
|
160
|
+
? { kind: "ok", store: this.storeFor(addressable[0].mailboxKey), descriptor: addressable[0] }
|
|
161
|
+
: { kind: "none" };
|
|
162
|
+
}
|
|
163
|
+
return { kind: "ambiguous", identities: all.map(identityOf) };
|
|
164
|
+
}
|
|
165
|
+
/** A TokenStore for a specific mailbox key (a graphUserId at register time, or
|
|
166
|
+
* a descriptor's mailboxKey). Overwrites that mailbox in place on store(). */
|
|
167
|
+
storeFor(mailboxKey) {
|
|
168
|
+
return new TokenStore(this.accountId, this.accountsDir, mailboxKey);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
//# sourceMappingURL=mailbox-registry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mailbox-registry.js","sourceRoot":"","sources":["../../src/auth/mailbox-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,16 +24,30 @@ export interface TokenBlob {
|
|
|
24
24
|
refreshTokenExpiry: number;
|
|
25
25
|
lastRefresh: number;
|
|
26
26
|
graphUserId: string | null;
|
|
27
|
+
mail: string | null;
|
|
27
28
|
scopes: string[];
|
|
28
29
|
}
|
|
30
|
+
/** Filesystem-safe mailbox directory name. graphUserId (a GUID) passes through
|
|
31
|
+
* unchanged; a fallback mail/UPN identity has its unsafe characters folded to
|
|
32
|
+
* '_'. The true identity is never read back from this name — it lives in the
|
|
33
|
+
* blob (graphUserId, mail) — so a lossy fold is harmless. */
|
|
34
|
+
export declare function sanitizeMailboxKey(key: string): string;
|
|
29
35
|
export declare class TokenStore {
|
|
30
36
|
readonly accountId: string;
|
|
37
|
+
readonly mailboxKey?: string | undefined;
|
|
31
38
|
private cachedBlob;
|
|
32
39
|
private encryptionKey;
|
|
33
40
|
private readonly secretsDir;
|
|
34
41
|
private readonly tokensPath;
|
|
35
42
|
private readonly keyPath;
|
|
36
|
-
|
|
43
|
+
/**
|
|
44
|
+
* @param mailboxKey When set, tokens live under `mailboxes/<key>/tokens.enc`
|
|
45
|
+
* so N mailboxes coexist under one account. When omitted, the legacy
|
|
46
|
+
* `tokens.enc` path is used — retained for reading pre-migration installs.
|
|
47
|
+
* The AES `.key` is always account-level (`secrets/outlook/.key`) and shared
|
|
48
|
+
* by every mailbox within the account; account isolation is unchanged.
|
|
49
|
+
*/
|
|
50
|
+
constructor(accountId: string, accountsDir: string, mailboxKey?: string | undefined);
|
|
37
51
|
/** Load (or create) the AES key. Idempotent and TOCTOU-safe via wx flag. */
|
|
38
52
|
private loadKey;
|
|
39
53
|
private encrypt;
|
|
@@ -44,6 +58,7 @@ export declare class TokenStore {
|
|
|
44
58
|
read(): TokenBlob | null;
|
|
45
59
|
store(accessToken: string, refreshToken: string | null, expiresInSeconds: number, extras?: {
|
|
46
60
|
graphUserId?: string | null;
|
|
61
|
+
mail?: string | null;
|
|
47
62
|
scopes?: string[];
|
|
48
63
|
}): TokenBlob;
|
|
49
64
|
private tryReadSilent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-store.d.ts","sourceRoot":"","sources":["../../src/auth/token-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAkBH,MAAM,WAAW,SAAS;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,qBAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"token-store.d.ts","sourceRoot":"","sources":["../../src/auth/token-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAkBH,MAAM,WAAW,SAAS;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;6DAG6D;AAC7D,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,qBAAa,UAAU;aAeH,SAAS,EAAE,MAAM;aAEjB,UAAU,CAAC,EAAE,MAAM;IAhBrC,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC;;;;;;OAMG;gBAEe,SAAS,EAAE,MAAM,EACjC,WAAW,EAAE,MAAM,EACH,UAAU,CAAC,EAAE,MAAM,YAAA;IASrC,4EAA4E;IAC5E,OAAO,CAAC,OAAO;IAuCf,OAAO,CAAC,OAAO;IASf,OAAO,CAAC,OAAO;IAaf,6EAA6E;IAC7E,OAAO,CAAC,SAAS;IAYjB,oEAAoE;IACpE,IAAI,IAAI,SAAS,GAAG,IAAI;IAWxB,KAAK,CACH,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,gBAAgB,EAAE,MAAM,EACxB,MAAM,GAAE;QAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAO,GACpF,SAAS;IAmBZ,OAAO,CAAC,aAAa;IAQrB;;;OAGG;IACH,YAAY,IAAI,OAAO;IAMvB,SAAS,IAAI,OAAO;IAIpB,mBAAmB,IAAI,OAAO;IAM9B,KAAK,IAAI,IAAI;CAId;AAED,kDAAkD;AAClD,eAAO,MAAM,kBAAkB,QAAuB,CAAC"}
|