mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-15 15:41:27 +00:00
feat: fixing more and more ts
This commit is contained in:
@@ -277,21 +277,16 @@ export const registerOrgRoleRouter = async (server: FastifyZodProvider) => {
|
||||
},
|
||||
onRequest: verifyAuth([AuthMode.JWT]),
|
||||
handler: async (req) => {
|
||||
const { permissions, memberships } = await server.services.orgRole.getUserPermission(
|
||||
req.permission.id,
|
||||
req.params.organizationId,
|
||||
req.permission.authMethod,
|
||||
req.permission.orgId
|
||||
);
|
||||
const { permissions, memberships } = await server.services.role.getUserPermission({
|
||||
permission: req.permission,
|
||||
scopeData: {
|
||||
scope: AccessScope.Organization,
|
||||
orgId: req.permission.orgId
|
||||
}
|
||||
});
|
||||
return {
|
||||
permissions,
|
||||
memberships: memberships.map((el) => ({
|
||||
...el,
|
||||
role: el.roles[0].customRoleSlug || el.roles[0].role,
|
||||
orgId: el.scopeOrgId,
|
||||
status: el.status || "",
|
||||
isActive: el.isActive || true
|
||||
}))
|
||||
memberships
|
||||
};
|
||||
}
|
||||
});
|
||||
|
||||
@@ -337,12 +337,14 @@ export const registerProjectRoleRouter = async (server: FastifyZodProvider) => {
|
||||
},
|
||||
onRequest: verifyAuth([AuthMode.JWT]),
|
||||
handler: async (req) => {
|
||||
const { permissions, memberships, assumedPrivilegeDetails } = await server.services.projectRole.getUserPermission(
|
||||
req.permission.id,
|
||||
req.params.projectId,
|
||||
req.permission.authMethod,
|
||||
req.permission.orgId
|
||||
);
|
||||
const { permissions, memberships, assumedPrivilegeDetails } = await server.services.role.getUserPermission({
|
||||
permission: req.permission,
|
||||
scopeData: {
|
||||
scope: AccessScope.Project,
|
||||
projectId: req.params.projectId,
|
||||
orgId: req.permission.orgId
|
||||
}
|
||||
});
|
||||
|
||||
return {
|
||||
data: {
|
||||
|
||||
Reference in New Issue
Block a user