move middlewares out of auth

server/middlewares/index.ts

@@ -3,3 +3,13 @@ export * from "./rateLimit";
 export * from "./formatError";
 export * from "./verifySession";
 export * from "./verifyUser";
+export * from "./verifyOrgAccess";
+export * from "./getUserOrgs";
+export * from "./verifySiteAccess";
+export * from "./verifyResourceAccess";
+export * from "./verifyTargetAccess";
+export * from "./verifyRoleAccess";
+export * from "./verifyUserAccess";
+export * from "./verifyAdmin";
+export * from "./verifySetResourceUsers";
+export * from "./verifyUserInRole";

server/routers/auth/index.ts

@@ -4,19 +4,8 @@ export * from "./logout";
 export * from "./verifyTotp";
 export * from "./requestTotpSecret";
 export * from "./disable2fa";
-export * from "./verifyOrgAccess";
-export * from "./getUserOrgs";
-export * from "./verifySiteAccess";
-export * from "./verifyResourceAccess";
-export * from "./verifyTargetAccess";
-export * from "./verifyRoleAccess";
-export * from "./verifyUserAccess";
-export * from "./verifyAdmin";
-// export * from "./verifySuperUser";
 export * from "./verifyEmail";
 export * from "./requestEmailVerificationCode";
 export * from "./changePassword";
 export * from "./requestPasswordReset";
 export * from "./resetPassword";
-export * from "./verifyUserInRole";
-export * from "./verifySetResourceUsers";

server/routers/external.ts

@@ -11,21 +11,18 @@ import {
     rateLimitMiddleware,
     verifySessionMiddleware,
     verifySessionUserMiddleware,
-} from "@server/middlewares";
-import {
     verifyOrgAccess,
-    getUserOrgs,
     verifySiteAccess,
     verifyResourceAccess,
     verifyTargetAccess,
     verifyRoleAccess,
+    verifySetResourceUsers,
     verifyUserAccess,
-    verifyUserInRole,
-    verifySetResourceUsers
-} from "./auth";
-import { verifyUserHasAction } from "./auth/verifyUserHasAction";
+    getUserOrgs,
+} from "@server/middlewares";
+import { verifyUserHasAction } from "../middlewares/verifyUserHasAction";
 import { ActionsEnum } from "@server/auth/actions";
-import { verifyUserIsOrgOwner } from "./auth/verifyUserIsOrgOwner";
+import { verifyUserIsOrgOwner } from "../middlewares/verifyUserIsOrgOwner";
 import { createNewt, getToken } from "./newt";
 
 // Root routes