@crowi/api 2.0.0-alpha.0

package/dist/hono/handlers/bookmark.js

@@ -0,0 +1,166 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerBookmarkRoutes = void 0;
+/**
+ * RFC-0006 Phase 4 Batch 3 — `bookmark` resource Hono port.
+ *
+ * Replaces `packages/api/src/routes/ts-rest/bookmark.ts`. Four endpoints,
+ * all behind `createJwtAuth(crowi)` applied broadly to `/bookmarks/*`:
+ *
+ *   GET    /bookmarks       — fetch bookmark for a page (or null)
+ *   GET    /bookmarks/me    — paginated current-user bookmarks
+ *   POST   /bookmarks       — add a bookmark
+ *   DELETE /bookmarks       — remove a bookmark
+ *
+ * Wire-format parity with the ts-rest era is preserved. The handlers
+ * keep the legacy quirks:
+ *
+ *  - `addBookmark` returns `{ bookmark: null }` instead of 404 when the
+ *    page is missing or not granted — this matches the legacy
+ *    `/_api/bookmarks.add` controller and prevents the UI from
+ *    showing an error on a race where the page disappears between
+ *    page-view and the bookmark click.
+ *  - `removeBookmark` returns `{ ok: true }` even when there was no
+ *    bookmark to delete (legacy `/_api/bookmarks.remove` did the same).
+ */
+const api_contract_1 = require("@crowi/api-contract");
+const debug_1 = __importDefault(require("debug"));
+const mongoose_1 = require("mongoose");
+const page_response_1 = require("../../util/page-response");
+const ts_rest_helpers_1 = require("../../util/ts-rest-helpers");
+const auth_1 = require("../middleware/auth");
+const require_scope_1 = require("../middleware/require-scope");
+const errors_1 = require("./_helpers/errors");
+const debug = (0, debug_1.default)('crowi:hono:handlers:bookmark');
+/**
+ * Serialize a Bookmark document into the wire shape. Mirrors the ts-rest
+ * handler so the JSON payload is byte-identical: page populated via
+ * `pageToResponse`, user lifted to `PageUser` when populated otherwise
+ * left as a string id, createdAt always emitted as ISO string.
+ */
+const bookmarkToResponse = (bookmark) => {
+    const obj = typeof bookmark.toObject === 'function' ? bookmark.toObject() : bookmark;
+    return {
+        _id: (0, ts_rest_helpers_1.toStringId)(obj._id),
+        page: obj.page ? (0, page_response_1.pageToResponse)(obj.page) : null,
+        user: (0, ts_rest_helpers_1.isPopulatedUser)(obj.user) ? (0, ts_rest_helpers_1.toPageUser)(obj.user) : (0, ts_rest_helpers_1.toStringId)(obj.user),
+        createdAt: (0, ts_rest_helpers_1.toISOStringOrNull)(obj.createdAt) || new Date().toISOString(),
+    };
+};
+const registerBookmarkRoutes = (app, crowi) => {
+    const Page = crowi.model('Page');
+    const Bookmark = crowi.model('Bookmark');
+    // Every `/bookmarks/*` endpoint requires auth. Apply broadly so each
+    // route below sees `c.get('user')` populated. The path matcher
+    // intentionally covers `/bookmarks` (the bare path) too because Hono
+    // treats `/bookmarks/*` as matching the trailing slash variants.
+    app.use('/bookmarks/*', (0, auth_1.createJwtAuth)(crowi));
+    app.use('/bookmarks', (0, auth_1.createJwtAuth)(crowi));
+    // RFC-0010 — bookmark add/remove are bookmarks:write.
+    (0, require_scope_1.applyScope)(app, api_contract_1.getBookmarkRoute, 'bookmarks:read');
+    (0, require_scope_1.applyScope)(app, api_contract_1.listMyBookmarksRoute, 'bookmarks:read');
+    (0, require_scope_1.applyScope)(app, api_contract_1.addBookmarkRoute, 'bookmarks:write');
+    (0, require_scope_1.applyScope)(app, api_contract_1.removeBookmarkRoute, 'bookmarks:write');
+    return app
+        .openapi(api_contract_1.getBookmarkRoute, async (c) => {
+        const user = c.get('user');
+        const { page_id } = c.req.valid('query');
+        debug('getBookmark called with:', { page_id, userId: user._id });
+        if (!(0, ts_rest_helpers_1.isValidObjectId)(page_id)) {
+            return c.json(errors_1.INVALID_PAGE_ID_BODY, 400);
+        }
+        try {
+            const pageObjectId = new mongoose_1.Types.ObjectId(page_id);
+            const bookmark = (await Bookmark.findByPageIdAndUserId(pageObjectId, user._id));
+            return c.json({ bookmark: bookmark ? bookmarkToResponse(bookmark) : null }, 200);
+        }
+        catch (err) {
+            debug('Error fetching bookmark:', err.message);
+            return c.json(errors_1.INTERNAL_ERROR_BODY, 500);
+        }
+    })
+        .openapi(api_contract_1.listMyBookmarksRoute, async (c) => {
+        const user = c.get('user');
+        const { limit, offset } = c.req.valid('query');
+        debug('listMyBookmarks called with:', { limit, offset, userId: user._id });
+        try {
+            const result = await Bookmark.findByUserId(user._id, { limit, offset });
+            const bookmarks = result.data;
+            const total = result.meta.total;
+            const prev = offset > 0 ? Math.max(0, offset - limit) : null;
+            const next = offset + limit < total ? offset + limit : null;
+            return c.json({
+                bookmarks: bookmarks.filter((bookmark) => bookmark.page).map((bookmark) => bookmarkToResponse(bookmark)),
+                pager: { prev, next, offset },
+                total,
+            }, 200);
+        }
+        catch (err) {
+            debug('Error listing my bookmarks:', err.message);
+            return c.json(errors_1.INTERNAL_ERROR_BODY, 500);
+        }
+    })
+        .openapi(api_contract_1.addBookmarkRoute, async (c) => {
+        const user = c.get('user');
+        const { page_id } = c.req.valid('json');
+        debug('addBookmark called with:', { page_id, userId: user._id });
+        if (!(0, ts_rest_helpers_1.isValidObjectId)(page_id)) {
+            return c.json(errors_1.INVALID_PAGE_ID_BODY, 400);
+        }
+        let pageData = null;
+        try {
+            pageData = (await Page.findPageByIdAndGrantedUser(page_id, user));
+        }
+        catch (err) {
+            const error = err;
+            // findPageByIdAndGrantedUser throws on not-found / not-granted.
+            // Collapse both into `{ bookmark: null }` so the legacy
+            // /_api/bookmarks.add semantics are preserved: the UI never
+            // surfaces a 404 here even when the page disappears between
+            // page-view and the bookmark click.
+            if (error.message === 'Page not found' || error.message === 'Page is not granted for the user') {
+                return c.json({ bookmark: null }, 200);
+            }
+            debug('Error fetching page for bookmark:', error.message);
+            return c.json(errors_1.INTERNAL_ERROR_BODY, 500);
+        }
+        if (!pageData) {
+            return c.json({ bookmark: null }, 200);
+        }
+        try {
+            const created = (await Bookmark.add(pageData, user));
+            // Depopulate then re-attach the page we already loaded so the response
+            // matches the populated shape without re-running `populate('page')`.
+            created.depopulate('page');
+            created.depopulate('user');
+            const bookmarkObj = created.toObject();
+            bookmarkObj.page = pageData;
+            return c.json({ bookmark: bookmarkToResponse(bookmarkObj) }, 200);
+        }
+        catch (err) {
+            debug('Error adding bookmark:', err.message);
+            return c.json(errors_1.INTERNAL_ERROR_BODY, 500);
+        }
+    })
+        .openapi(api_contract_1.removeBookmarkRoute, async (c) => {
+        const user = c.get('user');
+        const { page_id } = c.req.valid('json');
+        debug('removeBookmark called with:', { page_id, userId: user._id });
+        if (!(0, ts_rest_helpers_1.isValidObjectId)(page_id)) {
+            return c.json(errors_1.INVALID_PAGE_ID_BODY, 400);
+        }
+        try {
+            await Bookmark.removeBookmark(new mongoose_1.Types.ObjectId(page_id), user);
+            return c.json({ ok: true }, 200);
+        }
+        catch (err) {
+            debug('Error removing bookmark:', err.message);
+            return c.json(errors_1.INTERNAL_ERROR_BODY, 500);
+        }
+    });
+};
+exports.registerBookmarkRoutes = registerBookmarkRoutes;
+//# sourceMappingURL=bookmark.js.map

