set userid and email based on presence of service token/jwt

This commit is contained in:
Maidul Islam
2023-01-15 22:03:14 -08:00
parent 35f4d27ab0
commit da3742f600
@@ -254,8 +254,8 @@ export const getSecrets = async (req: Request, res: Response) => {
*/ */
const { workspaceId, environment } = req.query; const { workspaceId, environment } = req.query;
let userId: Types.ObjectId | undefined = undefined // used for getting personal secrets for user let userId = "" // used for getting personal secrets for user
let userEmail: Types.ObjectId | undefined = undefined // used for posthog let userEmail = "" // used for posthog
if (req.user) { if (req.user) {
userId = req.user._id; userId = req.user._id;
userEmail = req.user.email; userEmail = req.user.email;
@@ -284,13 +284,13 @@ export const getSecrets = async (req: Request, res: Response) => {
const readAction = await EELogService.createActionSecret({ const readAction = await EELogService.createActionSecret({
name: ACTION_READ_SECRETS, name: ACTION_READ_SECRETS,
userId: req.user._id.toString(), userId: userId,
workspaceId: workspaceId as string, workspaceId: 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.toString(), userId: userId,
workspaceId: workspaceId as string, workspaceId: workspaceId as string,
actions: [readAction], actions: [readAction],
channel, channel,