groombook/app
Archived
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(api): resolve /me 500 and revoke not persisting (GRO-206) #161

Closed
groombook-engineer[bot] wants to merge 10 commits from fix/gro-206-superuser-revoke-bug into main
pull from: fix/gro-206-superuser-revoke-bug
merge into: groombook:main
Conversation 12 Commits 10 Files Changed 5
+2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9724327559 - Show all commits
apps/api/src/routes/staff.ts
+2 -2
View File
@@ -120,7 +120,7 @@ staffRouter.patch("/:id", zValidator("json", updateStaffSchema), async (c) => {
.where(and(eq(staff.isSuperUser, true), eq(staff.active, true), ne(staff.id, targetId))) .where(and(eq(staff.isSuperUser, true), eq(staff.active, true), ne(staff.id, targetId)))
.limit(2); .limit(2);
if (superUserCount.length <= 1) { if (superUserCount.length < 1) {
return [ return [
body.isSuperUser === false body.isSuperUser === false
? "Cannot revoke the last super user. Assign another super user first." ? "Cannot revoke the last super user. Assign another super user first."
@@ -201,7 +201,7 @@ staffRouter.delete("/:id", async (c) => {
.from(staff) .from(staff)
.where(and(eq(staff.isSuperUser, true), eq(staff.active, true), ne(staff.id, id))) .where(and(eq(staff.isSuperUser, true), eq(staff.active, true), ne(staff.id, id)))
.limit(2); .limit(2);
if (superUserCount.length <= 1) { if (superUserCount.length < 1) {
return ["Cannot delete the last super user. Assign another super user first.", null]; return ["Cannot delete the last super user. Assign another super user first.", null];
} }
} }