Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(api): let memo writers attach files to the notes they create

tianma-ife615489d9135
diff --git a/apps/api/src/request-auth.ts b/apps/api/src/request-auth.ts
index fb19b5b5..35de3f23 100644
--- a/apps/api/src/request-auth.ts
+++ b/apps/api/src/request-auth.ts
@@ -55,6 +55,14 @@ export const requireScopes = (c: AppContext, ...scopes: TokenScope[]) => {
: forbidden(c, `Missing required scope: ${scopes.join(", ")}`);
};
+export const requireAnyScopes = (c: AppContext, ...scopeSets: TokenScope[][]) => {
+ const auth = c.get("auth");
+ if (!auth) return unauthorized(c, "Authentication required.");
+ return scopeSets.some((scopes) => hasScopes(auth, scopes))
+ ? null
+ : forbidden(c, `Missing required scope: ${scopeSets.map((scopes) => scopes.join(", ")).join(" or ")}`);
+};
+
export const assertScope = (auth: AuthContext, scope: TokenScope) => {
if (!hasScopes(auth, [scope])) {
throw new AppError("forbidden", `Missing required scope: ${scope}`, 403);
diff --git a/apps/api/src/resource-routes.test.mjs b/apps/api/src/resource-routes.test.mjs
index 1206a9f0..ea35099c 100644
--- a/apps/api/src/resource-routes.test.mjs
+++ b/apps/api/src/resource-routes.test.mjs
@@ -114,6 +114,32 @@ describe("resource route contracts", () => {
expect(await response.json()).toMatchObject({ error: { code: "forbidden" } });
});
+ test("lets a memo writer attach an image without the attachment-management scope", async () => {
+ const form = new FormData();
+ form.append("file", new File([Uint8Array.of(0xff, 0xd8, 0xff)], "cat.jpg", { type: "image/jpeg" }));
+ let uploaded = null;
+ const response = await createApp(
+ { ...agentAuth, scopes: ["write:memos"] },
+ async () => null,
+ {
+ getMemoDetail: async () => ({ id: "memo_1" }),
+ createImageResource: async (_context, input) => {
+ uploaded = input;
+ return { id: "res_1" };
+ },
+ },
+ ).request(
+ "/api/v1/memos/memo_1/resources",
+ { method: "POST", body: form },
+ createEnvironment(),
+ );
+
+ expect(response.status).toBe(201);
+ expect(uploaded.memoId).toBe("memo_1");
+ expect(uploaded.filename).toBe("cat.jpg");
+ expect(await response.json()).toMatchObject({ resource: { id: "res_1" } });
+ });
+
test("replaces resource content with an explicit optimistic-concurrency baseline", async () => {
let replacement;
const form = new FormData();
diff --git a/apps/api/src/resource-routes.ts b/apps/api/src/resource-routes.ts
index 3a62cd2b..ba92dcf0 100644
--- a/apps/api/src/resource-routes.ts
+++ b/apps/api/src/resource-routes.ts
@@ -21,7 +21,7 @@ import {
type ResourceStatsRow,
} from "./resource-service";
import type { initiateResourceUpload as initiateResourceUploadService } from "./resource-upload-service";
-import { getAuditActor, getWorkspaceId, requireScopes } from "./request-auth";
+import { getAuditActor, getWorkspaceId, requireAnyScopes, requireScopes } from "./request-auth";
import type { DatabaseAdapter } from "./storage-contract";
type ResourceRouteDependencies = {
@@ -125,7 +125,7 @@ export const registerResourceRoutes = (
});
app.post("/api/v1/memos/:id/resources", async (context) => {
- const denied = requireScopes(context, "write:resources");
+ const denied = requireAnyScopes(context, ["write:memos"], ["write:resources"]);
if (denied) return denied;
const declaredRequestBytes = Number(context.req.header("Content-Length"));
@@ -183,7 +183,7 @@ export const registerResourceRoutes = (
});
app.post("/api/v1/memos/:id/resource-uploads", async (context) => {
- const denied = requireScopes(context, "write:resources");
+ const denied = requireAnyScopes(context, ["write:memos"], ["write:resources"]);
if (denied) return denied;
const memoId = context.req.param("id");
@@ -218,7 +218,7 @@ export const registerResourceRoutes = (
});
app.put("/api/v1/resource-uploads/:id/parts/:partNumber", async (context) => {
- const denied = requireScopes(context, "write:resources");
+ const denied = requireAnyScopes(context, ["write:memos"], ["write:resources"]);
if (denied) return denied;
const body = context.req.raw.body;
@@ -246,7 +246,7 @@ export const registerResourceRoutes = (
});
app.post("/api/v1/resource-uploads/:id/complete", async (context) => {
- const denied = requireScopes(context, "write:resources");
+ const denied = requireAnyScopes(context, ["write:memos"], ["write:resources"]);
if (denied) return denied;
try {
const resource = await dependencies.completeResourceUpload(
@@ -261,7 +261,7 @@ export const registerResourceRoutes = (
});
app.delete("/api/v1/resource-uploads/:id", async (context) => {
- const denied = requireScopes(context, "write:resources");
+ const denied = requireAnyScopes(context, ["write:memos"], ["write:resources"]);
if (denied) return denied;
try {
await dependencies.abortResourceUpload(context, context.req.param("id"));