fix(api): wrap encryptSecret in try/catch to return proper JSON error (GRO-441)

fix(api): wrap encryptSecret in try/catch to return proper JSON error (GRO-441)
This commit was merged in pull request #221.
This commit is contained in:
groombook-cto[bot]
2026-04-04 00:24:40 +00:00
committed by GitHub
4 changed files with 29 additions and 16 deletions
+1
View File
@@ -167,6 +167,7 @@ api.route("/impersonation", impersonationRouter);
api.route("/admin/settings", settingsRouter); api.route("/admin/settings", settingsRouter);
api.route("/admin/auth-provider", authProviderRouter); api.route("/admin/auth-provider", authProviderRouter);
api.route("/admin/seed", adminSeedRouter); api.route("/admin/seed", adminSeedRouter);
api.route("/admin/auth-provider", authProviderRouter);
api.route("/search", searchRouter); api.route("/search", searchRouter);
const port = Number(process.env.PORT ?? 3000); const port = Number(process.env.PORT ?? 3000);
+14 -2
View File
@@ -69,10 +69,18 @@ authProviderRouter.put(
const db = getDb(); const db = getDb();
const body = c.req.valid("json"); const body = c.req.valid("json");
const encryptedSecret = encryptSecret(body.clientSecret); let encryptedSecret: string;
try {
encryptedSecret = encryptSecret(body.clientSecret);
} catch (err) {
const message = err instanceof Error ? err.message : "Unknown error";
return c.json({ error: `Failed to encrypt client secret: ${message}` }, 500);
}
// Upsert: delete existing rows then insert atomically // Upsert: delete existing rows then insert atomically
const [row] = await db.transaction(async (tx) => { let row: typeof authProviderConfig.$inferSelect | undefined;
try {
[row] = await db.transaction(async (tx) => {
await tx.delete(authProviderConfig); await tx.delete(authProviderConfig);
return tx.insert(authProviderConfig).values({ return tx.insert(authProviderConfig).values({
providerId: body.providerId, providerId: body.providerId,
@@ -85,6 +93,10 @@ authProviderRouter.put(
enabled: true, enabled: true,
}).returning(); }).returning();
}); });
} catch (err) {
const message = err instanceof Error ? err.message : "Unknown error";
return c.json({ error: `Failed to persist auth provider config: ${message}` }, 500);
}
if (!row) return c.json({ error: "Failed to create auth provider config" }, 500); if (!row) return c.json({ error: "Failed to create auth provider config" }, 500);
+1 -1
View File
@@ -3,8 +3,8 @@ import postgres from "postgres";
import * as schema from "./schema.js"; import * as schema from "./schema.js";
export * from "./schema.js"; export * from "./schema.js";
export { and, asc, desc, eq, exists, gte, gt, ilike, inArray, lt, lte, ne, or, sql } from "drizzle-orm";
export { encryptSecret, decryptSecret } from "./crypto.js"; export { encryptSecret, decryptSecret } from "./crypto.js";
export { and, asc, desc, eq, exists, gte, gt, ilike, inArray, lt, lte, ne, or, sql } from "drizzle-orm";
let _db: ReturnType<typeof drizzle> | null = null; let _db: ReturnType<typeof drizzle> | null = null;