Run linter

backend/src/ee/controllers/v1/workspaceController.ts

@@ -1,20 +1,19 @@
 import { Request, Response } from "express";
 import { PipelineStage, Types } from "mongoose";
-import { Secret, Membership, User, ServiceTokenData } from "../../../models";
+import { Membership, Secret, ServiceTokenData, User } from "../../../models";
 import {
+  ActorType,
+  AuditLog,
   FolderVersion,
   IPType,
   ISecretVersion,
   Log,
   SecretSnapshot,
   SecretVersion,
+  ServiceActor,
   TFolderRootVersionSchema,
   TrustedIP,
-  AuditLog,
-  Actor,
-  ActorType,
-  UserActor,
-  ServiceActor
+  UserActor
 } from "../../models";
 import { EESecretService } from "../../services";
 import { getLatestSecretVersionIds } from "../../helpers/secretVersion";
@@ -599,7 +598,7 @@ export const getWorkspaceLogs = async (req: Request, res: Response) => {
 };
 
 /**
- * Return trusted ips for workspace with id [workspaceId]
+ * Return audit logs for workspace with id [workspaceId]
  * @param req
  * @param res 
  */
@@ -608,6 +607,8 @@ export const getWorkspaceAuditLogs = async (req: Request, res: Response) => {
   const eventType = req.query.eventType;
   const userAgentType = req.query.userAgentType;
   const actor = req.query.actor as string | undefined;
+  const offset: number = parseInt(req.query.offset as string);
+  const limit: number = parseInt(req.query.limit as string);
   
   const auditLogs = await AuditLog.find({
     workspace: new Types.ObjectId(workspaceId),
@@ -626,7 +627,9 @@ export const getWorkspaceAuditLogs = async (req: Request, res: Response) => {
       })
     } : {})
   })
