feat: changed req.auth.userId to permission.id to satisfy type error

backend-pg/src/ee/routes/v1/org-role-router.ts

@@ -26,8 +26,9 @@ export const registerOrgRoleRouter = async (server: FastifyZodProvider) => {
     },
     onRequest: verifyAuth([AuthMode.JWT]),
     handler: async (req) => {
+      
       const role = await server.services.orgRole.createRole(
-        req.auth.userId,
+        req.permission.id,
         req.params.organizationId,
         req.body
       );
@@ -57,8 +58,9 @@ export const registerOrgRoleRouter = async (server: FastifyZodProvider) => {
     },
     onRequest: verifyAuth([AuthMode.JWT]),
     handler: async (req) => {
+      
       const role = await server.services.orgRole.updateRole(
-        req.auth.userId,
+        req.permission.id,
         req.params.organizationId,
         req.params.roleId,
         req.body
@@ -83,8 +85,9 @@ export const registerOrgRoleRouter = async (server: FastifyZodProvider) => {
     },
     onRequest: verifyAuth([AuthMode.JWT]),
     handler: async (req) => {
+      
       const role = await server.services.orgRole.deleteRole(
-        req.auth.userId,
+        req.permission.id,
         req.params.organizationId,
         req.params.roleId
       );
@@ -111,8 +114,9 @@ export const registerOrgRoleRouter = async (server: FastifyZodProvider) => {
     },
     onRequest: verifyAuth([AuthMode.JWT]),
     handler: async (req) => {
+      
       const roles = await server.services.orgRole.listRoles(
-        req.auth.userId,
+        req.permission.id,
         req.params.organizationId
       );
       return { data: { roles } };
@@ -135,8 +139,9 @@ export const registerOrgRoleRouter = async (server: FastifyZodProvider) => {
     },
     onRequest: verifyAuth([AuthMode.JWT]),
     handler: async (req) => {
+      
       const { permissions, membership } = await server.services.orgRole.getUserPermission(
-        req.auth.userId,
+        req.permission.id,
         req.params.organizationId
       );
       return { permissions, membership };

backend-pg/src/ee/routes/v1/project-role-router.ts

@@ -141,8 +141,9 @@ export const registerProjectRoleRouter = async (server: FastifyZodProvider) => {
     },
     onRequest: verifyAuth([AuthMode.JWT]),
     handler: async (req) => {
+      
       const { permissions, membership } = await server.services.projectRole.getUserPermission(
-        req.auth.userId,
+        req.permission.id,
         req.params.projectId
       );
       return { data: { permissions, membership } };

backend-pg/src/ee/services/permission/permission-dal.ts

@@ -78,7 +78,6 @@ export const permissionDalFactory = (db: TDbClient) => {
         .select(selectAllTableCols(TableName.IdentityProjectMembership))
         .select("permissions")
         .first();
-
       return membership;
     } catch (error) {
       throw new DatabaseError({ error, name: "GetProjectIdentityPermission" });

backend-pg/src/ee/services/permission/permission-service.ts

@@ -1,7 +1,14 @@
 import { createMongoAbility, MongoAbility, RawRuleOf } from "@casl/ability";
 import { PackRule, unpackRules } from "@casl/ability/extra";
+import { MongoQuery } from "@ucast/mongo2js";
 
-import { OrgMembershipRole, ProjectMembershipRole, ServiceTokenScopes } from "@app/db/schemas";
+import {
+  OrgMembershipRole,
+  ProjectMembershipRole,
+  ServiceTokenScopes,
+  TIdentityProjectMemberships,
+  TProjectMemberships
+} from "@app/db/schemas";
 import { conditionsMatcher } from "@app/lib/casl";
 import { BadRequestError, UnauthorizedError } from "@app/lib/errors";
 import { ActorType } from "@app/services/auth/auth-type";
@@ -170,18 +177,31 @@ export const permissionServiceFactory = ({
     const scopes = ServiceTokenScopes.parse(serviceToken.scopes || []);
     return {
       permission: buildServiceTokenProjectPermission(scopes, serviceToken.permissions),
-      member: undefined
+      membership: undefined
     };
   };
 
-  const getProjectPermission = async (type: ActorType, id: string, projectId: string) => {
+  type TProjectPermissionRT<T extends ActorType> = T extends ActorType.SERVICE
+    ? { permission: MongoAbility<ProjectPermissionSet, MongoQuery>; membership: undefined }
+    : {
+        permission: MongoAbility<ProjectPermissionSet, MongoQuery>;
+        membership: (T extends ActorType.USER
+          ? TProjectMemberships
+          : TIdentityProjectMemberships) & { permissions?: unknown };
+      };
+
+  const getProjectPermission = async <T extends ActorType>(
+    type: T,
+    id: string,
+    projectId: string
+  ): Promise<TProjectPermissionRT<T>> => {
     switch (type) {
       case ActorType.USER:
-        return getUserProjectPermission(id, projectId);
+        return getUserProjectPermission(id, projectId) as Promise<TProjectPermissionRT<T>>;
       case ActorType.SERVICE:
-        return getServiceTokenProjectPermission(id, projectId);
+        return getServiceTokenProjectPermission(id, projectId) as Promise<TProjectPermissionRT<T>>;
       case ActorType.IDENTITY:
-        return getIdentityProjectPermission(id, projectId);
+        return getIdentityProjectPermission(id, projectId) as Promise<TProjectPermissionRT<T>>;
       default:
         throw new UnauthorizedError({
           message: "Permission not defined",

backend-pg/src/ee/services/secret-approval-request/secret-approval-request-service.ts

@@ -73,7 +73,14 @@ export const secretApprovalRequestServiceFactory = ({
   secretQueueService
 }: TSecretApprovalRequestServiceFactoryDep) => {
   const requestCount = async ({ projectId, actor, actorId }: TApprovalRequestCountDTO) => {
-    const { membership } = await permissionService.getProjectPermission(actor, actorId, projectId);
+    if (actor === ActorType.SERVICE)
+      throw new BadRequestError({ message: "Cannot use service token" });
+
+    const { membership } = await permissionService.getProjectPermission(
+      actor as ActorType.USER,
+      actorId,
+      projectId
+    );
     const count = await secretApprovalRequestDal.findProjectRequestCount(projectId, membership.id);
     return count;
   };
@@ -86,6 +93,9 @@ export const secretApprovalRequestServiceFactory = ({
     environment,
     committer
   }: TListApprovalsDTO) => {
+    if (actor === ActorType.SERVICE)
+      throw new BadRequestError({ message: "Cannot use service token" });
+
     const { membership } = await permissionService.getProjectPermission(actor, actorId, projectId);
     const approvals = await secretApprovalRequestDal.findByProjectId({
       projectId,
@@ -98,6 +108,9 @@ export const secretApprovalRequestServiceFactory = ({
   };
 
   const getSecretApprovalDetails = async ({ actor, actorId, id }: TSecretApprovalDetailsDTO) => {
+    if (actor === ActorType.SERVICE)
+      throw new BadRequestError({ message: "Cannot use service token" });
+
     const secretApprovalRequest = await secretApprovalRequestDal.findById(id);
     if (!secretApprovalRequest)
       throw new BadRequestError({ message: "Secret approval request not found" });
@@ -393,6 +406,9 @@ export const secretApprovalRequestServiceFactory = ({
     secretPath,
     environment
   }: TGenerateSecretApprovalRequestDTO) => {
+    if (actor === ActorType.SERVICE)
+      throw new BadRequestError({ message: "Cannot use service token" });
+
     const { permission, membership } = await permissionService.getProjectPermission(
       actor,
       actorId,

backend-pg/src/ee/services/secret-scanning/secret-scanning-service.ts

@@ -1,7 +1,7 @@
 import crypto from "node:crypto";
 
 import { ForbiddenError } from "@casl/ability";
-import { PushEvent } from "@octokit/webhooks-types";
+import { WebhookEventMap } from "@octokit/webhooks-types";
 import { ProbotOctokit } from "probot";
 
 import {
@@ -146,7 +146,7 @@ export const secretScanningServiceFactory = ({
     return { risk };
   };
 
-  const handleRepoPushEvent = async (payload: PushEvent) => {
+  const handleRepoPushEvent = async (payload: WebhookEventMap["push"]) => {
     const { commits, repository, installation, pusher } = payload;
     if (!commits || !repository || !installation || !pusher) {
       return;