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

feat: resolved rebase ts errors

Browse Source
This commit is contained in:
=
2024-07-30 23:50:04 +05:30
parent 29060ffc9e
commit d92979d50e
4 changed files with 9 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/ee/services/secret-approval-request/secret-approval-request-dal.ts
View File

@@ -422,6 +422,7 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
),
db.ref("secretPath").withSchema(TableName.SecretApprovalPolicy).as("policySecretPath"),
db.ref("approvals").withSchema(TableName.SecretApprovalPolicy).as("policyApprovals"),
db.ref("enforcementLevel").withSchema(TableName.SecretApprovalPolicy).as("policyEnforcementLevel"),
db.ref("approverUserId").withSchema(TableName.SecretApprovalPolicyApprover),
db.ref("email").withSchema("committerUser").as("committerUserEmail"),
db.ref("username").withSchema("committerUser").as("committerUserUsername"),
@@ -447,7 +448,8 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
id: el.policyId,
name: el.policyName,
approvals: el.policyApprovals,
secretPath: el.policySecretPath
secretPath: el.policySecretPath,
enforcementLevel: el.policyEnforcementLevel
},
committerUser: {
userId: el.committerUserId,

10
backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts
View File

@@ -38,8 +38,6 @@ import { TSecretVersionTagDALFactory } from "@app/services/secret/secret-version
import { TSecretBlindIndexDALFactory } from "@app/services/secret-blind-index/secret-blind-index-dal";
import { TSecretFolderDALFactory } from "@app/services/secret-folder/secret-folder-dal";
import { TSecretTagDALFactory } from "@app/services/secret-tag/secret-tag-dal";
import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
import { TUserDALFactory } from "@app/services/user/user-dal";
import { TSecretV2BridgeDALFactory } from "@app/services/secret-v2-bridge/secret-v2-bridge-dal";
import {
fnSecretBulkDelete as fnSecretV2BridgeBulkDelete,
@@ -49,6 +47,8 @@ import {
} from "@app/services/secret-v2-bridge/secret-v2-bridge-fns";
import { TSecretVersionV2DALFactory } from "@app/services/secret-v2-bridge/secret-version-dal";
import { TSecretVersionV2TagDALFactory } from "@app/services/secret-v2-bridge/secret-version-tag-dal";
import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
import { TUserDALFactory } from "@app/services/user/user-dal";
import { TPermissionServiceFactory } from "../permission/permission-service";
import { ProjectPermissionActions, ProjectPermissionSub } from "../permission/project-permission";
@@ -413,10 +413,10 @@ export const secretApprovalRequestServiceFactory = ({
secretApprovalRequest.policy.approvers.filter(
({ userId: approverId }) => reviewers[approverId.toString()] === ApprovalStatus.APPROVED
).length;
const isSoftEnforcement = secretApprovalRequest.policy.enforcementLevel === EnforcementLevel.Soft;
const isSoftEnforcement = secretApprovalRequest.policy.enforcementLevel === EnforcementLevel.Soft;
if (!hasMinApproval && !isSoftEnforcement)
throw new BadRequestError({ message: "Doesn't have minimum approvals needed" });
if (!hasMinApproval && !isSoftEnforcement)
throw new BadRequestError({ message: "Doesn't have minimum approvals needed" });
const { botKey, shouldUseSecretV2Bridge } = await projectBotService.getBotKey(projectId);
let mergeStatus;

2
backend/src/server/routes/v1/project-router.ts
View File

@@ -72,7 +72,7 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
lastName: true,
id: true
}).merge(UserEncryptionKeysSchema.pick({ publicKey: true })),
project: ProjectsSchema.pick({ name: true, id: true }),
project: SanitizedProjectSchema.pick({ name: true, id: true }),
roles: z.array(
z.object({
id: z.string(),

60
backend/src/services/secret/secret-queue.ts
View File

@@ -1115,66 +1115,6 @@ export const secretQueueFactory = ({
* Thus doesn't make sense for rest to be there
* */
await secretApprovalRequestDAL.deleteByProjectId(projectId, tx);
// const projectV1ApprovalSecrets = await secretApprovalRequestSecretDAL.findByProjectId(projectId);
// if (projectV1ApprovalSecrets.length) {
// await secretApprovalRequestSecretDAL.insertV2Bridge(
// projectV1ApprovalSecrets.map((el) => {
// const key = decryptSymmetric128BitHexKeyUTF8({
// ciphertext: el.secretKeyCiphertext,
// iv: el.secretKeyIV,
// tag: el.secretKeyTag,
// key: botKey
// });
// const value = decryptSymmetric128BitHexKeyUTF8({
// ciphertext: el.secretValueCiphertext,
// iv: el.secretValueIV,
// tag: el.secretValueTag,
// key: botKey
// });
// const comment =
// el.secretCommentCiphertext && el.secretCommentTag && el.secretCommentIV
// ? decryptSymmetric128BitHexKeyUTF8({
// ciphertext: el.secretCommentCiphertext,
// iv: el.secretCommentIV,
// tag: el.secretCommentTag,
// key: botKey
// })
// : "";
// const encryptedValue = secretManagerEncryptor({ plainText: Buffer.from(value) }).cipherTextBlob;
// const encryptedComment = comment
// ? secretManagerEncryptor({ plainText: Buffer.from(comment) }).cipherTextBlob
// : null;
// return {
// id: el.id,
// createdAt: el.createdAt,
// updatedAt: el.updatedAt,
// skipMultilineEncoding: el.skipMultilineEncoding,
// encryptedComment,
// encryptedValue,
// key,
// version: el.version,
// metadata: el.metadata,
// reminderNote: el.secretReminderNote,
// reminderRepeatDays: el.secretReminderRepeatDays,
// requestId: el.requestId,
// op: el.op,
// secretId: el.secretId,
// secretVersion: el.secretVersion
// };
// }),
// tx
// );
// }
// const projectV1SecretApprovalSecretTags = projectV1ApprovalSecrets.flatMap((el) =>
// el.tags.map((tag) => ({
// secretId: tag.secretApprovalTagSecretId,
// tagId: tag.secretApprovalTagId
// }))
// );
// if (projectV1SecretApprovalSecretTags.length) {
// await secretApprovalRequestSecretDAL.insertApprovalSecretV2Tags(projectV1SecretApprovalSecretTags, tx);
// }
await projectDAL.updateById(projectId, { upgradeStatus: null, version: ProjectVersion.V3 }, tx);
});
});