promote: uat → main (GRO-1509 OIDC accountLinking fix) #46

Merged
Scrubs McBarkley merged 110 commits from uat into main 2026-05-22 14:03:44 +00:00
2 changed files with 14 additions and 7 deletions
Showing only changes of commit f9b68eb932 - Show all commits
+8 -4
View File
@@ -65,13 +65,17 @@ vi.mock("../db", () => {
const user = makeTableProxy("user"); const user = makeTableProxy("user");
const buildQuery = (result: unknown, fallback: unknown) => ({ const buildQuery = (result: unknown, fallback: unknown) => ({
limit: () => ({
[Symbol.iterator]: function* () { [Symbol.iterator]: function* () {
if (result) yield result; if (result) yield result;
}, },
0: result, limit: (_n: number) => {
length: result ? 1 : 0, const item = result ?? fallback;
}), return {
[Symbol.iterator]: function* () { if (item) yield item; },
0: item,
length: item ? 1 : 0,
};
},
}); });
return { return {
+3
View File
@@ -130,6 +130,9 @@ export const resolveStaffMiddleware: MiddlewareHandler<AppEnv> = async (
active: true, active: true,
}) })
.returning(); .returning();
if (!newStaff) {
return c.json({ error: "Internal error: staff record creation failed" }, 500);
}
c.set("staff", newStaff); c.set("staff", newStaff);
await next(); await next();
return; return;