package/dist/hono/handlers/bookmark.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bookmark.js","sourceRoot":"","sources":["../../../src/hono/handlers/bookmark.ts"],"names":[],"mappings":"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"}

package/dist/hono/handlers/comment.d.ts

@@ -0,0 +1,231 @@
+import type { OpenAPIHono } from '@hono/zod-openapi';
+import type Crowi from '../../crowi';
+import type { CrowiHonoBindings } from '../app';
+export declare const registerCommentRoutes: <E extends OpenAPIHono<CrowiHonoBindings>>(app: E, crowi: Crowi) => OpenAPIHono<CrowiHonoBindings, {
+    "/comments": {
+        $get: {
+            input: {
+                query: {
+                    page_id?: string | undefined;
+                    revision_id?: string | undefined;
+                };
+            };
+            output: {
+                comments: {
+                    _id: string;
+                    page: string;
+                    creator: string | {
+                        _id: string;
+                        username: string;
+                        name: string;
+                        email: string;
+                        createdAt: string;
+                        id?: string | undefined;
+                        image?: string | null | undefined;
+                    } | null;
+                    revision: string;
+                    comment: string;
+                    commentPosition: number;
+                    createdAt: string;
+                }[];
+            };
+            outputFormat: "json";
+            status: 200;
+        } | {
+            input: {
+                query: {
+                    page_id?: string | undefined;
+                    revision_id?: string | undefined;
+                };
+            };
+            output: {
+                error: {
+                    code: "INVALID_REQUEST";
+                    message: string;
+                };
+            };
+            outputFormat: "json";
+            status: 400;
+        } | {
+            input: {
+                query: {
+                    page_id?: string | undefined;
+                    revision_id?: string | undefined;
+                };
+            };
+            output: {
+                error: {
+                    code: "AUTHENTICATION_REQUIRED";
+                    message: "Authentication is required";
+                    redirectTo?: string | undefined;
+                };
+            };
+            outputFormat: "json";
+            status: 401;
+        };
+    };
+} & {
+    "/comments": {
+        $post: {
+            input: {
+                json: {
+                    page_id: string;
+                    revision_id: string;
+                    comment: string;
+                    comment_position?: number | undefined;
+                };
+            };
+            output: {
+                comment: {
+                    _id: string;
+                    page: string;
+                    creator: string | {
+                        _id: string;
+                        username: string;
+                        name: string;
+                        email: string;
+                        createdAt: string;
+                        id?: string | undefined;
+                        image?: string | null | undefined;
+                    } | null;
+                    revision: string;
+                    comment: string;
+                    commentPosition: number;
+                    createdAt: string;
+                };
+                newlyWatching: boolean;
+            };
+            outputFormat: "json";
+            status: 200;
+        } | {
+            input: {
+                json: {
+                    page_id: string;
+                    revision_id: string;
+                    comment: string;
+                    comment_position?: number | undefined;
+                };
+            };
+            output: {
+                error: {
+                    code: "INVALID_REQUEST";
+                    message: string;
+                };
+            };
+            outputFormat: "json";
+            status: 400;
+        } | {
+            input: {
+                json: {
+                    page_id: string;
+                    revision_id: string;
+                    comment: string;
+                    comment_position?: number | undefined;
+                };
+            };
+            output: {
+                error: {
+                    code: "AUTHENTICATION_REQUIRED";
+                    message: "Authentication is required";
+                    redirectTo?: string | undefined;
+                };
+            };
+            outputFormat: "json";
+            status: 401;
+        } | {
+            input: {
+                json: {
+                    page_id: string;
+                    revision_id: string;
+                    comment: string;
+                    comment_position?: number | undefined;
+                };
+            };
+            output: {
+                error: {
+                    code: "PAGE_NOT_FOUND";
+                    message: "Page not found";
+                };
+            };
+            outputFormat: "json";
+            status: 404;
+        };
+    };
+} & {
+    "/comments": {
+        $delete: {
+            input: {
+                json: {
+                    comment_id: string;
+                    page_id: string;
+                };
+            };
+            output: {
+                ok: true;
+            };
+            outputFormat: "json";
+            status: 200;
+        } | {
+            input: {
+                json: {
+                    comment_id: string;
+                    page_id: string;
+                };
+            };
+            output: {
+                error: {
+                    code: "INVALID_REQUEST";
+                    message: string;
+                };
+            };
+            outputFormat: "json";
+            status: 400;
+        } | {
+            input: {
+                json: {
+                    comment_id: string;
+                    page_id: string;
+                };
+            };
+            output: {
+                error: {
+                    code: "AUTHENTICATION_REQUIRED";
+                    message: "Authentication is required";
+                    redirectTo?: string | undefined;
+                };
+            };
+            outputFormat: "json";
+            status: 401;
+        } | {
+            input: {
+                json: {
+                    comment_id: string;
+                    page_id: string;
+                };
+            };
+            output: {
+                error: {
+                    code: "PAGE_NOT_GRANTED";
+                    message: "Page is not granted for the user";
+                };
+            };
+            outputFormat: "json";
+            status: 403;
+        } | {
+            input: {
+                json: {
+                    comment_id: string;
+                    page_id: string;
+                };
+            };
+            output: {
+                error: {
+                    code: "COMMENT_NOT_FOUND";
+                    message: "Comment not found";
+                };
+            };
+            outputFormat: "json";
+            status: 404;
+        };
+    };
+}, "/">;

