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

Fix merge conflicts

Browse Source
This commit is contained in:
Tuan Dang
2023-05-26 16:41:17 +03:00
parent f011d61167 17060b22d7
commit 200d9de740
464 changed files with 18003 additions and 6767 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/validation/workspace.ts
+2 -2
View File
@@ -81,7 +81,7 @@ export const validateClientForWorkspace = async ({
requiredPermissions
});
return ({ membership });
return ({ membership, workspace });
}
if (authData.authMode === AUTH_MODE_SERVICE_ACCOUNT && authData.authPayload instanceof ServiceAccount) {
@@ -115,7 +115,7 @@ export const validateClientForWorkspace = async ({
requiredPermissions
});
return ({ membership });
return ({ membership, workspace });
}
throw UnauthorizedRequestError({