Merge branch 'dev' into feat/resource-policies

2026-05-18 23:05:21 +00:00 · 2026-02-28 01:08:12 +01:00
parent 7b02d4104d 8347203bbe
commit c292578f80
214 changed files with 13059 additions and 7647 deletions
--- a/server/routers/integration.ts
+++ b/server/routers/integration.ts
@@ -705,6 +705,13 @@ authenticated.get(
    user.getOrgUser
 );

+authenticated.get(
+    "/org/:orgId/user-by-username",
+    verifyApiKeyOrgAccess,
+    verifyApiKeyHasAction(ActionsEnum.getOrgUser),
+    user.getOrgUserByUsername
+);
+
 authenticated.post(
    "/user/:userId/2fa",
    verifyApiKeyIsRoot,