Merge branch 'keyshade-xyz:develop' into api-client/event

keyshade-xyz · Aug 2, 2024 · c5eca02 · c5eca02
2 parents aaa7995 + db5bd4f
commit c5eca02
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 21 deletions.
diff --git a/apps/api/src/api-key/service/api-key.service.ts b/apps/api/src/api-key/service/api-key.service.ts
@@ -11,6 +11,7 @@ import { generateApiKey } from '../../common/api-key-generator'
 import { toSHA256 } from '../../common/to-sha256'
 import { UpdateApiKey } from '../dto/update.api-key/update.api-key'
 import { ApiKey, User } from '@prisma/client'
+import { limitMaxItemsPerPage } from '../../common/limit-max-items-per-page'
 
 @Injectable()
 export class ApiKeyService {
@@ -146,7 +147,7 @@ export class ApiKeyService {
         }
       },
       skip: page * limit,
-      take: limit,
+      take: limitMaxItemsPerPage(limit),
       orderBy: {
         [sort]: order
       },

diff --git a/apps/api/src/common/limit-max-items-per-page.ts b/apps/api/src/common/limit-max-items-per-page.ts
@@ -0,0 +1,6 @@
+export function limitMaxItemsPerPage(
+  limit: number,
+  maxlimit: number = 30
+): number {
+  return Math.min(limit, maxlimit)
+}
diff --git a/apps/api/src/environment/service/environment.service.ts b/apps/api/src/environment/service/environment.service.ts
@@ -18,6 +18,7 @@ import { PrismaService } from '../../prisma/prisma.service'
 import createEvent from '../../common/create-event'
 import { AuthorityCheckerService } from '../../common/authority-checker.service'
 import { paginate } from '../../common/paginate'
+import { limitMaxItemsPerPage } from '../../common/limit-max-items-per-page'
 
 @Injectable()
 export class EnvironmentService {
@@ -196,7 +197,7 @@ export class EnvironmentService {
         }
       },
       skip: page * limit,
-      take: limit,
+      take: limitMaxItemsPerPage(limit),
       orderBy: {
         [sort]: order
       }
