From 66f219d7787118cfeb17ccc730a3100606c91e79 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 12 Dec 2023 10:26:48 +0000
Subject: [PATCH] Lint and change status code to 400 when searching on invalid
 fields

---
 packages/worker/src/api/controllers/global/users.ts       | 6 +++---
 packages/worker/src/api/routes/global/tests/users.spec.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index 2f9c78bf93..0520990f2f 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -26,10 +26,10 @@ import {
   migrations,
   platform,
   tenancy,
+  db,
 } from "@budibase/backend-core"
 import { checkAnyUserExists } from "../../../utilities/users"
 import { isEmailConfigured } from "../../../utilities/email"
-import { removeKeyNumbering } from "@budibase/backend-core/src/db"
 
 const MAX_USERS_UPLOAD_LIMIT = 1000
 
@@ -195,13 +195,13 @@ export const search = async (ctx: Ctx<SearchUsersRequest>) => {
       if (filters && typeof filters === "object") {
         for (let [field, value] of Object.entries(filters)) {
           delete filters[field]
-          filters[removeKeyNumbering(field)] = value
+          filters[db.removeKeyNumbering(field)] = value
         }
       }
     }
     // Validate we aren't trying to search on any illegal fields
     if (!userSdk.core.isSupportedUserSearch(body.query)) {
-      ctx.throw(501, "Can only search by string.email or equal._id")
+      ctx.throw(400, "Can only search by string.email or equal._id")
     }
   }
 
diff --git a/packages/worker/src/api/routes/global/tests/users.spec.ts b/packages/worker/src/api/routes/global/tests/users.spec.ts
index cb534a770a..1365173b21 100644
--- a/packages/worker/src/api/routes/global/tests/users.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/users.spec.ts
@@ -623,7 +623,7 @@ describe("/api/global/users", () => {
         {
           query: { equal: { firstName: user.firstName } },
         },
-        { status: 501 }
+        { status: 400 }
       )
     })