fix: register and login

Author: gustavotoyota

.github/workflows/new-deepnotes-ci.yml

@@ -25,16 +25,16 @@ jobs:
           POSTGRES_PASSWORD: deepnotes
           POSTGRES_DB: deepnotes
         ports:
-          - 5433:5432
+          - 5432:5432
         options: >-
           --health-cmd "pg_isready -U deepnotes -d deepnotes"
           --health-interval 5s
           --health-timeout 5s
           --health-retries 10
     env:
-      DATABASE_URL: postgresql://deepnotes:deepnotes@127.0.0.1:5433/deepnotes
+      DATABASE_URL: postgresql://postgres:postgres@127.0.0.1:5432/deepnotes
       # CREATEDB-capable catalog connection for @deepnotes/db template-clone tests (RESTART_PLAN §5.7)
-      DATABASE_ADMIN_URL: postgresql://deepnotes:deepnotes@127.0.0.1:5433/postgres
+      DATABASE_ADMIN_URL: postgresql://postgres:postgres@127.0.0.1:5432/postgres
     steps:
       - uses: actions/checkout@v4
 

new-deepnotes/apps/api-worker/src/db-pool.ts

@@ -1,14 +1,6 @@
 import { createDb, type DeepnotesDb } from "@deepnotes/db/client";
 
-let cachedConn: string | undefined;
-let cachedDb: DeepnotesDb | undefined;
-
-/** One Drizzle instance per isolate; Hyperdrive URL is stable for the binding. */
+/** Create a new Drizzle instance per request to avoid Cloudflare Workers I/O isolation issues. */
 export function getDbForConnectionString(connectionString: string): DeepnotesDb {
-  if (cachedDb != null && cachedConn === connectionString) {
-    return cachedDb;
-  }
-  cachedConn = connectionString;
-  cachedDb = createDb(connectionString);
-  return cachedDb;
+  return createDb(connectionString);
 }

new-deepnotes/apps/api-worker/src/routes/users.ts

@@ -50,10 +50,16 @@ app.post("/api/users", async (c) => {
 
   const parsed = userRegisterRequestSchema.safeParse(bodyJson);
   if (!parsed.success) {
+    const flattened = parsed.error.flatten();
+    const formErrors = flattened.formErrors.join("; ");
+    const fieldErrors = Object.entries(flattened.fieldErrors)
+      .map(([field, errors]) => `${field}: ${errors?.join(", ")}`)
+      .join("; ");
+    const message = [formErrors, fieldErrors].filter(Boolean).join("; ") || "Invalid request data";
     return c.json(
       {
         code: "VALIDATION_ERROR",
-        message: parsed.error.flatten().formErrors.join("; "),
+        message,
       },
       400,
     );

new-deepnotes/apps/api-worker/wrangler.toml

@@ -28,7 +28,7 @@ service = "deepnotes-api"
 [[hyperdrive]]
 binding = "HYPERDRIVE"
 id = "00000000-0000-0000-0000-000000000000"
-localConnectionString = "postgresql://deepnotes:deepnotes@127.0.0.1:5433/deepnotes"
+localConnectionString = "postgresql://postgres:postgres@127.0.0.1:5432/deepnotes"
 
 # Daily cleanup of soft-deleted pages and groups past their grace period.
 [[triggers.crons]]

new-deepnotes/apps/web/package.json

@@ -47,7 +47,6 @@
     "clsx": "^2.1.1",
     "highlight.js": "^11.11.1",
     "katex": "0.16.22",
-    "libsodium-wrappers-sumo": "^0.8.0",
     "lowlight": "3.3.0",
     "lucide-vue-next": "^1.0.0",
     "msgpackr": "^1.11.2",

new-deepnotes/apps/web/src/features/auth/build-user-register.ts

@@ -5,9 +5,9 @@ import {
   ensureSodiumReady,
   wrapKeyPair,
   type KeyPair,
+  generateKeyPair,
 } from "@deepnotes/e2ee";
 import { pack } from "msgpackr";
-import sodium from "libsodium-wrappers-sumo";
 import { nanoid } from "nanoid";
 
 import type { components } from "../../api/api-types.generated";
@@ -41,7 +41,7 @@ function buildPersonalGroupCreation(input: {
   const internalKeyring = createSymmetricKeyring();
   const contentKeyring = createSymmetricKeyring();
 
-  const rawGroupKeys = sodium.crypto_box_keypair();
+  const rawGroupKeys = generateKeyPair();
   const groupPublicRing = createKeyring(rawGroupKeys.publicKey);
   const groupPrivateRing = createPrivateKeyring(rawGroupKeys.privateKey);
 
@@ -113,7 +113,7 @@ export async function buildUserRegisterRequest(input: {
   const pageId = nanoid();
   const displayName = input.displayName ?? "";
 
-  const rawUserKeys = sodium.crypto_box_keypair();
+  const rawUserKeys = generateKeyPair();
   const userPublicKeyring = createKeyring(rawUserKeys.publicKey);
   const userPrivateKeyring = createPrivateKeyring(rawUserKeys.privateKey);
   const userKeyPair = wrapKeyPair(userPublicKeyring, userPrivateKeyring);

new-deepnotes/apps/web/src/features/groups/group-make-private-crypto.ts

@@ -7,8 +7,8 @@ import {
   ensureSodiumReady,
   wrapKeyPair,
   wrapSymmetricKey,
+  generateKeyPair,
 } from "@deepnotes/e2ee";
-import sodium from "libsodium-wrappers-sumo";
 
 import { uint8ToBase64 } from "../auth/bytes";
 import type { StoredSessionCrypto } from "../auth/crypto-storage";
@@ -122,7 +122,7 @@ export async function buildGroupPrivacyMakePrivateRequest(input: {
   const newGroupInternalKeyring = oldGroupInternalKeyring.addKey();
   const newGroupContentKeyring = oldGroupContentKeyring.addKey();
 
-  const newGroupRawKeypair = sodium.crypto_box_keypair();
+  const newGroupRawKeypair = generateKeyPair();
   const newGroupPublicKeyring = oldGroupPublicKeyring.addKey(
     newGroupRawKeypair.publicKey,
   );

new-deepnotes/apps/web/vite.config.ts

@@ -25,9 +25,6 @@ export default defineConfig({
       },
     },
   },
-  optimizeDeps: {
-    include: ["libsodium-wrappers-sumo"],
-  },
   test: {
     environment: "happy-dom",
     include: ["src/**/*.test.ts"],

new-deepnotes/docker-compose.yml

@@ -2,7 +2,7 @@ services:
   postgres:
     image: postgres:16-alpine
     ports:
-      - "5433:5432"
+      - "5432:5432"
     environment:
       POSTGRES_USER: deepnotes
       POSTGRES_PASSWORD: deepnotes

new-deepnotes/docs/DEPLOY_CLOUDFLARE.md

@@ -36,7 +36,7 @@ Typical pattern:
 
 ### Local
 
-See `template.env` and `docker-compose.yml`: Postgres on `5433`, Redis on `6380`, `DATABASE_URL`, optional `DATABASE_ADMIN_URL` for template DB tests.
+See `template.env` and `docker-compose.yml`: Postgres on `5432`, Redis on `6380`, `DATABASE_URL`, optional `DATABASE_ADMIN_URL` for template DB tests.
 
 ## CI