awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 04:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

add back .populate(tags) to secrets GET via service token

Browse Source
This commit is contained in:
Maidul Islam
2023-04-10 15:16:57 -07:00
parent 576381cd58
commit 689ac6a8fe
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/controllers/v2/secretsController.ts
+10 -10
View File
@@ -560,9 +560,9 @@ export const getSecrets = async (req: Request, res: Response) => {
return tag ? tag.id : null; return tag ? tag.id : null;
}); });
} }
let secrets: ISecret[] = []; let secrets: ISecret[] = [];
if (req.user) { if (req.user) {
// case: client authorization is via JWT // case: client authorization is via JWT
@@ -578,12 +578,12 @@ export const getSecrets = async (req: Request, res: Response) => {
let secretQuery: any; let secretQuery: any;
if (tagNamesList != undefined && tagNamesList.length != 0) { if (tagNamesList != undefined && tagNamesList.length != 0) {
const workspaceFromDB = await Tag.find({ workspace: workspaceId }) const workspaceFromDB = await Tag.find({ workspace: workspaceId })
const tagIds = _.map(tagNamesList, (tagName) => { const tagIds = _.map(tagNamesList, (tagName) => {
const tag = _.find(workspaceFromDB, { slug: tagName }); const tag = _.find(workspaceFromDB, { slug: tagName });
return tag ? tag.id : null; return tag ? tag.id : null;
}); });
secretQuery = { secretQuery = {
workspace: workspaceId, workspace: workspaceId,
environment, environment,
@@ -608,15 +608,15 @@ export const getSecrets = async (req: Request, res: Response) => {
if (hasWriteOnlyAccess) { if (hasWriteOnlyAccess) {
// (i.e. you don't get values to decrypt since you can only write) // (i.e. you don't get values to decrypt since you can only write)
secrets = await Secret.find(secretQuery).select("secretKeyCiphertext secretKeyIV secretKeyTag") secrets = await Secret.find(secretQuery).select("secretKeyCiphertext secretKeyIV secretKeyTag").populate("tags")
} else { } else {
secrets = await Secret.find(secretQuery).populate("tags") secrets = await Secret.find(secretQuery).populate("tags")
} }
} }
if (req.serviceAccount || req.serviceTokenData) { if (req.serviceAccount || req.serviceTokenData) {
// case: client authorization is either via service account or service token // case: client authorization is either via service account or service token
secrets = await Secret.find({ secrets = await Secret.find({
workspace: new Types.ObjectId(workspaceId), workspace: new Types.ObjectId(workspaceId),
environment, environment,
@@ -625,7 +625,7 @@ export const getSecrets = async (req: Request, res: Response) => {
}, },
...(tagIds.length > 0 ? { tags: { $in: tagIds } } : {}), ...(tagIds.length > 0 ? { tags: { $in: tagIds } } : {}),
type: SECRET_SHARED type: SECRET_SHARED
}); }).populate("tags");
} }
const channel = getChannelFromUserAgent(req.headers['user-agent']) const channel = getChannelFromUserAgent(req.headers['user-agent'])
@@ -638,7 +638,7 @@ export const getSecrets = async (req: Request, res: Response) => {
workspaceId: new Types.ObjectId(workspaceId as string), workspaceId: new Types.ObjectId(workspaceId as string),
secretIds: secrets.map((n: any) => n._id) secretIds: secrets.map((n: any) => n._id)
}); });
readAction && await EELogService.createLog({ readAction && await EELogService.createLog({
userId: req.user?._id, userId: req.user?._id,
serviceAccountId: req.serviceAccount?._id, serviceAccountId: req.serviceAccount?._id,
@@ -952,7 +952,7 @@ export const deleteSecrets = async (req: Request, res: Response) => {
} }
} }
*/ */
return res.status(200).send({ return res.status(200).send({
message: 'delete secrets!!' message: 'delete secrets!!'
}); });