feat: write REST API endpoint to delete role
This commit is contained in:
@@ -0,0 +1,11 @@
|
|||||||
|
import Role from '../../../../../models/role.js';
|
||||||
|
|
||||||
|
export default async (request, response) => {
|
||||||
|
const role = await Role.query()
|
||||||
|
.findById(request.params.roleId)
|
||||||
|
.throwIfNotFound();
|
||||||
|
|
||||||
|
await role.deleteWithPermissions();
|
||||||
|
|
||||||
|
response.status(204).end();
|
||||||
|
};
|
@@ -0,0 +1,112 @@
|
|||||||
|
import Crypto from 'node:crypto';
|
||||||
|
import { vi, describe, it, expect, beforeEach } from 'vitest';
|
||||||
|
import request from 'supertest';
|
||||||
|
import app from '../../../../../app.js';
|
||||||
|
import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
|
||||||
|
import { createRole } from '../../../../../../test/factories/role.js';
|
||||||
|
import { createPermission } from '../../../../../../test/factories/permission.js';
|
||||||
|
import { createSamlAuthProvider } from '../../../../../../test/factories/saml-auth-provider.ee.js';
|
||||||
|
import { createUser } from '../../../../../../test/factories/user.js';
|
||||||
|
import * as license from '../../../../../helpers/license.ee.js';
|
||||||
|
|
||||||
|
describe('DELETE /api/v1/admin/roles/:roleId', () => {
|
||||||
|
let adminRole, currentUser, token;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
|
||||||
|
|
||||||
|
adminRole = await createRole({ name: 'Admin' });
|
||||||
|
|
||||||
|
currentUser = await createUser({ roleId: adminRole.id });
|
||||||
|
|
||||||
|
token = await createAuthTokenByUserId(currentUser.id);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return HTTP 204 for unused role', async () => {
|
||||||
|
const role = await createRole();
|
||||||
|
const permission = await createPermission({ roleId: role.id });
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.delete(`/api/v1/admin/roles/${role.id}`)
|
||||||
|
.set('Authorization', token)
|
||||||
|
.expect(204);
|
||||||
|
|
||||||
|
const refetchedRole = await role.$query();
|
||||||
|
const refetchedPermission = await permission.$query();
|
||||||
|
|
||||||
|
expect(refetchedRole).toBeUndefined();
|
||||||
|
expect(refetchedPermission).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return HTTP 404 for not existing role UUID', async () => {
|
||||||
|
const notExistingRoleUUID = Crypto.randomUUID();
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.delete(`/api/v1/admin/roles/${notExistingRoleUUID}`)
|
||||||
|
.set('Authorization', token)
|
||||||
|
.expect(404);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return not authorized response for deleting admin role', async () => {
|
||||||
|
await request(app)
|
||||||
|
.delete(`/api/v1/admin/roles/${adminRole.id}`)
|
||||||
|
.set('Authorization', token)
|
||||||
|
.expect(403);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return unprocessable entity response for role used by users', async () => {
|
||||||
|
const role = await createRole();
|
||||||
|
await createUser({ roleId: role.id });
|
||||||
|
|
||||||
|
const response = await request(app)
|
||||||
|
.delete(`/api/v1/admin/roles/${role.id}`)
|
||||||
|
.set('Authorization', token)
|
||||||
|
.expect(422);
|
||||||
|
|
||||||
|
expect(response.body).toStrictEqual({
|
||||||
|
errors: {
|
||||||
|
role: [`All users must be migrated away from the "${role.name}" role.`],
|
||||||
|
},
|
||||||
|
meta: {
|
||||||
|
type: 'ValidationError',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return unprocessable entity response for role used by saml auth providers', async () => {
|
||||||
|
const samlAuthProvider = await createSamlAuthProvider();
|
||||||
|
|
||||||
|
const response = await request(app)
|
||||||
|
.delete(`/api/v1/admin/roles/${samlAuthProvider.defaultRoleId}`)
|
||||||
|
.set('Authorization', token)
|
||||||
|
.expect(422);
|
||||||
|
|
||||||
|
expect(response.body).toStrictEqual({
|
||||||
|
errors: {
|
||||||
|
samlAuthProvider: [
|
||||||
|
'You need to change the default role in the SAML configuration before deleting this role.',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
meta: {
|
||||||
|
type: 'ValidationError',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not delete role and permissions on unsuccessful response', async () => {
|
||||||
|
const role = await createRole();
|
||||||
|
const permission = await createPermission({ roleId: role.id });
|
||||||
|
await createUser({ roleId: role.id });
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.delete(`/api/v1/admin/roles/${role.id}`)
|
||||||
|
.set('Authorization', token)
|
||||||
|
.expect(422);
|
||||||
|
|
||||||
|
const refetchedRole = await role.$query();
|
||||||
|
const refetchedPermission = await permission.$query();
|
||||||
|
|
||||||
|
expect(refetchedRole).toStrictEqual(role);
|
||||||
|
expect(refetchedPermission).toStrictEqual(permission);
|
||||||
|
});
|
||||||
|
});
|
@@ -1,6 +1,8 @@
|
|||||||
|
import { ValidationError } from 'objection';
|
||||||
import Base from './base.js';
|
import Base from './base.js';
|
||||||
import Permission from './permission.js';
|
import Permission from './permission.js';
|
||||||
import User from './user.js';
|
import User from './user.js';
|
||||||
|
import SamlAuthProvider from './saml-auth-provider.ee.js';
|
||||||
import NotAuthorizedError from '../errors/not-authorized.js';
|
import NotAuthorizedError from '../errors/not-authorized.js';
|
||||||
|
|
||||||
class Role extends Base {
|
class Role extends Base {
|
||||||
@@ -85,6 +87,59 @@ class Role extends Base {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async deleteWithPermissions() {
|
||||||
|
return await Role.transaction(async (trx) => {
|
||||||
|
await this.$relatedQuery('permissions', trx).delete();
|
||||||
|
|
||||||
|
return await this.$query(trx).delete();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async $beforeDelete(queryContext) {
|
||||||
|
await super.$beforeDelete(queryContext);
|
||||||
|
|
||||||
|
if (this.isAdmin) {
|
||||||
|
throw new NotAuthorizedError('The admin role cannot be deleted!');
|
||||||
|
}
|
||||||
|
|
||||||
|
const userCount = await this.$relatedQuery('users').limit(1).resultSize();
|
||||||
|
const hasUsers = userCount > 0;
|
||||||
|
|
||||||
|
if (hasUsers) {
|
||||||
|
throw new ValidationError({
|
||||||
|
data: {
|
||||||
|
role: [
|
||||||
|
{
|
||||||
|
message: `All users must be migrated away from the "${this.name}" role.`,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
type: 'ValidationError',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const samlAuthProviderUsingDefaultRole = await SamlAuthProvider.query()
|
||||||
|
.where({
|
||||||
|
default_role_id: this.id,
|
||||||
|
})
|
||||||
|
.limit(1)
|
||||||
|
.first();
|
||||||
|
|
||||||
|
if (samlAuthProviderUsingDefaultRole) {
|
||||||
|
throw new ValidationError({
|
||||||
|
data: {
|
||||||
|
samlAuthProvider: [
|
||||||
|
{
|
||||||
|
message:
|
||||||
|
'You need to change the default role in the SAML configuration before deleting this role.',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
type: 'ValidationError',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default Role;
|
export default Role;
|
||||||
|
@@ -6,6 +6,7 @@ import createRoleAction from '../../../../controllers/api/v1/admin/roles/create-
|
|||||||
import getRolesAction from '../../../../controllers/api/v1/admin/roles/get-roles.ee.js';
|
import getRolesAction from '../../../../controllers/api/v1/admin/roles/get-roles.ee.js';
|
||||||
import getRoleAction from '../../../../controllers/api/v1/admin/roles/get-role.ee.js';
|
import getRoleAction from '../../../../controllers/api/v1/admin/roles/get-role.ee.js';
|
||||||
import updateRoleAction from '../../../../controllers/api/v1/admin/roles/update-role.ee.js';
|
import updateRoleAction from '../../../../controllers/api/v1/admin/roles/update-role.ee.js';
|
||||||
|
import deleteRoleAction from '../../../../controllers/api/v1/admin/roles/delete-role.ee.js';
|
||||||
|
|
||||||
const router = Router();
|
const router = Router();
|
||||||
|
|
||||||
@@ -41,4 +42,12 @@ router.patch(
|
|||||||
updateRoleAction
|
updateRoleAction
|
||||||
);
|
);
|
||||||
|
|
||||||
|
router.delete(
|
||||||
|
'/:roleId',
|
||||||
|
authenticateUser,
|
||||||
|
authorizeAdmin,
|
||||||
|
checkIsEnterprise,
|
||||||
|
deleteRoleAction
|
||||||
|
);
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
|
Reference in New Issue
Block a user