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

Refactor auth middleware to accept multiple auth modes

Browse Source
This commit is contained in:
Tuan Dang
2023-01-01 09:24:20 +07:00
parent 7e4bf7f44b
commit b8a64714d2
8 changed files with 138 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/controllers/v1/serviceTokenDataController.ts
+8 -2
View File
@@ -48,7 +48,8 @@ export const createServiceTokenData = async (req: Request, res: Response) => {
const expiresAt = new Date();
expiresAt.setSeconds(expiresAt.getSeconds() + expiresIn);
serviceTokenData = await new ServiceTokenData({
// create service token data
serviceTokenData = new ServiceTokenData({
name,
workspace: workspaceId,
environment,
@@ -59,7 +60,12 @@ export const createServiceTokenData = async (req: Request, res: Response) => {
encryptedKey,
iv,
tag
}).save();
})
await serviceTokenData.save();
// return service token data without sensitive data
serviceTokenData = await ServiceTokenData.findById(serviceTokenData._id);
} catch (err) {
Sentry.setUser({ email: req.user.email });
backend/src/controllers/v2/workspaceController.ts
+1 -1
View File
@@ -139,7 +139,7 @@ export const pullSecrets = async (req: Request, res: Response) => {
environment
});
if (channel !== 'cli') { // TODO: fix frontend to get rid of this reformat bs
if (channel !== 'cli') {
secrets = reformatPullSecrets({ secrets });
}