feat: continue restart plan

Author: gustavotoyota

new-deepnotes/PLAN_PROGRESS.md

@@ -88,6 +88,7 @@ describe("api-worker", () => {
       "/api/groups/aaaaaaaaaaaaaaaaaaaaa/restore",
     ],
     ["POST", "/api/groups/aaaaaaaaaaaaaaaaaaaaa/purge"],
+    ["POST", "/api/pages/aaaaaaaaaaaaaaaaaaaaa/move"],
     ["POST", "/api/pages/aaaaaaaaaaaaaaaaaaaaa/bump"],
     ["POST", "/api/pages/aaaaaaaaaaaaaaaaaaaaa/backlinks"],
     [

new-deepnotes/apps/api-worker/src/index.test.ts

@@ -6,6 +6,7 @@ import {
   groupPagesListQuerySchema,
   pageBacklinkCreateRequestSchema,
   pageBumpRequestSchema,
+  pageMoveRequestSchema,
   pageIdPathSchema,
   pageSnapshotCreateResponseSchema,
   pageSnapshotSaveRequestSchema,
@@ -33,6 +34,7 @@ import {
 } from "@deepnotes/api";
 import type { ContentfulStatusCode } from "hono/utils/http-status";
 import { Hono } from "hono";
+import type { PageMoveBody } from "@deepnotes/session";
 
 import { getDbForConnectionString } from "./db-pool.js";
 import { readCookieHeader } from "./cookies.js";
@@ -1371,6 +1373,113 @@ app.post("/api/groups/:groupId/pages", async (c) => {
   }
 });
 
+app.post("/api/pages/:pageId/move", async (c) => {
+  const sessionEnv = getSessionEnv(c.env);
+  if (sessionEnv == null) {
+    return c.json(serviceUnavailableBody, 503);
+  }
+  const hyper = c.env.HYPERDRIVE;
+  if (hyper == null) {
+    return c.json(
+      {
+        code: "SERVICE_UNAVAILABLE" as const,
+        message: "HYPERDRIVE binding is not configured.",
+      },
+      503,
+    );
+  }
+
+  let bodyJson: unknown;
+  try {
+    bodyJson = await c.req.json();
+  } catch {
+    return c.json({ code: "BAD_REQUEST", message: "Expected JSON body." }, 400);
+  }
+
+  const pParams = pageIdPathSchema.safeParse({ pageId: c.req.param("pageId") });
+  if (!pParams.success) {
+    return c.json(
+      { code: "VALIDATION_ERROR", message: pParams.error.message },
+      400,
+    );
+  }
+  const parsed = pageMoveRequestSchema.safeParse(bodyJson);
+  if (!parsed.success) {
+    return c.json(
+      {
+        code: "VALIDATION_ERROR",
+        message: parsed.error.flatten().formErrors.join("; "),
+      },
+      400,
+    );
+  }
+
+  const d = parsed.data;
+  const moveBody: PageMoveBody = {
+    destGroupId: d.destGroupId,
+    setAsMainPage: d.setAsMainPage,
+    groupCreation:
+      d.groupCreation == null
+        ? undefined
+        : {
+            groupEncryptedName: d.groupCreation.groupEncryptedName,
+            groupPasswordHash: d.groupCreation.groupPasswordHash,
+            groupIsPublic: d.groupCreation.groupIsPublic,
+            groupAccessKeyring: d.groupCreation.groupAccessKeyring,
+            groupEncryptedInternalKeyring:
+              d.groupCreation.groupEncryptedInternalKeyring,
+            groupEncryptedContentKeyring: d.groupCreation.groupEncryptedContentKeyring,
+            groupPublicKeyring: d.groupCreation.groupPublicKeyring,
+            groupEncryptedPrivateKeyring: d.groupCreation.groupEncryptedPrivateKeyring,
+            groupOwnerEncryptedName: d.groupCreation.groupOwnerEncryptedName,
+          },
+    reencrypt:
+      d.reencrypt == null
+        ? undefined
+        : {
+            pageEncryptedSymmetricKeyring:
+              d.reencrypt.pageEncryptedSymmetricKeyring,
+            pageEncryptedRelativeTitle: d.reencrypt.pageEncryptedRelativeTitle,
+            pageEncryptedAbsoluteTitle: d.reencrypt.pageEncryptedAbsoluteTitle,
+            pageEncryptedUpdate: d.reencrypt.pageEncryptedUpdate,
+            pageEncryptedSnapshots: Object.fromEntries(
+              Object.entries(d.reencrypt.pageEncryptedSnapshots).map(
+                ([id, snap]) => [
+                  id,
+                  {
+                    encryptedSymmetricKey: snap.encryptedSymmetricKey,
+                    encryptedData: snap.encryptedData,
+                  },
+                ],
+              ),
+            ),
+          },
+  };
+
+  const db = getDbForConnectionString(hyper.connectionString);
+  const cookieHeader = c.req.header("Cookie");
+  try {
+    const { performPageMove } = await import("@deepnotes/session");
+    await performPageMove({
+      db,
+      env: sessionEnv,
+      accessCookie: readCookieHeader(cookieHeader, "accessToken"),
+      pageId: pParams.data.pageId,
+      body: moveBody,
+    });
+    return c.body(null, 204);
+  } catch (e) {
+    const { SessionError } = await import("@deepnotes/session");
+    if (e instanceof SessionError) {
+      return c.json(
+        { code: e.code, message: e.message },
+        e.status as ContentfulStatusCode,
+      );
+    }
+    throw e;
+  }
+});
+
 app.post("/api/pages/:pageId/bump", async (c) => {
   const sessionEnv = getSessionEnv(c.env);
   if (sessionEnv == null) {

new-deepnotes/apps/api-worker/src/index.ts

@@ -89,7 +89,7 @@ Working checklist for Phase 0 of [docs/RESTART_PLAN.md](../../docs/RESTART_PLAN.
 | `websocket/groups/remove-user` | `DELETE /api/groups/:groupId/members/:userId` | |
 | `websocket/groups/privacy/make-private` | `POST /api/groups/:groupId/privacy/private` | **implemented** — see `groups.privacy.makePrivate` row above |
 | `websocket/groups/rotate-keys` | — | **removed** per RESTART_PLAN |
-| `websocket/pages/move` | `POST /api/pages/:pageId/move` | |
+| `websocket/pages/move` | `POST /api/pages/:pageId/move` (**implemented** — `pageMoveRequestSchema`; `performPageMove`: Pro, optional `groupCreation`, `reencrypt` when changing group) | |
 | `websocket/users/account/change-password` | `POST /api/users/me/password` | **implemented** in `@deepnotes/session` (`performUserPasswordChange`) |
 | `websocket/users/account/email-change/finish` | `POST /api/users/me/email-change/confirm` | **implemented** — one call: `oldLoginHash`, `emailVerificationCode` (6 digits), `newLoginHash`, `userEncryptedPrivateKeyring`, `userEncryptedSymmetricKeyring` (b64; same as register/password); 204, clears cookies; optional Stripe in worker |
 | `websocket/users/account/rotate-keys` | — | **removed** |

new-deepnotes/docs/TRPC_REST_MAP.md

@@ -39,6 +39,7 @@ export {
   groupPrivacyPublicRequestSchema,
   pageBacklinkCreateRequestSchema,
   pageBumpRequestSchema,
+  pageMoveRequestSchema,
   pageIdPathSchema,
   pageSnapshotCreateResponseSchema,
   pageSnapshotLoadResponseSchema,

new-deepnotes/packages/api/src/index.ts

@@ -75,6 +75,7 @@ describe("getOpenApiDocument", () => {
     expect(doc.paths?.["/api/groups/{groupId}"]?.delete).toBeDefined();
     expect(doc.paths?.["/api/groups/{groupId}/restore"]?.post).toBeDefined();
     expect(doc.paths?.["/api/groups/{groupId}/purge"]?.post).toBeDefined();
+    expect(doc.paths?.["/api/pages/{pageId}/move"]?.post).toBeDefined();
     expect(doc.paths?.["/api/pages/{pageId}/bump"]?.post).toBeDefined();
     expect(
       doc.paths?.["/api/pages/{pageId}/backlinks"]?.post,

new-deepnotes/packages/api/src/openapi.test.ts

@@ -32,6 +32,7 @@ import {
   groupPrivacyPublicRequestSchema,
   pageBacklinkCreateRequestSchema,
   pageBumpRequestSchema,
+  pageMoveRequestSchema,
   pageIdPathSchema,
   pageSnapshotCreateResponseSchema,
   pageSnapshotLoadResponseSchema,
@@ -886,6 +887,35 @@ registry.registerPath({
   },
 });
 
+registry.registerPath({
+  method: "post",
+  path: "/api/pages/{pageId}/move",
+  summary: "Move page (optionally create group, re-key, set main)",
+  description:
+    "Replaces `websocket/pages/move` — Pro-only; `editGroupSettings` on the page's current group, `editGroupPages` on destination unless `groupCreation` creates it. `reencrypt` is required when the page changes group (Yjs `page_updates` replaced with a single index-0 row; snapshots updated by id).",
+  request: {
+    params: pageIdPathSchema,
+    body: {
+      content: {
+        "application/json": {
+          schema: pageMoveRequestSchema,
+        },
+      },
+    },
+  },
+  responses: {
+    204: { description: "Move completed." },
+    400: {
+      description: "No-op move, or invalid payload.",
+      content: { "application/json": { schema: sessionErrorResponseSchema } },
+    },
+    401: sessionUnauthorized401,
+    403: sessionForbidden403,
+    404: sessionNotFound404,
+    503: sessionServiceUnavailable503,
+  },
+});
+
 registry.registerPath({
   method: "post",
   path: "/api/pages/{pageId}/bump",

new-deepnotes/packages/api/src/openapi.ts

@@ -211,6 +211,56 @@ export const pageBumpRequestSchema = z
   })
   .openapi("PageBumpRequest");
 
+/** Ciphertext to persist after a cross-group move (legacy `pageKeyRotationSchema` + Yjs update). */
+export const pageMoveReencryptRequestSchema = z
+  .object({
+    pageEncryptedSymmetricKeyring: byteB64,
+    pageEncryptedRelativeTitle: byteB64,
+    pageEncryptedAbsoluteTitle: byteB64,
+    pageEncryptedUpdate: byteB64,
+    pageEncryptedSnapshots: z
+      .record(
+        nanoidRecordKeySchema,
+        z.object({
+          encryptedSymmetricKey: byteB64,
+          encryptedData: byteB64,
+        }),
+      )
+      .default({}),
+  })
+  .openapi("PageMoveReencryptRequest");
+
+/** Create a new shared group in the same call as a move (legacy WS step 1 `groupCreation`). */
+export const pageMoveGroupCreationRequestSchema = z
+  .object({
+    groupEncryptedName: byteB64,
+    groupPasswordHash: byteB64.optional(),
+    groupIsPublic: z.boolean(),
+    groupAccessKeyring: byteB64,
+    groupEncryptedInternalKeyring: byteB64,
+    groupEncryptedContentKeyring: byteB64,
+    groupPublicKeyring: byteB64,
+    groupEncryptedPrivateKeyring: byteB64,
+    groupOwnerEncryptedName: byteB64,
+  })
+  .openapi("PageMoveGroupCreationRequest");
+
+/**
+ * Replaces `websocket/pages/move` (two tRPC steps) with one `POST` (optional `reencrypt` when
+ * `sourceGroupId !== destGroupId`).
+ */
+export const pageMoveRequestSchema = z
+  .object({
+    destGroupId: z
+      .string()
+      .regex(/^[A-Za-z0-9_-]{21}$/)
+      .openapi(nanoidIdOpenapi),
+    setAsMainPage: z.boolean(),
+    groupCreation: pageMoveGroupCreationRequestSchema.optional(),
+    reencrypt: pageMoveReencryptRequestSchema.optional(),
+  })
+  .openapi("PageMoveRequest");
+
 export const pageBacklinkCreateRequestSchema = z
   .object({
     sourcePageId: z