refactor(core): Remove roleId indirection (no-changelog) (#8413)

This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2024-01-24 13:38:57 +01:00
committed by GitHub
parent 1affebd85e
commit d6deceacde
139 changed files with 922 additions and 1684 deletions

View File

@@ -23,7 +23,7 @@ import { Container } from 'typedi';
export = {
createCredential: [
authorize(['owner', 'admin', 'member']),
authorize(['global:owner', 'global:admin', 'global:member']),
validCredentialType,
validCredentialsProperties,
async (
@@ -47,7 +47,7 @@ export = {
},
],
deleteCredential: [
authorize(['owner', 'admin', 'member']),
authorize(['global:owner', 'global:admin', 'global:member']),
async (
req: CredentialRequest.Delete,
res: express.Response,
@@ -55,13 +55,10 @@ export = {
const { id: credentialId } = req.params;
let credential: CredentialsEntity | undefined;
if (!['owner', 'admin'].includes(req.user.globalRole.name)) {
const shared = await getSharedCredentials(req.user.id, credentialId, [
'credentials',
'role',
]);
if (!['global:owner', 'global:admin'].includes(req.user.role)) {
const shared = await getSharedCredentials(req.user.id, credentialId);
if (shared?.role.name === 'owner') {
if (shared?.role === 'credential:owner') {
credential = shared.credentials;
}
} else {
@@ -78,7 +75,7 @@ export = {
],
getCredentialType: [
authorize(['owner', 'admin', 'member']),
authorize(['global:owner', 'global:admin', 'global:member']),
async (req: CredentialTypeRequest.Get, res: express.Response): Promise<express.Response> => {
const { credentialTypeName } = req.params;