-  .sort({ createdAt: -1 });
+  .sort({ createdAt: -1 })
+  .skip(offset)
+  .limit(limit);
     
   return res.status(200).send({
     auditLogs
@@ -634,7 +637,7 @@ export const getWorkspaceAuditLogs = async (req: Request, res: Response) => {
 }
 
 /**
- * Return trusted ips for workspace with id [workspaceId]
+ * Return audit log actor filter options for workspace with id [workspaceId]
  * @param req
  * @param res 
  */

backend/src/ee/routes/v1/organizations.ts

@@ -8,7 +8,7 @@ import {
 import { body, param, query } from "express-validator";
 import { organizationsController } from "../../controllers/v1";
 import {
-    ACCEPTED, ADMIN, MEMBER, OWNER, AuthMode
+    ACCEPTED, ADMIN, AuthMode, MEMBER, OWNER
 } from "../../../variables";
 
 router.get(

backend/src/ee/routes/v1/secret.ts

@@ -9,10 +9,10 @@ import { body, param, query } from "express-validator";
 import { secretController } from "../../controllers/v1";
 import {
 	ADMIN, 
+	AuthMode,
 	MEMBER,
 	PERMISSION_READ_SECRETS,
-	PERMISSION_WRITE_SECRETS,
-	AuthMode
+	PERMISSION_WRITE_SECRETS
 } from "../../../variables";
 
 router.get(

backend/src/ee/routes/v1/secretSnapshot.ts

@@ -8,7 +8,7 @@ import {
     validateRequest,
 } from "../../../middleware";
 import { param } from "express-validator";
-import { ADMIN, MEMBER, AuthMode } from "../../../variables";
+import { ADMIN, AuthMode, MEMBER } from "../../../variables";
 import { secretSnapshotController } from "../../controllers/v1";
 
 router.get(

backend/src/ee/routes/v1/sso.ts

@@ -15,8 +15,8 @@ import { authLimiter } from "../../../helpers/rateLimiter";
 import {
     ACCEPTED,
     ADMIN,
-    OWNER,
-    AuthMode
+    AuthMode,
+    OWNER
 } from "../../../variables";
 
 router.get(

backend/src/ee/routes/v1/workspace.ts

@@ -8,8 +8,8 @@ import {
 import { body, param, query } from "express-validator";
 import {
   ADMIN, 
-  MEMBER,
-  AuthMode
+  AuthMode,
+  MEMBER
 } from "../../../variables";
 import { workspaceController } from "../../controllers/v1";
 import { EventType, UserAgentType } from "../../models";
@@ -97,6 +97,8 @@ router.get(
   query("eventType").isString().isIn(Object.values(EventType)).optional({ nullable: true }),
   query("userAgentType").isString().isIn(Object.values(UserAgentType)).optional({ nullable: true }),
   query("actor").isString().optional({ nullable: true }),
+  query("offset").isString().default("0"),
+  query("limit").isString().default("20"),
   validateRequest,
   workspaceController.getWorkspaceAuditLogs
 );

backend/src/ee/services/EEAuditLogService.ts

@@ -11,8 +11,8 @@ interface EventScope {
 }
 
 type ValidEventScope = 
-    | Required<Pick<EventScope, 'workspaceId'>>
-    | Required<Pick<EventScope, 'organizationId'>>
+    | Required<Pick<EventScope, "workspaceId">>
+    | Required<Pick<EventScope, "organizationId">>
     | Required<EventScope>
 
 export default class EEAuditLogService {

backend/src/helpers/auth.ts

@@ -28,8 +28,8 @@ import {
 	AuthMode
 } from "../variables";
 import {
-	UserAuthData,
-	ServiceTokenAuthData
+	ServiceTokenAuthData,
+	UserAuthData
 } from "../interfaces/middleware";
 
 import { ActorType } from "../ee/models";

backend/src/helpers/secrets.ts

@@ -13,7 +13,7 @@ import {
   SecretBlindIndexData,
   ServiceTokenData,
 } from "../models";
-import { SecretVersion, EventType } from "../ee/models";
+import { EventType, SecretVersion } from "../ee/models";
 import {
   BadRequestError,
   InternalServerError,
@@ -40,7 +40,7 @@ import {
 } from "../utils/crypto";
 import { TelemetryService } from "../services";
 import { client, getEncryptionKey, getRootEncryptionKey } from "../config";
-import { EELogService, EESecretService, EEAuditLogService } from "../ee/services";
+import { EEAuditLogService, EELogService, EESecretService } from "../ee/services";
 import { getAuthDataPayloadIdObj, getAuthDataPayloadUserObj } from "../utils/auth";
 import { getFolderByPath, getFolderIdFromServiceToken } from "../services/FolderService";
 import picomatch from "picomatch";

backend/src/interfaces/middleware/index.ts

@@ -4,8 +4,8 @@ import {
     IUser,
 } from "../../models";
 import { 
-    UserActor,
     ServiceActor,
+    UserActor,
     UserAgentType
 } from "../../ee/models";
 

backend/src/routes/v1/bot.ts

@@ -8,7 +8,7 @@ import {
     validateRequest,
 } from "../../middleware";
 import { botController } from "../../controllers/v1";
-import { ADMIN, MEMBER, AuthMode } from "../../variables";
+import { ADMIN, AuthMode, MEMBER } from "../../variables";
 
 router.get(
     "/:workspaceId",

backend/src/routes/v1/integration.ts

@@ -8,8 +8,8 @@ import {
 } from "../../middleware";
 import {
   ADMIN,
-  MEMBER,
-  AuthMode
+  AuthMode,
+  MEMBER
 } from "../../variables";
 import { body, param } from "express-validator";
 import { integrationController } from "../../controllers/v1";

backend/src/routes/v1/integrationAuth.ts

@@ -9,8 +9,8 @@ import {
 } from "../../middleware";
 import {
 	ADMIN, 
-	MEMBER,
-	AuthMode
+	AuthMode,
+	MEMBER
 } from "../../variables";
 import { integrationAuthController } from "../../controllers/v1";
 

backend/src/routes/v1/key.ts

@@ -6,7 +6,7 @@ import {
 	validateRequest,
 } from "../../middleware";
 import { body, param } from "express-validator";
-import { ADMIN, MEMBER, AuthMode } from "../../variables";
+import { ADMIN, AuthMode, MEMBER } from "../../variables";
 import { keyController } from "../../controllers/v1";
 
 router.post(

backend/src/routes/v1/organization.ts

@@ -9,9 +9,9 @@ import {
 import {
 	ACCEPTED, 
 	ADMIN, 
+	AuthMode,
 	MEMBER,
-	OWNER,
-	AuthMode
+	OWNER
 } from "../../variables";
 import { organizationController } from "../../controllers/v1";
 

backend/src/routes/v1/secret.ts

@@ -10,8 +10,8 @@ import { body, param, query } from "express-validator";
 import { secretController } from "../../controllers/v1";
 import {
 	ADMIN, 
-	MEMBER,
-	AuthMode
+	AuthMode,
+	MEMBER
 } from "../../variables";
 
 // note to devs: these endpoints will be deprecated in favor of v2

backend/src/routes/v1/secretImport.ts

@@ -3,7 +3,7 @@ const router = express.Router();
 import { body, param, query } from "express-validator";
 import { secretImportController } from "../../controllers/v1";
 import { requireAuth, requireWorkspaceAuth, validateRequest } from "../../middleware";
-import { ADMIN, MEMBER, AuthMode } from "../../variables";
+import { ADMIN, AuthMode, MEMBER } from "../../variables";
 
 router.post(
   "/",

backend/src/routes/v1/secretsFolder.ts

@@ -12,7 +12,7 @@ import {
   getFolders,
   updateFolderById,
 } from "../../controllers/v1/secretsFolderController";
-import { ADMIN, MEMBER, AuthMode } from "../../variables";
+import { ADMIN, AuthMode, MEMBER } from "../../variables";
 
 router.post(
   "/",

backend/src/routes/v1/serviceToken.ts

@@ -9,8 +9,8 @@ import {
 import { body } from "express-validator";
 import {
 	ADMIN, 
-	MEMBER,
-	AuthMode
+	AuthMode,
+	MEMBER
 } from "../../variables";
 import { serviceTokenController } from "../../controllers/v1";
 

backend/src/routes/v1/webhook.ts

@@ -2,7 +2,7 @@ import express from "express";
 const router = express.Router();
 import { requireAuth, requireWorkspaceAuth, validateRequest } from "../../middleware";
 import { body, param, query } from "express-validator";
-import { ADMIN, MEMBER, AuthMode } from "../../variables";
+import { ADMIN, AuthMode, MEMBER } from "../../variables";
 import { webhookController } from "../../controllers/v1";
 
 router.post(

backend/src/routes/v1/workspace.ts

@@ -8,8 +8,8 @@ import {
 } from "../../middleware";
 import {
 	ADMIN, 
-	MEMBER,
-	AuthMode
+	AuthMode,
+	MEMBER
 } from "../../variables";
 import { membershipController, workspaceController } from "../../controllers/v1";
 

backend/src/routes/v2/environment.ts

@@ -9,8 +9,8 @@ import {
 } from "../../middleware";
 import {
   ADMIN, 
-  MEMBER,
-  AuthMode
+  AuthMode,
+  MEMBER
 } from "../../variables";
 
 router.post(

backend/src/routes/v2/organizations.ts

@@ -10,9 +10,9 @@ import { body, param } from "express-validator";
 import { 
     ACCEPTED, 
     ADMIN, 
+    AuthMode,
     MEMBER,
-    OWNER,
-    AuthMode
+    OWNER
 } from "../../variables";
 import { organizationsController } from "../../controllers/v2";
 

backend/src/routes/v2/secret.ts

@@ -8,8 +8,8 @@ import {
 import { body, param, query } from "express-validator";
 import {
   ADMIN, 
-  MEMBER,
   AuthMode,
+  MEMBER,
   PERMISSION_READ_SECRETS,
   PERMISSION_WRITE_SECRETS,
 } from "../../variables";

backend/src/routes/v2/secrets.ts

@@ -12,8 +12,8 @@ import { body, query } from "express-validator";
 import { secretsController } from "../../controllers/v2";
 import {
   ADMIN,
-  MEMBER,
   AuthMode,
+  MEMBER,
   PERMISSION_READ_SECRETS,
   PERMISSION_WRITE_SECRETS,
   SECRET_PERSONAL,

backend/src/routes/v2/serviceTokenData.ts

@@ -9,8 +9,8 @@ import {
 import { body, param } from "express-validator";
 import {
   ADMIN,
-  MEMBER,
   AuthMode,
+  MEMBER,
   PERMISSION_WRITE_SECRETS
 } from "../../variables";
 import { serviceTokenDataController } from "../../controllers/v2";

backend/src/routes/v2/tags.ts

@@ -9,8 +9,8 @@ import {
 } from "../../middleware";
 import { 
   ADMIN, 
-  MEMBER,
-  AuthMode
+  AuthMode,
+  MEMBER
 } from "../../variables";
 
 router.get(

backend/src/routes/v2/workspace.ts

@@ -9,8 +9,8 @@ import {
 } from "../../middleware";
 import {
 	ADMIN, 
-	MEMBER,
-	AuthMode
+	AuthMode,
+	MEMBER
 } from "../../variables";
 import { workspaceController } from "../../controllers/v2";
 

backend/src/validation/membership.ts

@@ -1,23 +1,16 @@
 import { Types } from "mongoose";
 import {
-    IServiceAccount,
     IServiceTokenData,
     IUser,
     Membership,
-    ServiceAccount,
-    ServiceTokenData,
-    User,
 } from "../models";
-import { validateServiceAccountClientForWorkspace } from "./serviceAccount";
 import { validateUserClientForWorkspace } from "./user";
 import { validateServiceTokenDataClientForWorkspace } from "./serviceTokenData";
 import { 
     MembershipNotFoundError,
-    UnauthorizedRequestError,
 } from "../utils/errors";
 import { AuthData } from "../interfaces/middleware";
 import { ActorType } from "../ee/models";
-import { auth } from "../routes/v1";
 
 /**
  * Validate authenticated clients for membership with id [membershipId] based

backend/src/validation/organization.ts

@@ -36,9 +36,10 @@ export const validateClientForOrganization = async ({
     });
   }
   
+  let membershipOrg;
   switch (authData.actor.type) {
     case ActorType.USER:
-      const membershipOrg = await validateUserClientForOrganization({
+      membershipOrg = await validateUserClientForOrganization({
         user: authData.authPayload as IUser,
         organization,
         acceptedRoles,

backend/src/validation/secrets.ts

@@ -1,9 +1,9 @@
 import { Types } from "mongoose";
 import {
     ISecret,
-    Secret,
-    IUser,
     IServiceTokenData,
+    IUser,
+    Secret,
 } from "../models";
 import { validateUserClientForSecret, validateUserClientForSecrets } from "./user";
 import { validateServiceTokenDataClientForSecrets, validateServiceTokenDataClientForWorkspace } from "./serviceTokenData";

backend/src/validation/workspace.ts

@@ -1,9 +1,9 @@
 import net from "net";
 import { Types } from "mongoose";
 import {
-    SecretBlindIndexData,
-	IServiceTokenData,
+    IServiceTokenData,
 	IUser,
+	SecretBlindIndexData,
     Workspace,
 } from "../models";
 import {
@@ -78,9 +78,10 @@ export const validateClientForWorkspace = async ({
 		});
 	}
 	
+	let membership;
 	switch (authData.actor.type) {
 		case ActorType.USER:
-			const membership = await validateUserClientForWorkspace({
+			membership = await validateUserClientForWorkspace({
 				user: authData.authPayload as IUser,
 				workspaceId,
 				environment,