fix: OIDC auth flow, Vite proxy, and PostgreSQL query compat
- Add auth redirect in root layout for unauthenticated users - Proxy OIDC routes (/login, /callback, /logout) through Vite dev server - Strip Secure flag from OIDC cookies in dev mode (HTTP localhost) - Disable retry on auth query to prevent stale cookie loops - Fix SQLite .get()/.all()/.run() calls in category and global-item services for PostgreSQL compatibility - Add userId scoping to category service functions - Add OIDC error logging in auth middleware - Apply linter auto-formatting across affected files Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -11,6 +11,7 @@ export function useAuth() {
|
|||||||
queryKey: ["auth"],
|
queryKey: ["auth"],
|
||||||
queryFn: () => apiGet<AuthState>("/api/auth/me"),
|
queryFn: () => apiGet<AuthState>("/api/auth/me"),
|
||||||
staleTime: 5 * 60 * 1000,
|
staleTime: 5 * 60 * 1000,
|
||||||
|
retry: false,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,9 +12,12 @@ import { Route as rootRouteImport } from './routes/__root'
|
|||||||
import { Route as SettingsRouteImport } from './routes/settings'
|
import { Route as SettingsRouteImport } from './routes/settings'
|
||||||
import { Route as LoginRouteImport } from './routes/login'
|
import { Route as LoginRouteImport } from './routes/login'
|
||||||
import { Route as IndexRouteImport } from './routes/index'
|
import { Route as IndexRouteImport } from './routes/index'
|
||||||
|
import { Route as GlobalItemsIndexRouteImport } from './routes/global-items/index'
|
||||||
import { Route as CollectionIndexRouteImport } from './routes/collection/index'
|
import { Route as CollectionIndexRouteImport } from './routes/collection/index'
|
||||||
|
import { Route as UsersUserIdRouteImport } from './routes/users/$userId'
|
||||||
import { Route as ThreadsThreadIdRouteImport } from './routes/threads/$threadId'
|
import { Route as ThreadsThreadIdRouteImport } from './routes/threads/$threadId'
|
||||||
import { Route as SetupsSetupIdRouteImport } from './routes/setups/$setupId'
|
import { Route as SetupsSetupIdRouteImport } from './routes/setups/$setupId'
|
||||||
|
import { Route as GlobalItemsGlobalItemIdRouteImport } from './routes/global-items/$globalItemId'
|
||||||
|
|
||||||
const SettingsRoute = SettingsRouteImport.update({
|
const SettingsRoute = SettingsRouteImport.update({
|
||||||
id: '/settings',
|
id: '/settings',
|
||||||
@@ -31,11 +34,21 @@ const IndexRoute = IndexRouteImport.update({
|
|||||||
path: '/',
|
path: '/',
|
||||||
getParentRoute: () => rootRouteImport,
|
getParentRoute: () => rootRouteImport,
|
||||||
} as any)
|
} as any)
|
||||||
|
const GlobalItemsIndexRoute = GlobalItemsIndexRouteImport.update({
|
||||||
|
id: '/global-items/',
|
||||||
|
path: '/global-items/',
|
||||||
|
getParentRoute: () => rootRouteImport,
|
||||||
|
} as any)
|
||||||
const CollectionIndexRoute = CollectionIndexRouteImport.update({
|
const CollectionIndexRoute = CollectionIndexRouteImport.update({
|
||||||
id: '/collection/',
|
id: '/collection/',
|
||||||
path: '/collection/',
|
path: '/collection/',
|
||||||
getParentRoute: () => rootRouteImport,
|
getParentRoute: () => rootRouteImport,
|
||||||
} as any)
|
} as any)
|
||||||
|
const UsersUserIdRoute = UsersUserIdRouteImport.update({
|
||||||
|
id: '/users/$userId',
|
||||||
|
path: '/users/$userId',
|
||||||
|
getParentRoute: () => rootRouteImport,
|
||||||
|
} as any)
|
||||||
const ThreadsThreadIdRoute = ThreadsThreadIdRouteImport.update({
|
const ThreadsThreadIdRoute = ThreadsThreadIdRouteImport.update({
|
||||||
id: '/threads/$threadId',
|
id: '/threads/$threadId',
|
||||||
path: '/threads/$threadId',
|
path: '/threads/$threadId',
|
||||||
@@ -46,31 +59,45 @@ const SetupsSetupIdRoute = SetupsSetupIdRouteImport.update({
|
|||||||
path: '/setups/$setupId',
|
path: '/setups/$setupId',
|
||||||
getParentRoute: () => rootRouteImport,
|
getParentRoute: () => rootRouteImport,
|
||||||
} as any)
|
} as any)
|
||||||
|
const GlobalItemsGlobalItemIdRoute = GlobalItemsGlobalItemIdRouteImport.update({
|
||||||
|
id: '/global-items/$globalItemId',
|
||||||
|
path: '/global-items/$globalItemId',
|
||||||
|
getParentRoute: () => rootRouteImport,
|
||||||
|
} as any)
|
||||||
|
|
||||||
export interface FileRoutesByFullPath {
|
export interface FileRoutesByFullPath {
|
||||||
'/': typeof IndexRoute
|
'/': typeof IndexRoute
|
||||||
'/login': typeof LoginRoute
|
'/login': typeof LoginRoute
|
||||||
'/settings': typeof SettingsRoute
|
'/settings': typeof SettingsRoute
|
||||||
|
'/global-items/$globalItemId': typeof GlobalItemsGlobalItemIdRoute
|
||||||
'/setups/$setupId': typeof SetupsSetupIdRoute
|
'/setups/$setupId': typeof SetupsSetupIdRoute
|
||||||
'/threads/$threadId': typeof ThreadsThreadIdRoute
|
'/threads/$threadId': typeof ThreadsThreadIdRoute
|
||||||
|
'/users/$userId': typeof UsersUserIdRoute
|
||||||
'/collection/': typeof CollectionIndexRoute
|
'/collection/': typeof CollectionIndexRoute
|
||||||
|
'/global-items/': typeof GlobalItemsIndexRoute
|
||||||
}
|
}
|
||||||
export interface FileRoutesByTo {
|
export interface FileRoutesByTo {
|
||||||
'/': typeof IndexRoute
|
'/': typeof IndexRoute
|
||||||
'/login': typeof LoginRoute
|
'/login': typeof LoginRoute
|
||||||
'/settings': typeof SettingsRoute
|
'/settings': typeof SettingsRoute
|
||||||
|
'/global-items/$globalItemId': typeof GlobalItemsGlobalItemIdRoute
|
||||||
'/setups/$setupId': typeof SetupsSetupIdRoute
|
'/setups/$setupId': typeof SetupsSetupIdRoute
|
||||||
'/threads/$threadId': typeof ThreadsThreadIdRoute
|
'/threads/$threadId': typeof ThreadsThreadIdRoute
|
||||||
|
'/users/$userId': typeof UsersUserIdRoute
|
||||||
'/collection': typeof CollectionIndexRoute
|
'/collection': typeof CollectionIndexRoute
|
||||||
|
'/global-items': typeof GlobalItemsIndexRoute
|
||||||
}
|
}
|
||||||
export interface FileRoutesById {
|
export interface FileRoutesById {
|
||||||
__root__: typeof rootRouteImport
|
__root__: typeof rootRouteImport
|
||||||
'/': typeof IndexRoute
|
'/': typeof IndexRoute
|
||||||
'/login': typeof LoginRoute
|
'/login': typeof LoginRoute
|
||||||
'/settings': typeof SettingsRoute
|
'/settings': typeof SettingsRoute
|
||||||
|
'/global-items/$globalItemId': typeof GlobalItemsGlobalItemIdRoute
|
||||||
'/setups/$setupId': typeof SetupsSetupIdRoute
|
'/setups/$setupId': typeof SetupsSetupIdRoute
|
||||||
'/threads/$threadId': typeof ThreadsThreadIdRoute
|
'/threads/$threadId': typeof ThreadsThreadIdRoute
|
||||||
|
'/users/$userId': typeof UsersUserIdRoute
|
||||||
'/collection/': typeof CollectionIndexRoute
|
'/collection/': typeof CollectionIndexRoute
|
||||||
|
'/global-items/': typeof GlobalItemsIndexRoute
|
||||||
}
|
}
|
||||||
export interface FileRouteTypes {
|
export interface FileRouteTypes {
|
||||||
fileRoutesByFullPath: FileRoutesByFullPath
|
fileRoutesByFullPath: FileRoutesByFullPath
|
||||||
@@ -78,34 +105,46 @@ export interface FileRouteTypes {
|
|||||||
| '/'
|
| '/'
|
||||||
| '/login'
|
| '/login'
|
||||||
| '/settings'
|
| '/settings'
|
||||||
|
| '/global-items/$globalItemId'
|
||||||
| '/setups/$setupId'
|
| '/setups/$setupId'
|
||||||
| '/threads/$threadId'
|
| '/threads/$threadId'
|
||||||
|
| '/users/$userId'
|
||||||
| '/collection/'
|
| '/collection/'
|
||||||
|
| '/global-items/'
|
||||||
fileRoutesByTo: FileRoutesByTo
|
fileRoutesByTo: FileRoutesByTo
|
||||||
to:
|
to:
|
||||||
| '/'
|
| '/'
|
||||||
| '/login'
|
| '/login'
|
||||||
| '/settings'
|
| '/settings'
|
||||||
|
| '/global-items/$globalItemId'
|
||||||
| '/setups/$setupId'
|
| '/setups/$setupId'
|
||||||
| '/threads/$threadId'
|
| '/threads/$threadId'
|
||||||
|
| '/users/$userId'
|
||||||
| '/collection'
|
| '/collection'
|
||||||
|
| '/global-items'
|
||||||
id:
|
id:
|
||||||
| '__root__'
|
| '__root__'
|
||||||
| '/'
|
| '/'
|
||||||
| '/login'
|
| '/login'
|
||||||
| '/settings'
|
| '/settings'
|
||||||
|
| '/global-items/$globalItemId'
|
||||||
| '/setups/$setupId'
|
| '/setups/$setupId'
|
||||||
| '/threads/$threadId'
|
| '/threads/$threadId'
|
||||||
|
| '/users/$userId'
|
||||||
| '/collection/'
|
| '/collection/'
|
||||||
|
| '/global-items/'
|
||||||
fileRoutesById: FileRoutesById
|
fileRoutesById: FileRoutesById
|
||||||
}
|
}
|
||||||
export interface RootRouteChildren {
|
export interface RootRouteChildren {
|
||||||
IndexRoute: typeof IndexRoute
|
IndexRoute: typeof IndexRoute
|
||||||
LoginRoute: typeof LoginRoute
|
LoginRoute: typeof LoginRoute
|
||||||
SettingsRoute: typeof SettingsRoute
|
SettingsRoute: typeof SettingsRoute
|
||||||
|
GlobalItemsGlobalItemIdRoute: typeof GlobalItemsGlobalItemIdRoute
|
||||||
SetupsSetupIdRoute: typeof SetupsSetupIdRoute
|
SetupsSetupIdRoute: typeof SetupsSetupIdRoute
|
||||||
ThreadsThreadIdRoute: typeof ThreadsThreadIdRoute
|
ThreadsThreadIdRoute: typeof ThreadsThreadIdRoute
|
||||||
|
UsersUserIdRoute: typeof UsersUserIdRoute
|
||||||
CollectionIndexRoute: typeof CollectionIndexRoute
|
CollectionIndexRoute: typeof CollectionIndexRoute
|
||||||
|
GlobalItemsIndexRoute: typeof GlobalItemsIndexRoute
|
||||||
}
|
}
|
||||||
|
|
||||||
declare module '@tanstack/react-router' {
|
declare module '@tanstack/react-router' {
|
||||||
@@ -131,6 +170,13 @@ declare module '@tanstack/react-router' {
|
|||||||
preLoaderRoute: typeof IndexRouteImport
|
preLoaderRoute: typeof IndexRouteImport
|
||||||
parentRoute: typeof rootRouteImport
|
parentRoute: typeof rootRouteImport
|
||||||
}
|
}
|
||||||
|
'/global-items/': {
|
||||||
|
id: '/global-items/'
|
||||||
|
path: '/global-items'
|
||||||
|
fullPath: '/global-items/'
|
||||||
|
preLoaderRoute: typeof GlobalItemsIndexRouteImport
|
||||||
|
parentRoute: typeof rootRouteImport
|
||||||
|
}
|
||||||
'/collection/': {
|
'/collection/': {
|
||||||
id: '/collection/'
|
id: '/collection/'
|
||||||
path: '/collection'
|
path: '/collection'
|
||||||
@@ -138,6 +184,13 @@ declare module '@tanstack/react-router' {
|
|||||||
preLoaderRoute: typeof CollectionIndexRouteImport
|
preLoaderRoute: typeof CollectionIndexRouteImport
|
||||||
parentRoute: typeof rootRouteImport
|
parentRoute: typeof rootRouteImport
|
||||||
}
|
}
|
||||||
|
'/users/$userId': {
|
||||||
|
id: '/users/$userId'
|
||||||
|
path: '/users/$userId'
|
||||||
|
fullPath: '/users/$userId'
|
||||||
|
preLoaderRoute: typeof UsersUserIdRouteImport
|
||||||
|
parentRoute: typeof rootRouteImport
|
||||||
|
}
|
||||||
'/threads/$threadId': {
|
'/threads/$threadId': {
|
||||||
id: '/threads/$threadId'
|
id: '/threads/$threadId'
|
||||||
path: '/threads/$threadId'
|
path: '/threads/$threadId'
|
||||||
@@ -152,6 +205,13 @@ declare module '@tanstack/react-router' {
|
|||||||
preLoaderRoute: typeof SetupsSetupIdRouteImport
|
preLoaderRoute: typeof SetupsSetupIdRouteImport
|
||||||
parentRoute: typeof rootRouteImport
|
parentRoute: typeof rootRouteImport
|
||||||
}
|
}
|
||||||
|
'/global-items/$globalItemId': {
|
||||||
|
id: '/global-items/$globalItemId'
|
||||||
|
path: '/global-items/$globalItemId'
|
||||||
|
fullPath: '/global-items/$globalItemId'
|
||||||
|
preLoaderRoute: typeof GlobalItemsGlobalItemIdRouteImport
|
||||||
|
parentRoute: typeof rootRouteImport
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,9 +219,12 @@ const rootRouteChildren: RootRouteChildren = {
|
|||||||
IndexRoute: IndexRoute,
|
IndexRoute: IndexRoute,
|
||||||
LoginRoute: LoginRoute,
|
LoginRoute: LoginRoute,
|
||||||
SettingsRoute: SettingsRoute,
|
SettingsRoute: SettingsRoute,
|
||||||
|
GlobalItemsGlobalItemIdRoute: GlobalItemsGlobalItemIdRoute,
|
||||||
SetupsSetupIdRoute: SetupsSetupIdRoute,
|
SetupsSetupIdRoute: SetupsSetupIdRoute,
|
||||||
ThreadsThreadIdRoute: ThreadsThreadIdRoute,
|
ThreadsThreadIdRoute: ThreadsThreadIdRoute,
|
||||||
|
UsersUserIdRoute: UsersUserIdRoute,
|
||||||
CollectionIndexRoute: CollectionIndexRoute,
|
CollectionIndexRoute: CollectionIndexRoute,
|
||||||
|
GlobalItemsIndexRoute: GlobalItemsIndexRoute,
|
||||||
}
|
}
|
||||||
export const routeTree = rootRouteImport
|
export const routeTree = rootRouteImport
|
||||||
._addFileChildren(rootRouteChildren)
|
._addFileChildren(rootRouteChildren)
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import {
|
|||||||
createRootRoute,
|
createRootRoute,
|
||||||
type ErrorComponentProps,
|
type ErrorComponentProps,
|
||||||
Outlet,
|
Outlet,
|
||||||
|
useLocation,
|
||||||
useMatchRoute,
|
useMatchRoute,
|
||||||
useNavigate,
|
useNavigate,
|
||||||
useRouter,
|
useRouter,
|
||||||
@@ -72,7 +73,8 @@ function RootErrorBoundary({ error, reset }: ErrorComponentProps) {
|
|||||||
|
|
||||||
function RootLayout() {
|
function RootLayout() {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const { data: auth } = useAuth();
|
const location = useLocation();
|
||||||
|
const { data: auth, isLoading: authLoading } = useAuth();
|
||||||
const isAuthenticated = !!auth?.user;
|
const isAuthenticated = !!auth?.user;
|
||||||
|
|
||||||
// Item panel state
|
// Item panel state
|
||||||
@@ -99,7 +101,7 @@ function RootLayout() {
|
|||||||
const resolveCandidateId = useUIStore((s) => s.resolveCandidateId);
|
const resolveCandidateId = useUIStore((s) => s.resolveCandidateId);
|
||||||
const closeResolveDialog = useUIStore((s) => s.closeResolveDialog);
|
const closeResolveDialog = useUIStore((s) => s.closeResolveDialog);
|
||||||
|
|
||||||
// Onboarding
|
// Onboarding — only check when authenticated (endpoint requires auth)
|
||||||
const { data: onboardingComplete, isLoading: onboardingLoading } =
|
const { data: onboardingComplete, isLoading: onboardingLoading } =
|
||||||
useOnboardingComplete();
|
useOnboardingComplete();
|
||||||
const [wizardDismissed, setWizardDismissed] = useState(false);
|
const [wizardDismissed, setWizardDismissed] = useState(false);
|
||||||
@@ -152,7 +154,30 @@ function RootLayout() {
|
|||||||
!(collectionSearch as Record<string, string>).tab ||
|
!(collectionSearch as Record<string, string>).tab ||
|
||||||
(collectionSearch as Record<string, string>).tab === "gear");
|
(collectionSearch as Record<string, string>).tab === "gear");
|
||||||
|
|
||||||
// Show a minimal loading state while checking onboarding status
|
// Show loading while checking auth
|
||||||
|
if (authLoading) {
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen bg-gray-50 flex items-center justify-center">
|
||||||
|
<div className="w-6 h-6 border-2 border-gray-600 border-t-transparent rounded-full animate-spin" />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Redirect unauthenticated users to login (server-side OIDC route)
|
||||||
|
// Allow public routes through without auth
|
||||||
|
const isPublicRoute =
|
||||||
|
location.pathname.startsWith("/users/") || location.pathname === "/login";
|
||||||
|
|
||||||
|
if (!isAuthenticated && !isPublicRoute) {
|
||||||
|
window.location.href = "/login";
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen bg-gray-50 flex items-center justify-center">
|
||||||
|
<p className="text-sm text-gray-500">Redirecting to login...</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show loading while checking onboarding status
|
||||||
if (onboardingLoading) {
|
if (onboardingLoading) {
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen bg-gray-50 flex items-center justify-center">
|
<div className="min-h-screen bg-gray-50 flex items-center justify-center">
|
||||||
|
|||||||
@@ -198,9 +198,7 @@ export const oauthCodes = pgTable("oauth_codes", {
|
|||||||
code: text("code").notNull().unique(),
|
code: text("code").notNull().unique(),
|
||||||
clientId: text("client_id").notNull(),
|
clientId: text("client_id").notNull(),
|
||||||
codeChallenge: text("code_challenge").notNull(),
|
codeChallenge: text("code_challenge").notNull(),
|
||||||
codeChallengeMethod: text("code_challenge_method")
|
codeChallengeMethod: text("code_challenge_method").notNull().default("S256"),
|
||||||
.notNull()
|
|
||||||
.default("S256"),
|
|
||||||
redirectUri: text("redirect_uri").notNull(),
|
redirectUri: text("redirect_uri").notNull(),
|
||||||
expiresAt: timestamp("expires_at").notNull(),
|
expiresAt: timestamp("expires_at").notNull(),
|
||||||
used: integer("used").notNull().default(0),
|
used: integer("used").notNull().default(0),
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
import seedData from "./global-items-seed.json";
|
||||||
import { db as prodDb } from "./index.ts";
|
import { db as prodDb } from "./index.ts";
|
||||||
import { globalItems } from "./schema.ts";
|
import { globalItems } from "./schema.ts";
|
||||||
import seedData from "./global-items-seed.json";
|
|
||||||
|
|
||||||
type Db = typeof prodDb;
|
type Db = typeof prodDb;
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import { Hono } from "hono";
|
|
||||||
import { serveStatic } from "hono/bun";
|
|
||||||
import { cors } from "hono/cors";
|
|
||||||
import {
|
import {
|
||||||
oidcAuthMiddleware,
|
oidcAuthMiddleware,
|
||||||
processOAuthCallback,
|
processOAuthCallback,
|
||||||
revokeSession,
|
revokeSession,
|
||||||
} from "@hono/oidc-auth";
|
} from "@hono/oidc-auth";
|
||||||
|
import { Hono } from "hono";
|
||||||
|
import { serveStatic } from "hono/bun";
|
||||||
|
import { cors } from "hono/cors";
|
||||||
import { db as prodDb } from "../db/index.ts";
|
import { db as prodDb } from "../db/index.ts";
|
||||||
import { seedDefaults } from "../db/seed.ts";
|
import { seedDefaults } from "../db/seed.ts";
|
||||||
import { mcpRoutes } from "./mcp/index.ts";
|
import { mcpRoutes } from "./mcp/index.ts";
|
||||||
@@ -15,8 +15,8 @@ import { categoryRoutes } from "./routes/categories.ts";
|
|||||||
import { imageRoutes } from "./routes/images.ts";
|
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 { profileRoutes } from "./routes/profiles.ts";
|
import { profileRoutes } from "./routes/profiles.ts";
|
||||||
|
import { settingsRoutes } from "./routes/settings.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";
|
||||||
@@ -42,6 +42,24 @@ app.get("/api/health", (c) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// ── OIDC Browser Auth (top-level, before /api/* middleware) ───────────
|
// ── OIDC Browser Auth (top-level, before /api/* middleware) ───────────
|
||||||
|
|
||||||
|
// In dev mode, strip Secure flag from OIDC cookies so they work over HTTP
|
||||||
|
if (process.env.NODE_ENV !== "production") {
|
||||||
|
app.use("*", async (c, next) => {
|
||||||
|
await next();
|
||||||
|
const setCookies = c.res.headers.getSetCookie?.() ?? [];
|
||||||
|
if (setCookies.length > 0) {
|
||||||
|
c.res.headers.delete("Set-Cookie");
|
||||||
|
for (const cookie of setCookies) {
|
||||||
|
c.res.headers.append(
|
||||||
|
"Set-Cookie",
|
||||||
|
cookie.replace(/;\s*Secure/gi, ""),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
app.get("/login", oidcAuthMiddleware(), async (c) => c.redirect("/"));
|
app.get("/login", oidcAuthMiddleware(), async (c) => c.redirect("/"));
|
||||||
app.get("/callback", async (c) => processOAuthCallback(c));
|
app.get("/callback", async (c) => processOAuthCallback(c));
|
||||||
app.get("/logout", async (c) => {
|
app.get("/logout", async (c) => {
|
||||||
|
|||||||
@@ -39,7 +39,8 @@ export async function requireAuth(c: Context, next: Next) {
|
|||||||
c.set("userId", user.id);
|
c.set("userId", user.id);
|
||||||
return next();
|
return next();
|
||||||
}
|
}
|
||||||
} catch {
|
} catch (err) {
|
||||||
|
console.error("[auth] OIDC auth failed:", err);
|
||||||
// OIDC not configured or session invalid — fall through
|
// OIDC not configured or session invalid — fall through
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import { zValidator } from "@hono/zod-validator";
|
|
||||||
import { getAuth } from "@hono/oidc-auth";
|
import { getAuth } from "@hono/oidc-auth";
|
||||||
|
import { zValidator } from "@hono/zod-validator";
|
||||||
import { Hono } from "hono";
|
import { Hono } from "hono";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
import { updateProfileSchema } from "../../shared/schemas.ts";
|
||||||
import { parseId } from "../lib/params.ts";
|
import { parseId } from "../lib/params.ts";
|
||||||
import { requireAuth } from "../middleware/auth.ts";
|
import { requireAuth } from "../middleware/auth.ts";
|
||||||
import {
|
import {
|
||||||
@@ -10,7 +11,6 @@ import {
|
|||||||
listApiKeys,
|
listApiKeys,
|
||||||
} from "../services/auth.service.ts";
|
} from "../services/auth.service.ts";
|
||||||
import { updateProfile } from "../services/profile.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 } };
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import {
|
|||||||
updateSetupSchema,
|
updateSetupSchema,
|
||||||
} 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 { getPublicSetupWithItems } from "../services/profile.service.ts";
|
import { getPublicSetupWithItems } from "../services/profile.service.ts";
|
||||||
import {
|
import {
|
||||||
createSetup,
|
createSetup,
|
||||||
@@ -19,6 +18,7 @@ import {
|
|||||||
updateItemClassification,
|
updateItemClassification,
|
||||||
updateSetup,
|
updateSetup,
|
||||||
} from "../services/setup.service.ts";
|
} from "../services/setup.service.ts";
|
||||||
|
import { withImageUrls } from "../services/storage.service.ts";
|
||||||
|
|
||||||
type Env = { Variables: { db?: any; userId?: number } };
|
type Env = { Variables: { db?: any; userId?: number } };
|
||||||
|
|
||||||
|
|||||||
@@ -9,10 +9,7 @@ import {
|
|||||||
updateThreadSchema,
|
updateThreadSchema,
|
||||||
} from "../../shared/schemas.ts";
|
} from "../../shared/schemas.ts";
|
||||||
import { parseId } from "../lib/params.ts";
|
import { parseId } from "../lib/params.ts";
|
||||||
import {
|
import { deleteImage, withImageUrls } from "../services/storage.service.ts";
|
||||||
deleteImage,
|
|
||||||
withImageUrls,
|
|
||||||
} from "../services/storage.service.ts";
|
|
||||||
import {
|
import {
|
||||||
createCandidate,
|
createCandidate,
|
||||||
createThread,
|
createThread,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { randomBytes } from "node:crypto";
|
import { randomBytes } from "node:crypto";
|
||||||
import { and, eq } from "drizzle-orm";
|
import { and, eq } from "drizzle-orm";
|
||||||
import { db as prodDb } from "../../db/index.ts";
|
import type { db as prodDb } from "../../db/index.ts";
|
||||||
import { apiKeys, users } from "../../db/schema.ts";
|
import { apiKeys, users } from "../../db/schema.ts";
|
||||||
|
|
||||||
type Db = typeof prodDb;
|
type Db = typeof prodDb;
|
||||||
@@ -24,11 +24,7 @@ export async function getOrCreateUser(
|
|||||||
|
|
||||||
// ── API Key Management ───────────────────────────────────────────────
|
// ── API Key Management ───────────────────────────────────────────────
|
||||||
|
|
||||||
export async function createApiKey(
|
export async function createApiKey(db: Db, userId: number, name: string) {
|
||||||
db: Db,
|
|
||||||
userId: number,
|
|
||||||
name: string,
|
|
||||||
) {
|
|
||||||
const rawKey = randomBytes(32).toString("hex");
|
const rawKey = randomBytes(32).toString("hex");
|
||||||
const keyHash = await Bun.password.hash(rawKey);
|
const keyHash = await Bun.password.hash(rawKey);
|
||||||
const keyPrefix = rawKey.slice(0, 8);
|
const keyPrefix = rawKey.slice(0, 8);
|
||||||
|
|||||||
@@ -20,76 +20,85 @@ export async function getOrCreateUncategorized(db: Db, userId: number) {
|
|||||||
return created;
|
return created;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getAllCategories(db: Db = prodDb) {
|
export async function getAllCategories(db: Db, userId: number) {
|
||||||
return db.select().from(categories).orderBy(asc(categories.name)).all();
|
return db
|
||||||
|
.select()
|
||||||
|
.from(categories)
|
||||||
|
.where(eq(categories.userId, userId))
|
||||||
|
.orderBy(asc(categories.name));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function createCategory(
|
export async function createCategory(
|
||||||
db: Db = prodDb,
|
db: Db,
|
||||||
|
userId: number,
|
||||||
data: { name: string; icon?: string },
|
data: { name: string; icon?: string },
|
||||||
) {
|
) {
|
||||||
return db
|
const [row] = await db
|
||||||
.insert(categories)
|
.insert(categories)
|
||||||
.values({
|
.values({
|
||||||
name: data.name,
|
name: data.name,
|
||||||
|
userId,
|
||||||
...(data.icon ? { icon: data.icon } : {}),
|
...(data.icon ? { icon: data.icon } : {}),
|
||||||
})
|
})
|
||||||
.returning()
|
.returning();
|
||||||
.get();
|
return row;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function updateCategory(
|
export async function updateCategory(
|
||||||
db: Db = prodDb,
|
db: Db,
|
||||||
|
userId: number,
|
||||||
id: number,
|
id: number,
|
||||||
data: { name?: string; icon?: string },
|
data: { name?: string; icon?: string },
|
||||||
) {
|
) {
|
||||||
const existing = db
|
const [existing] = await db
|
||||||
.select({ id: categories.id })
|
.select({ id: categories.id })
|
||||||
.from(categories)
|
.from(categories)
|
||||||
.where(eq(categories.id, id))
|
.where(and(eq(categories.id, id), eq(categories.userId, userId)));
|
||||||
.get();
|
|
||||||
|
|
||||||
if (!existing) return null;
|
if (!existing) return null;
|
||||||
|
|
||||||
return db
|
const [row] = await db
|
||||||
.update(categories)
|
.update(categories)
|
||||||
.set(data)
|
.set(data)
|
||||||
.where(eq(categories.id, id))
|
.where(and(eq(categories.id, id), eq(categories.userId, userId)))
|
||||||
.returning()
|
.returning();
|
||||||
.get();
|
return row;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function deleteCategory(
|
export async function deleteCategory(
|
||||||
db: Db = prodDb,
|
db: Db,
|
||||||
|
userId: number,
|
||||||
id: number,
|
id: number,
|
||||||
): { success: boolean; error?: string } {
|
): Promise<{ success: boolean; error?: string }> {
|
||||||
// Guard: cannot delete Uncategorized (id=1)
|
// Check if category exists and belongs to user
|
||||||
if (id === 1) {
|
const [existing] = await db
|
||||||
|
.select({ id: categories.id, name: categories.name })
|
||||||
|
.from(categories)
|
||||||
|
.where(and(eq(categories.id, id), eq(categories.userId, userId)));
|
||||||
|
|
||||||
|
if (!existing) {
|
||||||
|
return { success: false, error: "Category not found" };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Guard: cannot delete Uncategorized
|
||||||
|
if (existing.name === "Uncategorized") {
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
error: "Cannot delete the Uncategorized category",
|
error: "Cannot delete the Uncategorized category",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if category exists
|
// Get the user's Uncategorized category for reassignment
|
||||||
const existing = db
|
const uncategorized = await getOrCreateUncategorized(db, userId);
|
||||||
.select({ id: categories.id })
|
|
||||||
.from(categories)
|
|
||||||
.where(eq(categories.id, id))
|
|
||||||
.get();
|
|
||||||
|
|
||||||
if (!existing) {
|
// Reassign items to Uncategorized, then delete atomically
|
||||||
return { success: false, error: "Category not found" };
|
await db.transaction(async (tx) => {
|
||||||
}
|
await tx
|
||||||
|
.update(items)
|
||||||
|
.set({ categoryId: uncategorized.id })
|
||||||
|
.where(eq(items.categoryId, id));
|
||||||
|
|
||||||
// Reassign items to Uncategorized (id=1), then delete atomically
|
await tx.delete(categories).where(eq(categories.id, id));
|
||||||
db.transaction(() => {
|
|
||||||
db.update(items)
|
|
||||||
.set({ categoryId: 1 })
|
|
||||||
.where(eq(items.categoryId, id))
|
|
||||||
.run();
|
|
||||||
|
|
||||||
db.delete(categories).where(eq(categories.id, id)).run();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return { success: true };
|
return { success: true };
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { and, eq } from "drizzle-orm";
|
import { and, eq } from "drizzle-orm";
|
||||||
import { db as prodDb } from "../../db/index.ts";
|
import type { db as prodDb } from "../../db/index.ts";
|
||||||
import { categories, items } from "../../db/schema.ts";
|
import { categories, items } from "../../db/schema.ts";
|
||||||
import { getOrCreateUncategorized } from "./category.service.ts";
|
import { getOrCreateUncategorized } from "./category.service.ts";
|
||||||
|
|
||||||
|
|||||||
@@ -5,12 +5,12 @@ import { globalItems, itemGlobalLinks } from "../../db/schema.ts";
|
|||||||
type Db = typeof prodDb;
|
type Db = typeof prodDb;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Search global items by brand or model. SQLite LIKE is case-insensitive for ASCII.
|
* Search global items by brand or model. LIKE is case-insensitive for ASCII.
|
||||||
* Escapes % and _ wildcard characters in user input.
|
* Escapes % and _ wildcard characters in user input.
|
||||||
*/
|
*/
|
||||||
export function searchGlobalItems(db: Db = prodDb, query?: string) {
|
export async function searchGlobalItems(db: Db = prodDb, query?: string) {
|
||||||
if (!query) {
|
if (!query) {
|
||||||
return db.select().from(globalItems).all();
|
return db.select().from(globalItems);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Escape SQL LIKE wildcards
|
// Escape SQL LIKE wildcards
|
||||||
@@ -21,31 +21,28 @@ export function searchGlobalItems(db: Db = prodDb, query?: string) {
|
|||||||
.select()
|
.select()
|
||||||
.from(globalItems)
|
.from(globalItems)
|
||||||
.where(
|
.where(
|
||||||
or(
|
or(like(globalItems.brand, pattern), like(globalItems.model, pattern)),
|
||||||
like(globalItems.brand, pattern),
|
);
|
||||||
like(globalItems.model, pattern),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
.all();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a single global item by ID with the count of user items linked to it.
|
* Get a single global item by ID with the count of user items linked to it.
|
||||||
*/
|
*/
|
||||||
export function getGlobalItemWithOwnerCount(db: Db = prodDb, id: number) {
|
export async function getGlobalItemWithOwnerCount(
|
||||||
const item = db
|
db: Db = prodDb,
|
||||||
|
id: number,
|
||||||
|
) {
|
||||||
|
const [item] = await db
|
||||||
.select()
|
.select()
|
||||||
.from(globalItems)
|
.from(globalItems)
|
||||||
.where(eq(globalItems.id, id))
|
.where(eq(globalItems.id, id));
|
||||||
.get();
|
|
||||||
|
|
||||||
if (!item) return null;
|
if (!item) return null;
|
||||||
|
|
||||||
const result = db
|
const [result] = await db
|
||||||
.select({ ownerCount: count() })
|
.select({ ownerCount: count() })
|
||||||
.from(itemGlobalLinks)
|
.from(itemGlobalLinks)
|
||||||
.where(eq(itemGlobalLinks.globalItemId, id))
|
.where(eq(itemGlobalLinks.globalItemId, id));
|
||||||
.get();
|
|
||||||
|
|
||||||
return { ...item, ownerCount: result?.ownerCount ?? 0 };
|
return { ...item, ownerCount: result?.ownerCount ?? 0 };
|
||||||
}
|
}
|
||||||
@@ -53,27 +50,26 @@ export function getGlobalItemWithOwnerCount(db: Db = prodDb, id: number) {
|
|||||||
/**
|
/**
|
||||||
* Link a user's item to a global item. Throws on duplicate (unique constraint on itemId).
|
* Link a user's item to a global item. Throws on duplicate (unique constraint on itemId).
|
||||||
*/
|
*/
|
||||||
export function linkItemToGlobal(
|
export async function linkItemToGlobal(
|
||||||
db: Db = prodDb,
|
db: Db = prodDb,
|
||||||
itemId: number,
|
itemId: number,
|
||||||
globalItemId: number,
|
globalItemId: number,
|
||||||
) {
|
) {
|
||||||
return db
|
const [row] = await db
|
||||||
.insert(itemGlobalLinks)
|
.insert(itemGlobalLinks)
|
||||||
.values({ itemId, globalItemId })
|
.values({ itemId, globalItemId })
|
||||||
.returning()
|
.returning();
|
||||||
.get();
|
return row;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove the link between a user's item and any global item.
|
* Remove the link between a user's item and any global item.
|
||||||
*/
|
*/
|
||||||
export function unlinkItemFromGlobal(db: Db = prodDb, itemId: number) {
|
export async function unlinkItemFromGlobal(db: Db = prodDb, itemId: number) {
|
||||||
const result = db
|
const result = await db
|
||||||
.delete(itemGlobalLinks)
|
.delete(itemGlobalLinks)
|
||||||
.where(eq(itemGlobalLinks.itemId, itemId))
|
.where(eq(itemGlobalLinks.itemId, itemId))
|
||||||
.returning()
|
.returning();
|
||||||
.all();
|
|
||||||
|
|
||||||
return result.length;
|
return result.length;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { and, eq } from "drizzle-orm";
|
import { and, eq } from "drizzle-orm";
|
||||||
import { db as prodDb } from "../../db/index.ts";
|
import type { db as prodDb } from "../../db/index.ts";
|
||||||
import { categories, items } from "../../db/schema.ts";
|
import { categories, items } from "../../db/schema.ts";
|
||||||
import type { CreateItem } from "../../shared/types.ts";
|
import type { CreateItem } from "../../shared/types.ts";
|
||||||
|
|
||||||
@@ -146,9 +146,7 @@ export async function deleteItem(db: Db, userId: number, id: number) {
|
|||||||
|
|
||||||
if (!item) return null;
|
if (!item) return null;
|
||||||
|
|
||||||
await db
|
await db.delete(items).where(and(eq(items.id, id), eq(items.userId, userId)));
|
||||||
.delete(items)
|
|
||||||
.where(and(eq(items.id, id), eq(items.userId, userId)));
|
|
||||||
|
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,10 +86,7 @@ export async function exchangeCode(
|
|||||||
if (computedChallenge !== record.codeChallenge) return null;
|
if (computedChallenge !== record.codeChallenge) return null;
|
||||||
|
|
||||||
// Mark code as used
|
// Mark code as used
|
||||||
await db
|
await db.update(oauthCodes).set({ used: 1 }).where(eq(oauthCodes.code, code));
|
||||||
.update(oauthCodes)
|
|
||||||
.set({ used: 1 })
|
|
||||||
.where(eq(oauthCodes.code, code));
|
|
||||||
|
|
||||||
return generateTokens(db, clientId, userId);
|
return generateTokens(db, clientId, userId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { and, eq, sql } from "drizzle-orm";
|
import { and, eq, sql } from "drizzle-orm";
|
||||||
import { db as prodDb } from "../../db/index.ts";
|
import type { db as prodDb } from "../../db/index.ts";
|
||||||
import {
|
import {
|
||||||
categories,
|
categories,
|
||||||
items,
|
items,
|
||||||
@@ -16,10 +16,7 @@ export async function updateProfile(
|
|||||||
userId: number,
|
userId: number,
|
||||||
data: UpdateProfile,
|
data: UpdateProfile,
|
||||||
) {
|
) {
|
||||||
const [existing] = await db
|
const [existing] = await db.select().from(users).where(eq(users.id, userId));
|
||||||
.select()
|
|
||||||
.from(users)
|
|
||||||
.where(eq(users.id, userId));
|
|
||||||
if (!existing) return null;
|
if (!existing) return null;
|
||||||
|
|
||||||
// If no fields to update, return existing user
|
// If no fields to update, return existing user
|
||||||
|
|||||||
@@ -1,15 +1,11 @@
|
|||||||
import { and, eq, inArray, sql } from "drizzle-orm";
|
import { and, eq, inArray, sql } from "drizzle-orm";
|
||||||
import { db as prodDb } from "../../db/index.ts";
|
import type { db as prodDb } from "../../db/index.ts";
|
||||||
import { categories, items, setupItems, setups } from "../../db/schema.ts";
|
import { categories, items, setupItems, setups } from "../../db/schema.ts";
|
||||||
import type { CreateSetup, UpdateSetup } from "../../shared/types.ts";
|
import type { CreateSetup, UpdateSetup } from "../../shared/types.ts";
|
||||||
|
|
||||||
type Db = typeof prodDb;
|
type Db = typeof prodDb;
|
||||||
|
|
||||||
export async function createSetup(
|
export async function createSetup(db: Db, userId: number, data: CreateSetup) {
|
||||||
db: Db,
|
|
||||||
userId: number,
|
|
||||||
data: CreateSetup,
|
|
||||||
) {
|
|
||||||
const [row] = await db
|
const [row] = await db
|
||||||
.insert(setups)
|
.insert(setups)
|
||||||
.values({ name: data.name, userId, isPublic: data.isPublic ?? false })
|
.values({ name: data.name, userId, isPublic: data.isPublic ?? false })
|
||||||
@@ -110,11 +106,7 @@ export async function updateSetup(
|
|||||||
return row;
|
return row;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function deleteSetup(
|
export async function deleteSetup(db: Db, userId: number, setupId: number) {
|
||||||
db: Db,
|
|
||||||
userId: number,
|
|
||||||
setupId: number,
|
|
||||||
) {
|
|
||||||
const [existing] = await db
|
const [existing] = await db
|
||||||
.select({ id: setups.id })
|
.select({ id: setups.id })
|
||||||
.from(setups)
|
.from(setups)
|
||||||
@@ -197,9 +189,7 @@ export async function updateItemClassification(
|
|||||||
await db
|
await db
|
||||||
.update(setupItems)
|
.update(setupItems)
|
||||||
.set({ classification })
|
.set({ classification })
|
||||||
.where(
|
.where(and(eq(setupItems.setupId, setupId), eq(setupItems.itemId, itemId)));
|
||||||
and(eq(setupItems.setupId, setupId), eq(setupItems.itemId, itemId)),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function removeSetupItem(
|
export async function removeSetupItem(
|
||||||
@@ -217,7 +207,5 @@ export async function removeSetupItem(
|
|||||||
|
|
||||||
await db
|
await db
|
||||||
.delete(setupItems)
|
.delete(setupItems)
|
||||||
.where(
|
.where(and(eq(setupItems.setupId, setupId), eq(setupItems.itemId, itemId)));
|
||||||
and(eq(setupItems.setupId, setupId), eq(setupItems.itemId, itemId)),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,9 +62,9 @@ export async function getImageUrl(filename: string): Promise<string> {
|
|||||||
* Enrich a record that has an imageFilename with a presigned imageUrl.
|
* Enrich a record that has an imageFilename with a presigned imageUrl.
|
||||||
* Returns null imageUrl when imageFilename is null.
|
* Returns null imageUrl when imageFilename is null.
|
||||||
*/
|
*/
|
||||||
export async function withImageUrl<
|
export async function withImageUrl<T extends { imageFilename: string | null }>(
|
||||||
T extends { imageFilename: string | null },
|
record: T,
|
||||||
>(record: T): Promise<T & { imageUrl: string | null }> {
|
): Promise<T & { imageUrl: string | null }> {
|
||||||
return {
|
return {
|
||||||
...record,
|
...record,
|
||||||
imageUrl: record.imageFilename
|
imageUrl: record.imageFilename
|
||||||
@@ -76,8 +76,8 @@ export async function withImageUrl<
|
|||||||
/**
|
/**
|
||||||
* Batch version of withImageUrl. Uses Promise.all for parallelism.
|
* Batch version of withImageUrl. Uses Promise.all for parallelism.
|
||||||
*/
|
*/
|
||||||
export async function withImageUrls<
|
export async function withImageUrls<T extends { imageFilename: string | null }>(
|
||||||
T extends { imageFilename: string | null },
|
records: T[],
|
||||||
>(records: T[]): Promise<(T & { imageUrl: string | null })[]> {
|
): Promise<(T & { imageUrl: string | null })[]> {
|
||||||
return Promise.all(records.map((record) => withImageUrl(record)));
|
return Promise.all(records.map((record) => withImageUrl(record)));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { and, asc, desc, eq, max, sql } from "drizzle-orm";
|
import { and, asc, desc, eq, max, sql } from "drizzle-orm";
|
||||||
import { db as prodDb } from "../../db/index.ts";
|
import type { db as prodDb } from "../../db/index.ts";
|
||||||
import {
|
import {
|
||||||
categories,
|
categories,
|
||||||
items,
|
items,
|
||||||
@@ -15,11 +15,7 @@ import { getOrCreateUncategorized } from "./category.service.ts";
|
|||||||
|
|
||||||
type Db = typeof prodDb;
|
type Db = typeof prodDb;
|
||||||
|
|
||||||
export async function createThread(
|
export async function createThread(db: Db, userId: number, data: CreateThread) {
|
||||||
db: Db,
|
|
||||||
userId: number,
|
|
||||||
data: CreateThread,
|
|
||||||
) {
|
|
||||||
const [row] = await db
|
const [row] = await db
|
||||||
.insert(threads)
|
.insert(threads)
|
||||||
.values({ name: data.name, categoryId: data.categoryId, userId })
|
.values({ name: data.name, categoryId: data.categoryId, userId })
|
||||||
@@ -258,9 +254,7 @@ export async function deleteCandidate(
|
|||||||
const [thread] = await db
|
const [thread] = await db
|
||||||
.select({ id: threads.id })
|
.select({ id: threads.id })
|
||||||
.from(threads)
|
.from(threads)
|
||||||
.where(
|
.where(and(eq(threads.id, candidate.threadId), eq(threads.userId, userId)));
|
||||||
and(eq(threads.id, candidate.threadId), eq(threads.userId, userId)),
|
|
||||||
);
|
|
||||||
if (!thread) return null;
|
if (!thread) return null;
|
||||||
|
|
||||||
await db.delete(threadCandidates).where(eq(threadCandidates.id, candidateId));
|
await db.delete(threadCandidates).where(eq(threadCandidates.id, candidateId));
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { and, eq, sql } from "drizzle-orm";
|
import { and, eq, sql } from "drizzle-orm";
|
||||||
import { db as prodDb } from "../../db/index.ts";
|
import type { 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;
|
||||||
|
|||||||
@@ -30,11 +30,7 @@ function insertGlobalItem(db: TestDb, brand: string, model: string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function insertItem(db: TestDb, name: string) {
|
function insertItem(db: TestDb, name: string) {
|
||||||
return db
|
return db.insert(items).values({ name, categoryId: 1 }).returning().get();
|
||||||
.insert(items)
|
|
||||||
.values({ name, categoryId: 1 })
|
|
||||||
.returning()
|
|
||||||
.get();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
describe("Global Item Routes", () => {
|
describe("Global Item Routes", () => {
|
||||||
|
|||||||
@@ -16,7 +16,10 @@ mock.module("../../src/server/services/storage.service", () => ({
|
|||||||
|
|
||||||
// Also mock image service for from-url test
|
// Also mock image service for from-url test
|
||||||
const mockFetchImageFromUrl = mock(() =>
|
const mockFetchImageFromUrl = mock(() =>
|
||||||
Promise.resolve({ filename: "test.png", sourceUrl: "https://example.com/img.png" }),
|
Promise.resolve({
|
||||||
|
filename: "test.png",
|
||||||
|
sourceUrl: "https://example.com/img.png",
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
mock.module("../../src/server/services/image.service", () => ({
|
mock.module("../../src/server/services/image.service", () => ({
|
||||||
fetchImageFromUrl: mockFetchImageFromUrl,
|
fetchImageFromUrl: mockFetchImageFromUrl,
|
||||||
|
|||||||
@@ -45,7 +45,10 @@ describe("OAuth Routes", () => {
|
|||||||
userId = testApp.userId;
|
userId = testApp.userId;
|
||||||
mockGetAuth.mockReset();
|
mockGetAuth.mockReset();
|
||||||
// Default: user is authenticated via OIDC
|
// Default: user is authenticated via OIDC
|
||||||
mockGetAuth.mockReturnValue({ sub: "test-user-logto-sub", email: "admin@example.com" });
|
mockGetAuth.mockReturnValue({
|
||||||
|
sub: "test-user-logto-sub",
|
||||||
|
email: "admin@example.com",
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("GET /.well-known/oauth-authorization-server", () => {
|
describe("GET /.well-known/oauth-authorization-server", () => {
|
||||||
|
|||||||
@@ -1,15 +1,17 @@
|
|||||||
import { beforeEach, describe, expect, it } from "bun:test";
|
import { beforeEach, describe, expect, it } from "bun:test";
|
||||||
|
import { zValidator } from "@hono/zod-validator";
|
||||||
import { eq } from "drizzle-orm";
|
import { eq } from "drizzle-orm";
|
||||||
import { Hono } from "hono";
|
import { Hono } from "hono";
|
||||||
import * as schema from "../../src/db/schema.ts";
|
import * as schema from "../../src/db/schema.ts";
|
||||||
import { updateProfileSchema } from "../../src/shared/schemas.ts";
|
import { parseId } from "../../src/server/lib/params.ts";
|
||||||
import { profileRoutes } from "../../src/server/routes/profiles.ts";
|
import { profileRoutes } from "../../src/server/routes/profiles.ts";
|
||||||
import { setupRoutes } from "../../src/server/routes/setups.ts";
|
import { setupRoutes } from "../../src/server/routes/setups.ts";
|
||||||
import { getPublicSetupWithItems } from "../../src/server/services/profile.service.ts";
|
import {
|
||||||
import { updateProfile } from "../../src/server/services/profile.service.ts";
|
getPublicSetupWithItems,
|
||||||
|
updateProfile,
|
||||||
|
} from "../../src/server/services/profile.service.ts";
|
||||||
|
import { updateProfileSchema } from "../../src/shared/schemas.ts";
|
||||||
import { createTestDb } from "../helpers/db.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"];
|
type Db = Awaited<ReturnType<typeof createTestDb>>["db"];
|
||||||
|
|
||||||
@@ -112,9 +114,7 @@ describe("Profile Routes", () => {
|
|||||||
|
|
||||||
it("includes only public setups", async () => {
|
it("includes only public setups", async () => {
|
||||||
// Create public and private setups
|
// Create public and private setups
|
||||||
await db
|
await db.insert(schema.setups).values([
|
||||||
.insert(schema.setups)
|
|
||||||
.values([
|
|
||||||
{ name: "Public Setup", userId, isPublic: true },
|
{ name: "Public Setup", userId, isPublic: true },
|
||||||
{ name: "Private Setup", userId, isPublic: false },
|
{ name: "Private Setup", userId, isPublic: false },
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
import { beforeEach, describe, expect, it } from "bun:test";
|
import { beforeEach, describe, expect, it } from "bun:test";
|
||||||
import { globalItems, itemGlobalLinks, items } from "../../src/db/schema.ts";
|
import { globalItems, itemGlobalLinks, items } from "../../src/db/schema.ts";
|
||||||
|
import { seedGlobalItems } from "../../src/db/seed-global-items.ts";
|
||||||
import {
|
import {
|
||||||
getGlobalItemWithOwnerCount,
|
getGlobalItemWithOwnerCount,
|
||||||
linkItemToGlobal,
|
linkItemToGlobal,
|
||||||
searchGlobalItems,
|
searchGlobalItems,
|
||||||
unlinkItemFromGlobal,
|
unlinkItemFromGlobal,
|
||||||
} from "../../src/server/services/global-item.service.ts";
|
} from "../../src/server/services/global-item.service.ts";
|
||||||
import { seedGlobalItems } from "../../src/db/seed-global-items.ts";
|
|
||||||
import { createTestDb } from "../helpers/db.ts";
|
import { createTestDb } from "../helpers/db.ts";
|
||||||
|
|
||||||
type TestDb = ReturnType<typeof createTestDb>;
|
type TestDb = ReturnType<typeof createTestDb>;
|
||||||
@@ -35,11 +35,7 @@ function insertGlobalItem(
|
|||||||
}
|
}
|
||||||
|
|
||||||
function insertItem(db: TestDb, name: string) {
|
function insertItem(db: TestDb, name: string) {
|
||||||
return db
|
return db.insert(items).values({ name, categoryId: 1 }).returning().get();
|
||||||
.insert(items)
|
|
||||||
.values({ name, categoryId: 1 })
|
|
||||||
.returning()
|
|
||||||
.get();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
describe("Global Item Service", () => {
|
describe("Global Item Service", () => {
|
||||||
@@ -51,7 +47,10 @@ describe("Global Item Service", () => {
|
|||||||
|
|
||||||
describe("searchGlobalItems", () => {
|
describe("searchGlobalItems", () => {
|
||||||
it("returns all global items when no query provided", () => {
|
it("returns all global items when no query provided", () => {
|
||||||
insertGlobalItem(db, { brand: "Revelate Designs", model: "Terrapin System" });
|
insertGlobalItem(db, {
|
||||||
|
brand: "Revelate Designs",
|
||||||
|
model: "Terrapin System",
|
||||||
|
});
|
||||||
insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
|
insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
|
||||||
|
|
||||||
const results = searchGlobalItems(db);
|
const results = searchGlobalItems(db);
|
||||||
@@ -59,7 +58,10 @@ describe("Global Item Service", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("returns items matching brand (case-insensitive)", () => {
|
it("returns items matching brand (case-insensitive)", () => {
|
||||||
insertGlobalItem(db, { brand: "Revelate Designs", model: "Terrapin System" });
|
insertGlobalItem(db, {
|
||||||
|
brand: "Revelate Designs",
|
||||||
|
model: "Terrapin System",
|
||||||
|
});
|
||||||
insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
|
insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
|
||||||
|
|
||||||
const results = searchGlobalItems(db, "revelate");
|
const results = searchGlobalItems(db, "revelate");
|
||||||
@@ -68,7 +70,10 @@ describe("Global Item Service", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("returns items matching model (case-insensitive)", () => {
|
it("returns items matching model (case-insensitive)", () => {
|
||||||
insertGlobalItem(db, { brand: "Revelate Designs", model: "Terrapin System" });
|
insertGlobalItem(db, {
|
||||||
|
brand: "Revelate Designs",
|
||||||
|
model: "Terrapin System",
|
||||||
|
});
|
||||||
insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
|
insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
|
||||||
|
|
||||||
const results = searchGlobalItems(db, "HANDLEBAR");
|
const results = searchGlobalItems(db, "HANDLEBAR");
|
||||||
@@ -77,7 +82,10 @@ describe("Global Item Service", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("does not match everything with wildcard chars", () => {
|
it("does not match everything with wildcard chars", () => {
|
||||||
insertGlobalItem(db, { brand: "Revelate Designs", model: "Terrapin System" });
|
insertGlobalItem(db, {
|
||||||
|
brand: "Revelate Designs",
|
||||||
|
model: "Terrapin System",
|
||||||
|
});
|
||||||
insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
|
insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
|
||||||
|
|
||||||
const results = searchGlobalItems(db, "100%");
|
const results = searchGlobalItems(db, "100%");
|
||||||
@@ -87,7 +95,10 @@ describe("Global Item Service", () => {
|
|||||||
|
|
||||||
describe("getGlobalItemWithOwnerCount", () => {
|
describe("getGlobalItemWithOwnerCount", () => {
|
||||||
it("returns item with ownerCount 0 when no links", () => {
|
it("returns item with ownerCount 0 when no links", () => {
|
||||||
const gi = insertGlobalItem(db, { brand: "MSR", model: "PocketRocket 2" });
|
const gi = insertGlobalItem(db, {
|
||||||
|
brand: "MSR",
|
||||||
|
model: "PocketRocket 2",
|
||||||
|
});
|
||||||
|
|
||||||
const result = getGlobalItemWithOwnerCount(db, gi.id);
|
const result = getGlobalItemWithOwnerCount(db, gi.id);
|
||||||
expect(result).not.toBeNull();
|
expect(result).not.toBeNull();
|
||||||
@@ -96,7 +107,10 @@ describe("Global Item Service", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("returns ownerCount matching number of linked items", () => {
|
it("returns ownerCount matching number of linked items", () => {
|
||||||
const gi = insertGlobalItem(db, { brand: "MSR", model: "PocketRocket 2" });
|
const gi = insertGlobalItem(db, {
|
||||||
|
brand: "MSR",
|
||||||
|
model: "PocketRocket 2",
|
||||||
|
});
|
||||||
const item1 = insertItem(db, "My Stove");
|
const item1 = insertItem(db, "My Stove");
|
||||||
const item2 = insertItem(db, "Another Stove");
|
const item2 = insertItem(db, "Another Stove");
|
||||||
|
|
||||||
@@ -120,7 +134,10 @@ describe("Global Item Service", () => {
|
|||||||
|
|
||||||
describe("linkItemToGlobal", () => {
|
describe("linkItemToGlobal", () => {
|
||||||
it("creates link and returns link row", () => {
|
it("creates link and returns link row", () => {
|
||||||
const gi = insertGlobalItem(db, { brand: "MSR", model: "PocketRocket 2" });
|
const gi = insertGlobalItem(db, {
|
||||||
|
brand: "MSR",
|
||||||
|
model: "PocketRocket 2",
|
||||||
|
});
|
||||||
const item = insertItem(db, "My Stove");
|
const item = insertItem(db, "My Stove");
|
||||||
|
|
||||||
const link = linkItemToGlobal(db, item.id, gi.id);
|
const link = linkItemToGlobal(db, item.id, gi.id);
|
||||||
@@ -129,7 +146,10 @@ describe("Global Item Service", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("throws when item already linked", () => {
|
it("throws when item already linked", () => {
|
||||||
const gi = insertGlobalItem(db, { brand: "MSR", model: "PocketRocket 2" });
|
const gi = insertGlobalItem(db, {
|
||||||
|
brand: "MSR",
|
||||||
|
model: "PocketRocket 2",
|
||||||
|
});
|
||||||
const item = insertItem(db, "My Stove");
|
const item = insertItem(db, "My Stove");
|
||||||
|
|
||||||
linkItemToGlobal(db, item.id, gi.id);
|
linkItemToGlobal(db, item.id, gi.id);
|
||||||
@@ -139,7 +159,10 @@ describe("Global Item Service", () => {
|
|||||||
|
|
||||||
describe("unlinkItemFromGlobal", () => {
|
describe("unlinkItemFromGlobal", () => {
|
||||||
it("removes the link", () => {
|
it("removes the link", () => {
|
||||||
const gi = insertGlobalItem(db, { brand: "MSR", model: "PocketRocket 2" });
|
const gi = insertGlobalItem(db, {
|
||||||
|
brand: "MSR",
|
||||||
|
model: "PocketRocket 2",
|
||||||
|
});
|
||||||
const item = insertItem(db, "My Stove");
|
const item = insertItem(db, "My Stove");
|
||||||
|
|
||||||
linkItemToGlobal(db, item.id, gi.id);
|
linkItemToGlobal(db, item.id, gi.id);
|
||||||
|
|||||||
@@ -21,12 +21,12 @@ const { fetchImageFromUrl } = await import(
|
|||||||
|
|
||||||
// 1x1 transparent PNG (smallest valid PNG)
|
// 1x1 transparent PNG (smallest valid PNG)
|
||||||
const TINY_PNG = new Uint8Array([
|
const TINY_PNG = new Uint8Array([
|
||||||
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
|
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49,
|
||||||
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
|
0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x06,
|
||||||
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0x15, 0xc4, 0x89, 0x00, 0x00, 0x00,
|
0x00, 0x00, 0x00, 0x1f, 0x15, 0xc4, 0x89, 0x00, 0x00, 0x00, 0x0a, 0x49, 0x44,
|
||||||
0x0a, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x62, 0x00, 0x00, 0x00, 0x02,
|
0x41, 0x54, 0x78, 0x9c, 0x62, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0xe2, 0x21,
|
||||||
0x00, 0x01, 0xe2, 0x21, 0xbc, 0x33, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
|
0xbc, 0x33, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
|
||||||
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
|
0x82,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
let server: Server;
|
let server: Server;
|
||||||
@@ -72,17 +72,17 @@ describe("Image Service", () => {
|
|||||||
|
|
||||||
// Verify uploadImage was called with correct args
|
// Verify uploadImage was called with correct args
|
||||||
expect(mockUploadImage).toHaveBeenCalledTimes(1);
|
expect(mockUploadImage).toHaveBeenCalledTimes(1);
|
||||||
const [buffer, filename, contentType] =
|
const [buffer, filename, contentType] = mockUploadImage.mock
|
||||||
mockUploadImage.mock.calls[0] as unknown[];
|
.calls[0] as unknown[];
|
||||||
expect(buffer).toBeInstanceOf(Buffer);
|
expect(buffer).toBeInstanceOf(Buffer);
|
||||||
expect(filename).toBe(result.filename);
|
expect(filename).toBe(result.filename);
|
||||||
expect(contentType).toBe("image/png");
|
expect(contentType).toBe("image/png");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("rejects non-image content type", async () => {
|
it("rejects non-image content type", async () => {
|
||||||
await expect(
|
await expect(fetchImageFromUrl(`${baseUrl}/page.html`)).rejects.toThrow(
|
||||||
fetchImageFromUrl(`${baseUrl}/page.html`),
|
"Invalid content type",
|
||||||
).rejects.toThrow("Invalid content type");
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("rejects invalid URL format", async () => {
|
it("rejects invalid URL format", async () => {
|
||||||
@@ -98,9 +98,9 @@ describe("Image Service", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("rejects 404 responses", async () => {
|
it("rejects 404 responses", async () => {
|
||||||
await expect(
|
await expect(fetchImageFromUrl(`${baseUrl}/missing.jpg`)).rejects.toThrow(
|
||||||
fetchImageFromUrl(`${baseUrl}/missing.jpg`),
|
"HTTP 404",
|
||||||
).rejects.toThrow("HTTP 404");
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -72,7 +72,10 @@ describe("Profile Service", () => {
|
|||||||
|
|
||||||
it("returns only public setups, not private ones", async () => {
|
it("returns only public setups, not private ones", async () => {
|
||||||
// Create one public and one private setup
|
// Create one public and one private setup
|
||||||
const pub = await createSetup(db, userId, { name: "Public Setup", isPublic: true });
|
const pub = await createSetup(db, userId, {
|
||||||
|
name: "Public Setup",
|
||||||
|
isPublic: true,
|
||||||
|
});
|
||||||
const priv = await createSetup(db, userId, { name: "Private Setup" });
|
const priv = await createSetup(db, userId, { name: "Private Setup" });
|
||||||
|
|
||||||
const profile = await getPublicProfile(db, userId);
|
const profile = await getPublicProfile(db, userId);
|
||||||
|
|||||||
@@ -240,13 +240,7 @@ describe("Setup Service", () => {
|
|||||||
await syncSetupItems(db, userId, setup.id, [item1.id, item2.id]);
|
await syncSetupItems(db, userId, setup.id, [item1.id, item2.id]);
|
||||||
|
|
||||||
// Change classifications
|
// Change classifications
|
||||||
await updateItemClassification(
|
await updateItemClassification(db, userId, setup.id, item1.id, "worn");
|
||||||
db,
|
|
||||||
userId,
|
|
||||||
setup.id,
|
|
||||||
item1.id,
|
|
||||||
"worn",
|
|
||||||
);
|
|
||||||
await updateItemClassification(
|
await updateItemClassification(
|
||||||
db,
|
db,
|
||||||
userId,
|
userId,
|
||||||
@@ -261,12 +255,8 @@ describe("Setup Service", () => {
|
|||||||
const result = await getSetupWithItems(db, userId, setup.id);
|
const result = await getSetupWithItems(db, userId, setup.id);
|
||||||
expect(result?.items).toHaveLength(2);
|
expect(result?.items).toHaveLength(2);
|
||||||
|
|
||||||
const item2Result = result?.items.find(
|
const item2Result = result?.items.find((i: any) => i.name === "Jacket");
|
||||||
(i: any) => i.name === "Jacket",
|
const item3Result = result?.items.find((i: any) => i.name === "Stove");
|
||||||
);
|
|
||||||
const item3Result = result?.items.find(
|
|
||||||
(i: any) => i.name === "Stove",
|
|
||||||
);
|
|
||||||
expect(item2Result?.classification).toBe("consumable");
|
expect(item2Result?.classification).toBe("consumable");
|
||||||
expect(item3Result?.classification).toBe("base");
|
expect(item3Result?.classification).toBe("base");
|
||||||
});
|
});
|
||||||
@@ -293,13 +283,7 @@ describe("Setup Service", () => {
|
|||||||
});
|
});
|
||||||
await syncSetupItems(db, userId, setup.id, [item.id]);
|
await syncSetupItems(db, userId, setup.id, [item.id]);
|
||||||
|
|
||||||
await updateItemClassification(
|
await updateItemClassification(db, userId, setup.id, item.id, "worn");
|
||||||
db,
|
|
||||||
userId,
|
|
||||||
setup.id,
|
|
||||||
item.id,
|
|
||||||
"worn",
|
|
||||||
);
|
|
||||||
|
|
||||||
const result = await getSetupWithItems(db, userId, setup.id);
|
const result = await getSetupWithItems(db, userId, setup.id);
|
||||||
expect(result?.items[0].classification).toBe("worn");
|
expect(result?.items[0].classification).toBe("worn");
|
||||||
@@ -318,13 +302,7 @@ describe("Setup Service", () => {
|
|||||||
expect(result?.items[0].classification).toBe("base");
|
expect(result?.items[0].classification).toBe("base");
|
||||||
|
|
||||||
// Update
|
// Update
|
||||||
await updateItemClassification(
|
await updateItemClassification(db, userId, setup.id, item.id, "worn");
|
||||||
db,
|
|
||||||
userId,
|
|
||||||
setup.id,
|
|
||||||
item.id,
|
|
||||||
"worn",
|
|
||||||
);
|
|
||||||
|
|
||||||
result = await getSetupWithItems(db, userId, setup.id);
|
result = await getSetupWithItems(db, userId, setup.id);
|
||||||
expect(result?.items[0].classification).toBe("worn");
|
expect(result?.items[0].classification).toBe("worn");
|
||||||
@@ -341,20 +319,8 @@ describe("Setup Service", () => {
|
|||||||
await syncSetupItems(db, userId, setup1.id, [item.id]);
|
await syncSetupItems(db, userId, setup1.id, [item.id]);
|
||||||
await syncSetupItems(db, userId, setup2.id, [item.id]);
|
await syncSetupItems(db, userId, setup2.id, [item.id]);
|
||||||
|
|
||||||
await updateItemClassification(
|
await updateItemClassification(db, userId, setup1.id, item.id, "worn");
|
||||||
db,
|
await updateItemClassification(db, userId, setup2.id, item.id, "base");
|
||||||
userId,
|
|
||||||
setup1.id,
|
|
||||||
item.id,
|
|
||||||
"worn",
|
|
||||||
);
|
|
||||||
await updateItemClassification(
|
|
||||||
db,
|
|
||||||
userId,
|
|
||||||
setup2.id,
|
|
||||||
item.id,
|
|
||||||
"base",
|
|
||||||
);
|
|
||||||
|
|
||||||
const result1 = await getSetupWithItems(db, userId, setup1.id);
|
const result1 = await getSetupWithItems(db, userId, setup1.id);
|
||||||
const result2 = await getSetupWithItems(db, userId, setup2.id);
|
const result2 = await getSetupWithItems(db, userId, setup2.id);
|
||||||
|
|||||||
@@ -43,13 +43,8 @@ process.env.S3_BUCKET = "gearbox-images";
|
|||||||
process.env.S3_REGION = "us-east-1";
|
process.env.S3_REGION = "us-east-1";
|
||||||
|
|
||||||
// Import after mocking
|
// Import after mocking
|
||||||
const {
|
const { uploadImage, deleteImage, getImageUrl, withImageUrl, withImageUrls } =
|
||||||
uploadImage,
|
await import("@/server/services/storage.service");
|
||||||
deleteImage,
|
|
||||||
getImageUrl,
|
|
||||||
withImageUrl,
|
|
||||||
withImageUrls,
|
|
||||||
} = await import("@/server/services/storage.service");
|
|
||||||
|
|
||||||
describe("storage.service", () => {
|
describe("storage.service", () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
@@ -66,7 +61,9 @@ describe("storage.service", () => {
|
|||||||
await uploadImage(buffer, "test-image.jpg", "image/jpeg");
|
await uploadImage(buffer, "test-image.jpg", "image/jpeg");
|
||||||
|
|
||||||
expect(mockSend).toHaveBeenCalledTimes(1);
|
expect(mockSend).toHaveBeenCalledTimes(1);
|
||||||
const command = mockSend.mock.calls[0][0] as { input: Record<string, unknown> };
|
const command = mockSend.mock.calls[0][0] as {
|
||||||
|
input: Record<string, unknown>;
|
||||||
|
};
|
||||||
expect(command.input.Bucket).toBe("gearbox-images");
|
expect(command.input.Bucket).toBe("gearbox-images");
|
||||||
expect(command.input.Key).toBe("test-image.jpg");
|
expect(command.input.Key).toBe("test-image.jpg");
|
||||||
expect(command.input.ContentType).toBe("image/jpeg");
|
expect(command.input.ContentType).toBe("image/jpeg");
|
||||||
@@ -78,7 +75,9 @@ describe("storage.service", () => {
|
|||||||
await uploadImage(arrayBuffer, "test.png", "image/png");
|
await uploadImage(arrayBuffer, "test.png", "image/png");
|
||||||
|
|
||||||
expect(mockSend).toHaveBeenCalledTimes(1);
|
expect(mockSend).toHaveBeenCalledTimes(1);
|
||||||
const command = mockSend.mock.calls[0][0] as { input: Record<string, unknown> };
|
const command = mockSend.mock.calls[0][0] as {
|
||||||
|
input: Record<string, unknown>;
|
||||||
|
};
|
||||||
expect(Buffer.isBuffer(command.input.Body)).toBe(true);
|
expect(Buffer.isBuffer(command.input.Body)).toBe(true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -88,7 +87,9 @@ describe("storage.service", () => {
|
|||||||
await deleteImage("test-image.jpg");
|
await deleteImage("test-image.jpg");
|
||||||
|
|
||||||
expect(mockSend).toHaveBeenCalledTimes(1);
|
expect(mockSend).toHaveBeenCalledTimes(1);
|
||||||
const command = mockSend.mock.calls[0][0] as { input: Record<string, unknown> };
|
const command = mockSend.mock.calls[0][0] as {
|
||||||
|
input: Record<string, unknown>;
|
||||||
|
};
|
||||||
expect(command.input.Bucket).toBe("gearbox-images");
|
expect(command.input.Bucket).toBe("gearbox-images");
|
||||||
expect(command.input.Key).toBe("test-image.jpg");
|
expect(command.input.Key).toBe("test-image.jpg");
|
||||||
});
|
});
|
||||||
@@ -99,9 +100,7 @@ describe("storage.service", () => {
|
|||||||
const url = await getImageUrl("test-image.jpg");
|
const url = await getImageUrl("test-image.jpg");
|
||||||
|
|
||||||
expect(mockGetSignedUrl).toHaveBeenCalledTimes(1);
|
expect(mockGetSignedUrl).toHaveBeenCalledTimes(1);
|
||||||
expect(url).toBe(
|
expect(url).toBe("https://minio:9000/gearbox-images/test.jpg?signed=1");
|
||||||
"https://minio:9000/gearbox-images/test.jpg?signed=1",
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -564,11 +564,7 @@ describe("Thread Service", () => {
|
|||||||
expect(result.item?.productUrl).toBe("https://example.com/tent");
|
expect(result.item?.productUrl).toBe("https://example.com/tent");
|
||||||
|
|
||||||
// Thread should be resolved
|
// Thread should be resolved
|
||||||
const resolved = await getThreadWithCandidates(
|
const resolved = await getThreadWithCandidates(db, userId, thread.id);
|
||||||
db,
|
|
||||||
userId,
|
|
||||||
thread.id,
|
|
||||||
);
|
|
||||||
expect(resolved?.status).toBe("resolved");
|
expect(resolved?.status).toBe("resolved");
|
||||||
expect(resolved?.resolvedCandidateId).toBe(candidate.id);
|
expect(resolved?.resolvedCandidateId).toBe(candidate.id);
|
||||||
});
|
});
|
||||||
@@ -585,12 +581,7 @@ describe("Thread Service", () => {
|
|||||||
await resolveThread(db, userId, thread.id, candidate.id);
|
await resolveThread(db, userId, thread.id, candidate.id);
|
||||||
|
|
||||||
// Try to resolve again
|
// Try to resolve again
|
||||||
const result = await resolveThread(
|
const result = await resolveThread(db, userId, thread.id, candidate.id);
|
||||||
db,
|
|
||||||
userId,
|
|
||||||
thread.id,
|
|
||||||
candidate.id,
|
|
||||||
);
|
|
||||||
expect(result.success).toBe(false);
|
expect(result.success).toBe(false);
|
||||||
expect(result.error).toBeDefined();
|
expect(result.error).toBeDefined();
|
||||||
});
|
});
|
||||||
@@ -609,12 +600,7 @@ describe("Thread Service", () => {
|
|||||||
categoryId: 1,
|
categoryId: 1,
|
||||||
});
|
});
|
||||||
|
|
||||||
const result = await resolveThread(
|
const result = await resolveThread(db, userId, thread1.id, candidate.id);
|
||||||
db,
|
|
||||||
userId,
|
|
||||||
thread1.id,
|
|
||||||
candidate.id,
|
|
||||||
);
|
|
||||||
expect(result.success).toBe(false);
|
expect(result.success).toBe(false);
|
||||||
expect(result.error).toBeDefined();
|
expect(result.error).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -18,6 +18,11 @@ export default defineConfig({
|
|||||||
proxy: {
|
proxy: {
|
||||||
"/api": "http://localhost:3000",
|
"/api": "http://localhost:3000",
|
||||||
"/uploads": "http://localhost:3000",
|
"/uploads": "http://localhost:3000",
|
||||||
|
"/login": { target: "http://localhost:3000", changeOrigin: false },
|
||||||
|
"/callback": { target: "http://localhost:3000", changeOrigin: false },
|
||||||
|
"/logout": { target: "http://localhost:3000", changeOrigin: false },
|
||||||
|
"/.well-known": "http://localhost:3000",
|
||||||
|
"/oauth": "http://localhost:3000",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
build: {
|
build: {
|
||||||
|
|||||||
Reference in New Issue
Block a user