@@ -212,7 +213,7 @@ export class EnvironmentService {
     })
     const metadata = paginate(totalCount, `/environment/all/${projectId}`, {
       page,
-      limit,
+      limit: limitMaxItemsPerPage(limit),
       sort,
       order,
       search

diff --git a/apps/api/src/event/service/event.service.ts b/apps/api/src/event/service/event.service.ts
@@ -3,6 +3,7 @@ import { Authority, EventSeverity, EventSource, User } from '@prisma/client'
 import { PrismaService } from '../../prisma/prisma.service'
 import { AuthorityCheckerService } from '../../common/authority-checker.service'
 import { paginate } from '../../common/paginate'
+import { limitMaxItemsPerPage } from '../../common/limit-max-items-per-page'
 
 @Injectable()
 export class EventService {
@@ -44,7 +45,8 @@ export class EventService {
         }
       },
       skip: page * limit,
-      take: limit,
+      take: limitMaxItemsPerPage(limit),
+
       orderBy: {
         timestamp: 'desc'
       }
@@ -67,7 +69,7 @@ export class EventService {
       `/event/${workspaceId}`,
       {
         page,
-        limit,
+        limit: limitMaxItemsPerPage(limit),
         search
       },
       { source }

diff --git a/apps/api/src/integration/service/integration.service.ts b/apps/api/src/integration/service/integration.service.ts
@@ -19,6 +19,7 @@ import { AuthorityCheckerService } from '../../common/authority-checker.service'
 import createEvent from '../../common/create-event'
 import IntegrationFactory from '../plugins/factory/integration.factory'
 import { paginate } from '../../common/paginate'
+import { limitMaxItemsPerPage } from '../../common/limit-max-items-per-page'
 
 @Injectable()
 export class IntegrationService {
@@ -297,7 +298,8 @@ export class IntegrationService {
         ]
       },
       skip: page * limit,
-      take: limit,
+      take: limitMaxItemsPerPage(limit),
+
       orderBy: {
         [sort]: order
       }
@@ -324,7 +326,7 @@ export class IntegrationService {
     })
     const metadata = paginate(totalCount, `/integration/all/${workspaceId}`, {
       page,
-      limit,
+      limit: limitMaxItemsPerPage(limit),
       sort,
       order,
       search

diff --git a/apps/api/src/project/service/project.service.ts b/apps/api/src/project/service/project.service.ts
@@ -32,6 +32,7 @@ import { ProjectWithSecrets } from '../project.types'
 import { AuthorityCheckerService } from '../../common/authority-checker.service'
 import { ForkProject } from '../dto/fork.project/fork.project'
 import { paginate } from '../../common/paginate'
+import { limitMaxItemsPerPage } from '../../common/limit-max-items-per-page'
 
 @Injectable()
 export class ProjectService {
@@ -629,7 +630,7 @@ export class ProjectService {
       `/project/${projectId}/forks`,
       {
         page,
-        limit
+        limit: limitMaxItemsPerPage(limit)
       }
     )
 
@@ -670,7 +671,8 @@ export class ProjectService {
     const items = (
       await this.prisma.project.findMany({
         skip: page * limit,
-        take: limit,
+        take: limitMaxItemsPerPage(limit),
+
         orderBy: {
           [sort]: order
         },

diff --git a/apps/api/src/secret/service/secret.service.ts b/apps/api/src/secret/service/secret.service.ts
@@ -32,6 +32,7 @@ import {
   ChangeNotificationEvent
 } from 'src/socket/socket.types'
 import { paginate } from '../../common/paginate'
+import { limitMaxItemsPerPage } from '../../common/limit-max-items-per-page'
 
 @Injectable()
 export class SecretService {
@@ -524,7 +525,7 @@ export class SecretService {
         environmentId: environmentId
       },
       skip: page * limit,
-      take: limit,
+      take: limitMaxItemsPerPage(limit),
       orderBy: {
         version: sortOrder
       }
@@ -570,7 +571,8 @@ export class SecretService {
         }
       },
       skip: page * limit,
-      take: limit,
+      take: limitMaxItemsPerPage(limit),
+
       orderBy: {
         [sort]: order
       }
@@ -672,7 +674,7 @@ export class SecretService {
       `/secret/${projectId}`,
       {
         page,
-        limit,
+        limit: limitMaxItemsPerPage(limit),
         sort,
         order,
         search

diff --git a/apps/api/src/user/service/user.service.ts b/apps/api/src/user/service/user.service.ts
@@ -16,6 +16,7 @@ import {
 import createUser from '../../common/create-user'
 import generateOtp from '../../common/generate-otp'
 import { EnvSchema } from '../../common/env/env.schema'
+import { limitMaxItemsPerPage } from '../../common/limit-max-items-per-page'
 
 @Injectable()
 export class UserService {
@@ -216,7 +217,7 @@ export class UserService {
   ): Promise<User[]> {
     return this.prisma.user.findMany({
       skip: (page - 1) * limit,
-      take: limit,
+      take: limitMaxItemsPerPage(limit),
       orderBy: {
         [sort]: order
       },

diff --git a/apps/api/src/variable/service/variable.service.ts b/apps/api/src/variable/service/variable.service.ts
@@ -29,6 +29,7 @@ import {
   ChangeNotificationEvent
 } from 'src/socket/socket.types'
 import { paginate } from '../../common/paginate'
+import { limitMaxItemsPerPage } from '../../common/limit-max-items-per-page'
 
 @Injectable()
 export class VariableService {
@@ -521,7 +522,8 @@ export class VariableService {
         }
       },
       skip: page * limit,
-      take: limit,
+      take: limitMaxItemsPerPage(limit),
+
       orderBy: {
         [sort]: order
       }
@@ -616,7 +618,7 @@ export class VariableService {
 
     const metadata = paginate(totalCount, `/variable/${projectId}`, {
       page,
-      limit,
+      limit: limitMaxItemsPerPage(limit),
       sort,
       order,
       search
@@ -653,7 +655,8 @@ export class VariableService {
         environmentId: environmentId
       },
       skip: page * limit,
-      take: limit,
+      take: limitMaxItemsPerPage(limit),
+
       orderBy: {
         version: order
       }

diff --git a/apps/api/src/workspace-role/service/workspace-role.service.ts b/apps/api/src/workspace-role/service/workspace-role.service.ts
@@ -23,6 +23,7 @@ import { WorkspaceRoleWithProjects } from '../workspace-role.types'
 import { v4 } from 'uuid'
 import { AuthorityCheckerService } from '../../common/authority-checker.service'
 import { paginate, PaginatedMetadata } from '../../common/paginate'
+import { limitMaxItemsPerPage } from '../../common/limit-max-items-per-page'
 
 @Injectable()
 export class WorkspaceRoleService {
@@ -320,7 +321,8 @@ export class WorkspaceRoleService {
         }
       },
       skip: page * limit,
-      take: limit,
+      take: limitMaxItemsPerPage(limit),
+
       orderBy: {
         [sort]: order
       }
@@ -341,7 +343,7 @@ export class WorkspaceRoleService {
       `/workspace-role/${workspaceId}/all`,
       {
         page,
-        limit,
+        limit: limitMaxItemsPerPage(limit),
         sort,
         order,
         search

diff --git a/apps/api/src/workspace/service/workspace.service.ts b/apps/api/src/workspace/service/workspace.service.ts
@@ -32,6 +32,7 @@ import createEvent from '../../common/create-event'
 import createWorkspace from '../../common/create-workspace'
 import { AuthorityCheckerService } from '../../common/authority-checker.service'
 import { paginate } from '../../common/paginate'
+import { limitMaxItemsPerPage } from '../../common/limit-max-items-per-page'
 
 @Injectable()
 export class WorkspaceService {
@@ -539,7 +540,7 @@ export class WorkspaceService {
 
     const metadata = paginate(totalCount, `/workspace/${workspaceId}/members`, {
       page,
-      limit,
+      limit: limitMaxItemsPerPage(limit),
       sort,
       order,
       search
@@ -813,8 +814,8 @@ export class WorkspaceService {
 
     //calculate metadata for pagination
     const metadata = paginate(totalCount, `/workspace`, {
-      page: Number(page),
-      limit: Number(limit),
+      page,
+      limit: limitMaxItemsPerPage(limit),
       sort,
       order,
       search