Merge dev into fix/log-analytics-adjustments

server/middlewares/integration/index.ts

@@ -12,4 +12,4 @@ export * from "./verifyAccessTokenAccess";
 export * from "./verifyApiKeyIsRoot";
 export * from "./verifyApiKeyApiKeyAccess";
 export * from "./verifyApiKeyClientAccess";
-export * from "./verifyApiKeySiteResourceAccess";
+export * from "./verifyApiKeySiteResourceAccess";

server/middlewares/integration/verifyAccessTokenAccess.ts

@@ -97,7 +97,6 @@ export async function verifyApiKeyAccessTokenAccess(
             );
         }
 
-
         return next();
     } catch (e) {
         return next(

server/middlewares/integration/verifyApiKeyApiKeyAccess.ts

@@ -11,7 +11,7 @@ export async function verifyApiKeyApiKeyAccess(
     next: NextFunction
 ) {
     try {
-        const {apiKey: callerApiKey } = req;
+        const { apiKey: callerApiKey } = req;
 
         const apiKeyId =
             req.params.apiKeyId || req.body.apiKeyId || req.query.apiKeyId;
@@ -44,7 +44,10 @@ export async function verifyApiKeyApiKeyAccess(
             .select()
             .from(apiKeyOrg)
             .where(
-                and(eq(apiKeys.apiKeyId, callerApiKey.apiKeyId), eq(apiKeyOrg.orgId, orgId))
+                and(
+                    eq(apiKeys.apiKeyId, callerApiKey.apiKeyId),
+                    eq(apiKeyOrg.orgId, orgId)
+                )
             )
             .limit(1);
 

server/middlewares/integration/verifyApiKeySetResourceClients.ts

@@ -11,9 +11,12 @@ export async function verifyApiKeySetResourceClients(
     next: NextFunction
 ) {
     const apiKey = req.apiKey;
-    const singleClientId = req.params.clientId || req.body.clientId || req.query.clientId;
+    const singleClientId =
+        req.params.clientId || req.body.clientId || req.query.clientId;
     const { clientIds } = req.body;
-    const allClientIds = clientIds || (singleClientId ? [parseInt(singleClientId as string)] : []);
+    const allClientIds =
+        clientIds ||
+        (singleClientId ? [parseInt(singleClientId as string)] : []);
 
     if (!apiKey) {
         return next(
@@ -70,4 +73,3 @@ export async function verifyApiKeySetResourceClients(
         );
     }
 }
-

server/middlewares/integration/verifyApiKeySetResourceUsers.ts

@@ -11,7 +11,8 @@ export async function verifyApiKeySetResourceUsers(
     next: NextFunction
 ) {
     const apiKey = req.apiKey;
-    const singleUserId = req.params.userId || req.body.userId || req.query.userId;
+    const singleUserId =
+        req.params.userId || req.body.userId || req.query.userId;
     const { userIds } = req.body;
     const allUserIds = userIds || (singleUserId ? [singleUserId] : []);
 

server/middlewares/integration/verifyApiKeySiteResourceAccess.ts

@@ -38,17 +38,12 @@ export async function verifyApiKeySiteResourceAccess(
         const [siteResource] = await db
             .select()
             .from(siteResources)
-            .where(and(
-                eq(siteResources.siteResourceId, siteResourceId)
-            ))
+            .where(and(eq(siteResources.siteResourceId, siteResourceId)))
             .limit(1);
 
         if (!siteResource) {
             return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    "Site resource not found"
-                )
+                createHttpError(HttpCode.NOT_FOUND, "Site resource not found")
             );
         }