awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-16 15:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Tuan Dang
2023-08-05 16:57:21 +07:00
parent 142fcf0a01 49bcd8839f
commit b9ce448bed
29 changed files with 495 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/routes/v3/secrets.ts
+10 -10
View File
@@ -5,8 +5,8 @@ import { body, param, query } from "express-validator";
import { secretsController } from "../../controllers/v3";
import {
ADMIN,
MEMBER,
AuthMode,
MEMBER,
PERMISSION_READ_SECRETS,
PERMISSION_WRITE_SECRETS,
SECRET_PERSONAL,
@@ -52,7 +52,7 @@ router.get(
requiredPermissions: [PERMISSION_READ_SECRETS],
requireBlindIndicesEnabled: true,
requireE2EEOff: true,
checkIPAllowlist: true
checkIPAllowlist: false
}),
secretsController.getSecretByNameRaw
);
@@ -80,7 +80,7 @@ router.post(
requiredPermissions: [PERMISSION_WRITE_SECRETS],
requireBlindIndicesEnabled: true,
requireE2EEOff: true,
checkIPAllowlist: true
checkIPAllowlist: false
}),
secretsController.createSecretRaw
);
@@ -108,7 +108,7 @@ router.patch(
requiredPermissions: [PERMISSION_WRITE_SECRETS],
requireBlindIndicesEnabled: true,
requireE2EEOff: true,
checkIPAllowlist: true
checkIPAllowlist: false
}),
secretsController.updateSecretByNameRaw
);
@@ -135,7 +135,7 @@ router.delete(
requiredPermissions: [PERMISSION_WRITE_SECRETS],
requireBlindIndicesEnabled: true,
requireE2EEOff: true,
checkIPAllowlist: true
checkIPAllowlist: false
}),
secretsController.deleteSecretByNameRaw
);
@@ -160,7 +160,7 @@ router.get(
requiredPermissions: [PERMISSION_READ_SECRETS],
requireBlindIndicesEnabled: true,
requireE2EEOff: false,
checkIPAllowlist: true
checkIPAllowlist: false
}),
secretsController.getSecrets
);
@@ -195,7 +195,7 @@ router.post(
requiredPermissions: [PERMISSION_WRITE_SECRETS],
requireBlindIndicesEnabled: true,
requireE2EEOff: false,
checkIPAllowlist: true
checkIPAllowlist: false
}),
secretsController.createSecret
);
@@ -221,7 +221,7 @@ router.get(
locationEnvironment: "query",
requiredPermissions: [PERMISSION_READ_SECRETS],
requireBlindIndicesEnabled: true,
checkIPAllowlist: true
checkIPAllowlist: false
}),
secretsController.getSecretByName
);
@@ -251,7 +251,7 @@ router.patch(
requiredPermissions: [PERMISSION_WRITE_SECRETS],
requireBlindIndicesEnabled: true,
requireE2EEOff: false,
checkIPAllowlist: true
checkIPAllowlist: false
}),
secretsController.updateSecretByName
);
@@ -278,7 +278,7 @@ router.delete(
requiredPermissions: [PERMISSION_WRITE_SECRETS],
requireBlindIndicesEnabled: true,
requireE2EEOff: false,
checkIPAllowlist: true
checkIPAllowlist: false
}),
secretsController.deleteSecretByName
);