awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed redundantcies

Browse Source
This commit is contained in:
Daniel Hougaard
2024-02-22 04:11:22 +01:00
parent 7816d8593e
commit bdb0ed3e5e
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/services/org/org-dal.ts
View File

@@ -230,15 +230,6 @@ export const orgDALFactory = (db: TDbClient) => {
} }
}; };
const deleteMembershipByUserId = async (userId: string, orgId: string, tx?: Knex) => {
try {
const [membership] = await (tx || db)(TableName.OrgMembership).where({ userId, orgId }).delete().returning("*");
return membership;
} catch (error) {
throw new DatabaseError({ error, name: "Delete org membership" });
}
};
const findMembership = async ( const findMembership = async (
filter: TFindFilter<TOrgMemberships>, filter: TFindFilter<TOrgMemberships>,
{ offset, limit, sort, tx }: TFindOpt<TOrgMemberships> = {} { offset, limit, sort, tx }: TFindOpt<TOrgMemberships> = {}
@@ -284,7 +275,6 @@ export const orgDALFactory = (db: TDbClient) => {
createMembership, createMembership,
updateMembershipById, updateMembershipById,
deleteMembershipById, deleteMembershipById,
deleteMembershipByUserId,
updateMembership updateMembership
}); });
}; };

5
backend/src/services/project/project-service.ts
View File

@@ -17,7 +17,6 @@ import { TProjectPermission } from "@app/lib/types";
import { ActorType } from "../auth/auth-type"; import { ActorType } from "../auth/auth-type";
import { TIdentityOrgDALFactory } from "../identity/identity-org-dal"; import { TIdentityOrgDALFactory } from "../identity/identity-org-dal";
import { TIdentityProjectDALFactory } from "../identity-project/identity-project-dal"; import { TIdentityProjectDALFactory } from "../identity-project/identity-project-dal";
import { TOrgDALFactory } from "../org/org-dal";
import { TOrgServiceFactory } from "../org/org-service"; import { TOrgServiceFactory } from "../org/org-service";
import { TProjectBotDALFactory } from "../project-bot/project-bot-dal"; import { TProjectBotDALFactory } from "../project-bot/project-bot-dal";
import { TProjectEnvDALFactory } from "../project-env/project-env-dal"; import { TProjectEnvDALFactory } from "../project-env/project-env-dal";
@@ -54,7 +53,6 @@ type TProjectServiceFactoryDep = {
projectKeyDAL: Pick<TProjectKeyDALFactory, "create" | "findLatestProjectKey" | "delete" | "find" | "insertMany">; projectKeyDAL: Pick<TProjectKeyDALFactory, "create" | "findLatestProjectKey" | "delete" | "find" | "insertMany">;
projectBotDAL: Pick<TProjectBotDALFactory, "create" | "findById" | "delete" | "findOne">; projectBotDAL: Pick<TProjectBotDALFactory, "create" | "findById" | "delete" | "findOne">;
projectMembershipDAL: Pick<TProjectMembershipDALFactory, "create" | "findProjectGhostUser" | "findOne">; projectMembershipDAL: Pick<TProjectMembershipDALFactory, "create" | "findProjectGhostUser" | "findOne">;
orgDAL: Pick<TOrgDALFactory, "deleteMembershipByUserId">;
secretBlindIndexDAL: Pick<TSecretBlindIndexDALFactory, "create">; secretBlindIndexDAL: Pick<TSecretBlindIndexDALFactory, "create">;
permissionService: TPermissionServiceFactory; permissionService: TPermissionServiceFactory;
orgService: Pick<TOrgServiceFactory, "addGhostUser">; orgService: Pick<TOrgServiceFactory, "addGhostUser">;
@@ -70,7 +68,6 @@ export const projectServiceFactory = ({
permissionService, permissionService,
userDAL, userDAL,
folderDAL, folderDAL,
orgDAL,
orgService, orgService,
identityProjectDAL, identityProjectDAL,
projectBotDAL, projectBotDAL,
@@ -300,7 +297,7 @@ export const projectServiceFactory = ({
// Delete the org membership for the ghost user if it's found. // Delete the org membership for the ghost user if it's found.
if (projectGhostUser) { if (projectGhostUser) {
await orgDAL.deleteMembershipByUserId(projectGhostUser.id, deletedProject.orgId, tx); await userDAL.deleteById(projectGhostUser.id, tx);
} }
return project; return project;