feat(18-03): add profile routes, public setup endpoint, and auth middleware updates
- GET /api/users/:id/profile: public profile with public setups (no auth) - PUT /api/auth/profile: update own profile (requires auth) - GET /api/setups/:id/public: public setup view with items (no auth) - Auth middleware skips public profile and public setup GET endpoints - Register profileRoutes at /api/users in index.ts - Add getOrCreateUncategorized to category service (Rule 3 fix) - 10 route tests covering auth, public access, and 404 cases
This commit is contained in:
@@ -16,6 +16,7 @@ import { imageRoutes } from "./routes/images.ts";
|
|||||||
import { itemRoutes } from "./routes/items.ts";
|
import { itemRoutes } from "./routes/items.ts";
|
||||||
import { oauthRoutes, wellKnownRoute } from "./routes/oauth.ts";
|
import { oauthRoutes, wellKnownRoute } from "./routes/oauth.ts";
|
||||||
import { settingsRoutes } from "./routes/settings.ts";
|
import { settingsRoutes } from "./routes/settings.ts";
|
||||||
|
import { profileRoutes } from "./routes/profiles.ts";
|
||||||
import { setupRoutes } from "./routes/setups.ts";
|
import { setupRoutes } from "./routes/setups.ts";
|
||||||
import { threadRoutes } from "./routes/threads.ts";
|
import { threadRoutes } from "./routes/threads.ts";
|
||||||
import { totalRoutes } from "./routes/totals.ts";
|
import { totalRoutes } from "./routes/totals.ts";
|
||||||
@@ -73,7 +74,13 @@ app.use("/api/*", async (c, next) => {
|
|||||||
if (c.req.path.startsWith("/api/auth")) return next();
|
if (c.req.path.startsWith("/api/auth")) return next();
|
||||||
// Skip health check
|
// Skip health check
|
||||||
if (c.req.path === "/api/health") return next();
|
if (c.req.path === "/api/health") return next();
|
||||||
// All methods require auth for userId resolution
|
// Skip public profile endpoint (GET /api/users/:id/profile)
|
||||||
|
if (/^\/api\/users\/\d+\/profile$/.test(c.req.path) && c.req.method === "GET")
|
||||||
|
return next();
|
||||||
|
// Skip public setup view (GET /api/setups/:id/public)
|
||||||
|
if (/^\/api\/setups\/\d+\/public$/.test(c.req.path) && c.req.method === "GET")
|
||||||
|
return next();
|
||||||
|
// All other methods require auth for userId resolution
|
||||||
return requireAuth(c, next);
|
return requireAuth(c, next);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -85,6 +92,7 @@ app.route("/api/totals", totalRoutes);
|
|||||||
app.route("/api/images", imageRoutes);
|
app.route("/api/images", imageRoutes);
|
||||||
app.route("/api/settings", settingsRoutes);
|
app.route("/api/settings", settingsRoutes);
|
||||||
app.route("/api/threads", threadRoutes);
|
app.route("/api/threads", threadRoutes);
|
||||||
|
app.route("/api/users", profileRoutes);
|
||||||
app.route("/api/setups", setupRoutes);
|
app.route("/api/setups", setupRoutes);
|
||||||
|
|
||||||
// MCP server (conditionally mounted)
|
// MCP server (conditionally mounted)
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import {
|
|||||||
deleteApiKey,
|
deleteApiKey,
|
||||||
listApiKeys,
|
listApiKeys,
|
||||||
} from "../services/auth.service.ts";
|
} from "../services/auth.service.ts";
|
||||||
|
import { updateProfile } from "../services/profile.service.ts";
|
||||||
|
import { updateProfileSchema } from "../../shared/schemas.ts";
|
||||||
|
|
||||||
type Env = { Variables: { db?: any; userId?: number } };
|
type Env = { Variables: { db?: any; userId?: number } };
|
||||||
|
|
||||||
@@ -69,4 +71,20 @@ app.delete("/keys/:id", requireAuth, async (c) => {
|
|||||||
return c.json({ ok: true });
|
return c.json({ ok: true });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// ── Profile Update (protected) ──────────────────────────────────────
|
||||||
|
|
||||||
|
app.put(
|
||||||
|
"/profile",
|
||||||
|
requireAuth,
|
||||||
|
zValidator("json", updateProfileSchema),
|
||||||
|
async (c) => {
|
||||||
|
const db = c.get("db");
|
||||||
|
const userId = c.get("userId")!;
|
||||||
|
const data = c.req.valid("json");
|
||||||
|
const updated = await updateProfile(db, userId, data);
|
||||||
|
if (!updated) return c.json({ error: "User not found" }, 404);
|
||||||
|
return c.json(updated);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
export const authRoutes = app;
|
export const authRoutes = app;
|
||||||
|
|||||||
21
src/server/routes/profiles.ts
Normal file
21
src/server/routes/profiles.ts
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import { Hono } from "hono";
|
||||||
|
import { parseId } from "../lib/params.ts";
|
||||||
|
import { getPublicProfile } from "../services/profile.service.ts";
|
||||||
|
|
||||||
|
type Env = { Variables: { db?: any; userId?: number } };
|
||||||
|
|
||||||
|
const app = new Hono<Env>();
|
||||||
|
|
||||||
|
// GET /:id/profile — Public profile (no auth required)
|
||||||
|
app.get("/:id/profile", async (c) => {
|
||||||
|
const db = c.get("db");
|
||||||
|
const id = parseId(c.req.param("id"));
|
||||||
|
if (!id) return c.json({ error: "Invalid user ID" }, 400);
|
||||||
|
|
||||||
|
const profile = await getPublicProfile(db, id);
|
||||||
|
if (!profile) return c.json({ error: "User not found" }, 404);
|
||||||
|
|
||||||
|
return c.json(profile);
|
||||||
|
});
|
||||||
|
|
||||||
|
export { app as profileRoutes };
|
||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
} from "../../shared/schemas.ts";
|
} from "../../shared/schemas.ts";
|
||||||
import { parseId } from "../lib/params.ts";
|
import { parseId } from "../lib/params.ts";
|
||||||
import { withImageUrls } from "../services/storage.service.ts";
|
import { withImageUrls } from "../services/storage.service.ts";
|
||||||
|
import { getPublicSetupWithItems } from "../services/profile.service.ts";
|
||||||
import {
|
import {
|
||||||
createSetup,
|
createSetup,
|
||||||
deleteSetup,
|
deleteSetup,
|
||||||
@@ -40,6 +41,16 @@ app.post("/", zValidator("json", createSetupSchema), async (c) => {
|
|||||||
return c.json(setup, 201);
|
return c.json(setup, 201);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Public setup view (no auth required — skipped in index.ts middleware)
|
||||||
|
app.get("/:id/public", async (c) => {
|
||||||
|
const db = c.get("db");
|
||||||
|
const id = parseId(c.req.param("id"));
|
||||||
|
if (!id) return c.json({ error: "Invalid setup ID" }, 400);
|
||||||
|
const setup = await getPublicSetupWithItems(db, id);
|
||||||
|
if (!setup) return c.json({ error: "Setup not found" }, 404);
|
||||||
|
return c.json(setup);
|
||||||
|
});
|
||||||
|
|
||||||
app.get("/:id", async (c) => {
|
app.get("/:id", async (c) => {
|
||||||
const db = c.get("db");
|
const db = c.get("db");
|
||||||
const userId = c.get("userId")!;
|
const userId = c.get("userId")!;
|
||||||
|
|||||||
@@ -1,9 +1,25 @@
|
|||||||
import { asc, eq } from "drizzle-orm";
|
import { and, asc, eq } from "drizzle-orm";
|
||||||
import { db as prodDb } from "../../db/index.ts";
|
import { db as prodDb } from "../../db/index.ts";
|
||||||
import { categories, items } from "../../db/schema.ts";
|
import { categories, items } from "../../db/schema.ts";
|
||||||
|
|
||||||
type Db = typeof prodDb;
|
type Db = typeof prodDb;
|
||||||
|
|
||||||
|
export async function getOrCreateUncategorized(db: Db, userId: number) {
|
||||||
|
const [existing] = await db
|
||||||
|
.select()
|
||||||
|
.from(categories)
|
||||||
|
.where(
|
||||||
|
and(eq(categories.userId, userId), eq(categories.name, "Uncategorized")),
|
||||||
|
);
|
||||||
|
if (existing) return existing;
|
||||||
|
|
||||||
|
const [created] = await db
|
||||||
|
.insert(categories)
|
||||||
|
.values({ name: "Uncategorized", icon: "package", userId })
|
||||||
|
.returning();
|
||||||
|
return created;
|
||||||
|
}
|
||||||
|
|
||||||
export function getAllCategories(db: Db = prodDb) {
|
export function getAllCategories(db: Db = prodDb) {
|
||||||
return db.select().from(categories).orderBy(asc(categories.name)).all();
|
return db.select().from(categories).orderBy(asc(categories.name)).all();
|
||||||
}
|
}
|
||||||
|
|||||||
250
tests/routes/profiles.test.ts
Normal file
250
tests/routes/profiles.test.ts
Normal file
@@ -0,0 +1,250 @@
|
|||||||
|
import { beforeEach, describe, expect, it } from "bun:test";
|
||||||
|
import { eq } from "drizzle-orm";
|
||||||
|
import { Hono } from "hono";
|
||||||
|
import * as schema from "../../src/db/schema.ts";
|
||||||
|
import { updateProfileSchema } from "../../src/shared/schemas.ts";
|
||||||
|
import { profileRoutes } from "../../src/server/routes/profiles.ts";
|
||||||
|
import { setupRoutes } from "../../src/server/routes/setups.ts";
|
||||||
|
import { getPublicSetupWithItems } from "../../src/server/services/profile.service.ts";
|
||||||
|
import { updateProfile } from "../../src/server/services/profile.service.ts";
|
||||||
|
import { createTestDb } from "../helpers/db.ts";
|
||||||
|
import { zValidator } from "@hono/zod-validator";
|
||||||
|
import { parseId } from "../../src/server/lib/params.ts";
|
||||||
|
|
||||||
|
type Db = Awaited<ReturnType<typeof createTestDb>>["db"];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a test app with authenticated routes.
|
||||||
|
* Auth middleware is simulated by always injecting userId.
|
||||||
|
*/
|
||||||
|
async function createTestApp() {
|
||||||
|
const { db, userId } = await createTestDb();
|
||||||
|
const app = new Hono();
|
||||||
|
|
||||||
|
// Inject db for all routes
|
||||||
|
app.use("*", async (c, next) => {
|
||||||
|
c.set("db", db);
|
||||||
|
c.set("userId", userId);
|
||||||
|
await next();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Public routes
|
||||||
|
app.route("/api/users", profileRoutes);
|
||||||
|
|
||||||
|
// Profile update on auth routes (inline to avoid requireAuth in tests)
|
||||||
|
app.put(
|
||||||
|
"/api/auth/profile",
|
||||||
|
zValidator("json", updateProfileSchema),
|
||||||
|
async (c) => {
|
||||||
|
const testDb = c.get("db");
|
||||||
|
const uid = c.get("userId")!;
|
||||||
|
const data = c.req.valid("json");
|
||||||
|
const updated = await updateProfile(testDb, uid, data);
|
||||||
|
if (!updated) return c.json({ error: "User not found" }, 404);
|
||||||
|
return c.json(updated);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// Setup routes including /:id/public
|
||||||
|
app.route("/api/setups", setupRoutes);
|
||||||
|
|
||||||
|
return { app, db, userId };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a test app WITHOUT auth — no userId injected.
|
||||||
|
* Public routes should still work; protected routes should fail.
|
||||||
|
*/
|
||||||
|
async function createNoAuthTestApp() {
|
||||||
|
const { db, userId } = await createTestDb();
|
||||||
|
const app = new Hono();
|
||||||
|
|
||||||
|
app.use("*", async (c, next) => {
|
||||||
|
c.set("db", db);
|
||||||
|
// No userId set — simulates unauthenticated request
|
||||||
|
await next();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Public routes (work without auth)
|
||||||
|
app.route("/api/users", profileRoutes);
|
||||||
|
|
||||||
|
// Protected profile update — simulates auth rejection
|
||||||
|
app.put("/api/auth/profile", async (c) => {
|
||||||
|
const uid = c.get("userId");
|
||||||
|
if (!uid) return c.json({ error: "Authentication required" }, 401);
|
||||||
|
return c.json({ error: "Unexpected" }, 500);
|
||||||
|
});
|
||||||
|
|
||||||
|
app.route("/api/setups", setupRoutes);
|
||||||
|
|
||||||
|
return { app, db, userId };
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("Profile Routes", () => {
|
||||||
|
let app: Hono;
|
||||||
|
let db: Db;
|
||||||
|
let userId: number;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const testData = await createTestApp();
|
||||||
|
app = testData.app;
|
||||||
|
db = testData.db;
|
||||||
|
userId = testData.userId;
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("GET /api/users/:id/profile", () => {
|
||||||
|
it("returns 200 with profile data without auth", async () => {
|
||||||
|
// Set up profile data
|
||||||
|
await db
|
||||||
|
.update(schema.users)
|
||||||
|
.set({ displayName: "Alice", bio: "Bikepacker" })
|
||||||
|
.where(eq(schema.users.id, userId));
|
||||||
|
|
||||||
|
const res = await app.request(`/api/users/${userId}/profile`);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.id).toBe(userId);
|
||||||
|
expect(body.displayName).toBe("Alice");
|
||||||
|
expect(body.bio).toBe("Bikepacker");
|
||||||
|
expect(body.setups).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("includes only public setups", async () => {
|
||||||
|
// Create public and private setups
|
||||||
|
await db
|
||||||
|
.insert(schema.setups)
|
||||||
|
.values([
|
||||||
|
{ name: "Public Setup", userId, isPublic: true },
|
||||||
|
{ name: "Private Setup", userId, isPublic: false },
|
||||||
|
]);
|
||||||
|
|
||||||
|
const res = await app.request(`/api/users/${userId}/profile`);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.setups).toHaveLength(1);
|
||||||
|
expect(body.setups[0].name).toBe("Public Setup");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns 404 for non-existent user", async () => {
|
||||||
|
const res = await app.request("/api/users/99999/profile");
|
||||||
|
expect(res.status).toBe(404);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns 400 for invalid user ID", async () => {
|
||||||
|
const res = await app.request("/api/users/abc/profile");
|
||||||
|
expect(res.status).toBe(400);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("PUT /api/auth/profile", () => {
|
||||||
|
it("returns 200 with updated fields when authenticated", async () => {
|
||||||
|
const res = await app.request("/api/auth/profile", {
|
||||||
|
method: "PUT",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({
|
||||||
|
displayName: "Alice",
|
||||||
|
bio: "Loves bikepacking",
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.displayName).toBe("Alice");
|
||||||
|
expect(body.bio).toBe("Loves bikepacking");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns 401 without auth", async () => {
|
||||||
|
const { app: noAuthApp } = await createNoAuthTestApp();
|
||||||
|
|
||||||
|
const res = await noAuthApp.request("/api/auth/profile", {
|
||||||
|
method: "PUT",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({ displayName: "Alice" }),
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(res.status).toBe(401);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Public Setup Routes", () => {
|
||||||
|
let app: Hono;
|
||||||
|
let db: Db;
|
||||||
|
let userId: number;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const testData = await createTestApp();
|
||||||
|
app = testData.app;
|
||||||
|
db = testData.db;
|
||||||
|
userId = testData.userId;
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("GET /api/setups/:id/public", () => {
|
||||||
|
it("returns 200 for public setup without auth", async () => {
|
||||||
|
const [setup] = await db
|
||||||
|
.insert(schema.setups)
|
||||||
|
.values({ name: "My Public Setup", userId, isPublic: true })
|
||||||
|
.returning();
|
||||||
|
|
||||||
|
const res = await app.request(`/api/setups/${setup.id}/public`);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.name).toBe("My Public Setup");
|
||||||
|
expect(body.isPublic).toBe(true);
|
||||||
|
expect(body.items).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns 200 for public setup with items", async () => {
|
||||||
|
const [setup] = await db
|
||||||
|
.insert(schema.setups)
|
||||||
|
.values({ name: "Loaded Setup", userId, isPublic: true })
|
||||||
|
.returning();
|
||||||
|
|
||||||
|
const [cat] = await db
|
||||||
|
.select()
|
||||||
|
.from(schema.categories)
|
||||||
|
.where(eq(schema.categories.userId, userId));
|
||||||
|
|
||||||
|
const [item] = await db
|
||||||
|
.insert(schema.items)
|
||||||
|
.values({
|
||||||
|
name: "Tent",
|
||||||
|
categoryId: cat.id,
|
||||||
|
userId,
|
||||||
|
weightGrams: 1200,
|
||||||
|
priceCents: 30000,
|
||||||
|
})
|
||||||
|
.returning();
|
||||||
|
|
||||||
|
await db.insert(schema.setupItems).values({
|
||||||
|
setupId: setup.id,
|
||||||
|
itemId: item.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
const res = await app.request(`/api/setups/${setup.id}/public`);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.items).toHaveLength(1);
|
||||||
|
expect(body.items[0].name).toBe("Tent");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns 404 for private setup", async () => {
|
||||||
|
const [setup] = await db
|
||||||
|
.insert(schema.setups)
|
||||||
|
.values({ name: "Private Setup", userId, isPublic: false })
|
||||||
|
.returning();
|
||||||
|
|
||||||
|
const res = await app.request(`/api/setups/${setup.id}/public`);
|
||||||
|
expect(res.status).toBe(404);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns 404 for non-existent setup", async () => {
|
||||||
|
const res = await app.request("/api/setups/99999/public");
|
||||||
|
expect(res.status).toBe(404);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user