package/dist/hono/handlers/comment.js

@@ -0,0 +1,191 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerCommentRoutes = void 0;
+/**
+ * RFC-0006 Phase 4 Batch 3 — `comment` resource Hono port.
+ *
+ * Replaces `packages/api/src/routes/ts-rest/comment.ts`. Three endpoints,
+ * all behind `createJwtAuth(crowi)` applied broadly to `/comments/*`:
+ *
+ *   GET    /comments — list comments by page_id or revision_id
+ *   POST   /comments — add a comment to a page revision
+ *   DELETE /comments — delete a comment by id
+ *
+ * Wire-format parity with the ts-rest era is preserved. Notable points:
+ *
+ *  - `addComment` reuses `findPageByIdAndGrantedUser` so the legacy
+ *    grant-failure -> 404 (existence-leak guard) behaviour stays.
+ *  - `deleteComment` separates grant (403 PAGE_NOT_GRANTED) from
+ *    missing comment (404 COMMENT_NOT_FOUND) — the ts-rest tests
+ *    asserted both branches explicitly.
+ *  - The Comment post-save hook (commentCount / Activity emission)
+ *    runs independently of this handler; we do not duplicate that
+ *    work.
+ */
+const api_contract_1 = require("@crowi/api-contract");
+const debug_1 = __importDefault(require("debug"));
+const mongoose_1 = require("mongoose");
+const ts_rest_helpers_1 = require("../../util/ts-rest-helpers");
+const auto_watch_1 = require("../../util/auto-watch");
+const auth_1 = require("../middleware/auth");
+const require_scope_1 = require("../middleware/require-scope");
+const errors_1 = require("./_helpers/errors");
+const debug = (0, debug_1.default)('crowi:hono:handlers:comment');
+const COMMENT_POSITION_DEFAULT = -1;
+const PAGE_NOT_GRANTED_BODY = {
+    error: { code: 'PAGE_NOT_GRANTED', message: 'Page is not granted for the user' },
+};
+const COMMENT_NOT_FOUND_BODY = {
+    error: { code: 'COMMENT_NOT_FOUND', message: 'Comment not found' },
+};
+/**
+ * Convert a Comment document (with optionally populated creator) into
+ * the API response shape. Mirrors the ts-rest helper so the response
+ * payload is byte-identical.
+ */
+const commentToResponse = (comment) => {
+    // The toObject result mixes Mongoose dynamic shapes; we narrow only the
+    // fields used below and treat creator as a populated user / objectId /
+    // null union without re-typing the whole document.
+    const obj = comment.toObject();
+    let creator = null;
+    if ((0, ts_rest_helpers_1.isPopulatedUser)(obj.creator)) {
+        creator = (0, ts_rest_helpers_1.toPageUser)(obj.creator);
+    }
+    else if (obj.creator) {
+        creator = String(obj.creator);
+    }
+    return {
+        _id: comment._id.toString(),
+        page: comment.page.toString(),
+        creator,
+        revision: comment.revision.toString(),
+        comment: comment.comment,
+        commentPosition: typeof comment.commentPosition === 'number' ? comment.commentPosition : COMMENT_POSITION_DEFAULT,
+        createdAt: (0, ts_rest_helpers_1.toISOStringOrNull)(comment.createdAt) ?? new Date(0).toISOString(),
+    };
+};
+const registerCommentRoutes = (app, crowi) => {
+    const Comment = crowi.model('Comment');
+    const Page = crowi.model('Page');
+    const Watcher = crowi.model('Watcher');
+    app.use('/comments/*', (0, auth_1.createJwtAuth)(crowi));
+    app.use('/comments', (0, auth_1.createJwtAuth)(crowi));
+    // RFC-0010 — comment scopes.
+    (0, require_scope_1.applyScope)(app, api_contract_1.listCommentsRoute, 'comments:read');
+    (0, require_scope_1.applyScope)(app, api_contract_1.addCommentRoute, 'comments:write');
+    (0, require_scope_1.applyScope)(app, api_contract_1.deleteCommentRoute, 'comments:write');
+    return app
+        .openapi(api_contract_1.listCommentsRoute, async (c) => {
+        const user = c.get('user');
+        const { page_id, revision_id } = c.req.valid('query');
+        debug('listComments called with:', { page_id, revision_id, userId: user._id });
+        if (!page_id && !revision_id) {
+            return c.json((0, errors_1.invalidRequestBody)('page_id or revision_id is required'), 400);
+        }
+        try {
+            let comments;
+            if (revision_id) {
+                if (!(0, ts_rest_helpers_1.isValidObjectId)(revision_id)) {
+                    return c.json((0, errors_1.invalidRequestBody)('Invalid revision_id'), 400);
+                }
+                comments = await Comment.getCommentsByRevisionId(new mongoose_1.Types.ObjectId(revision_id));
+            }
+            else {
+                if (!(0, ts_rest_helpers_1.isValidObjectId)(page_id)) {
+                    return c.json((0, errors_1.invalidRequestBody)('Invalid page_id'), 400);
+                }
+                comments = await Comment.getCommentsByPageId(new mongoose_1.Types.ObjectId(page_id));
+            }
+            return c.json({ comments: comments.map(commentToResponse) }, 200);
+        }
+        catch (err) {
+            const error = err;
+            debug('Error listing comments:', error.message);
+            return c.json((0, errors_1.invalidRequestBody)(error.message || 'Failed to list comments'), 400);
+        }
+    })
+        .openapi(api_contract_1.addCommentRoute, async (c) => {
+        const user = c.get('user');
+        const { page_id, revision_id, comment, comment_position } = c.req.valid('json');
+        debug('addComment called with:', { page_id, revision_id, userId: user._id });
+        if (!(0, ts_rest_helpers_1.isValidObjectId)(page_id) || !(0, ts_rest_helpers_1.isValidObjectId)(revision_id)) {
+            return c.json((0, errors_1.invalidRequestBody)('Invalid page_id or revision_id'), 400);
+        }
+        try {
+            const page = (await Page.findPageByIdAndGrantedUser(page_id, user));
+            if (!page) {
+                return c.json(errors_1.PAGE_NOT_FOUND_BODY, 404);
+            }
+            const created = await Comment.create({
+                page: new mongoose_1.Types.ObjectId(page_id),
+                creator: user._id,
+                revision: new mongoose_1.Types.ObjectId(revision_id),
+                comment,
+                commentPosition: comment_position ?? COMMENT_POSITION_DEFAULT,
+            });
+            const populated = (await created.populate('creator'));
+            // feature-watch-autosubscribe — commenting auto-watches the page.
+            // Done synchronously here (not in the Comment post-save Activity
+            // hook, which fires asynchronously) so `newlyWatching` is accurate
+            // in this response. An existing IGNORE row is respected; an
+            // existing WATCH yields newlyWatching=false. Best-effort: a
+            // watcher failure must not fail the comment write.
+            let newlyWatching = false;
+            try {
+                const result = await (0, auto_watch_1.autoWatchPage)(Watcher, user._id, new mongoose_1.Types.ObjectId(page_id));
+                newlyWatching = result.newlyWatching;
+            }
+            catch (watchErr) {
+                debug('Error auto-watching page on comment:', watchErr.message);
+            }
+            return c.json({ comment: commentToResponse(populated), newlyWatching }, 200);
+        }
+        catch (err) {
+            const error = err;
+            debug('Error adding comment:', error.message);
+            // findPageByIdAndGrantedUser throws on not-found / not-granted; collapse
+            // both to 404 to match the existence-leak guard from the ts-rest era.
+            if (error.message === 'Page not found' || error.message === 'Page is not granted for the user') {
+                return c.json(errors_1.PAGE_NOT_FOUND_BODY, 404);
+            }
+            return c.json((0, errors_1.invalidRequestBody)(error.message || 'Failed to add comment'), 400);
+        }
+    })
+        .openapi(api_contract_1.deleteCommentRoute, async (c) => {
+        const user = c.get('user');
+        const { comment_id, page_id } = c.req.valid('json');
+        debug('deleteComment called with:', { comment_id, page_id, userId: user._id });
+        if (!(0, ts_rest_helpers_1.isValidObjectId)(comment_id) || !(0, ts_rest_helpers_1.isValidObjectId)(page_id)) {
+            return c.json((0, errors_1.invalidRequestBody)('Invalid comment_id or page_id'), 400);
+        }
+        try {
+            const pageData = (await Page.findPageById(page_id));
+            if (!pageData) {
+                return c.json(COMMENT_NOT_FOUND_BODY, 404);
+            }
+            if (!pageData.isGrantedFor(user)) {
+                return c.json(PAGE_NOT_GRANTED_BODY, 403);
+            }
+            const existing = await Comment.findOne({ _id: new mongoose_1.Types.ObjectId(comment_id) }).exec();
+            if (!existing) {
+                return c.json(COMMENT_NOT_FOUND_BODY, 404);
+            }
+            await Comment.removeCommentById(new mongoose_1.Types.ObjectId(comment_id));
+            return c.json({ ok: true }, 200);
+        }
+        catch (err) {
+            const error = err;
+            debug('Error deleting comment:', error.message);
+            if (error.message === 'Page not found') {
+                return c.json(COMMENT_NOT_FOUND_BODY, 404);
+            }
+            return c.json((0, errors_1.invalidRequestBody)(error.message || 'Failed to delete comment'), 400);
+        }
+    });
+};
+exports.registerCommentRoutes = registerCommentRoutes;
+//# sourceMappingURL=comment.js.map

package/dist/hono/handlers/comment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"comment.js","sourceRoot":"","sources":["../../../src/hono/handlers/comment.ts"],"names":[],"mappings":"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"}