diff --git a/src/lib/db/access-store.ts b/src/lib/db/access-store.ts index f01a61a498..100e69d3bc 100644 --- a/src/lib/db/access-store.ts +++ b/src/lib/db/access-store.ts @@ -14,7 +14,7 @@ import NotFoundError from '../error/notfound-error'; import { ENVIRONMENT_PERMISSION_TYPE, ROOT_PERMISSION_TYPE, -} from 'lib/util/constants'; +} from '../util/constants'; const T = { ROLE_USER: 'role_user', diff --git a/src/lib/db/role-store.ts b/src/lib/db/role-store.ts index a93023fe4b..a0a71852b9 100644 --- a/src/lib/db/role-store.ts +++ b/src/lib/db/role-store.ts @@ -183,5 +183,3 @@ export default class RoleStore implements IRoleStore { destroy(): void {} } - -module.exports = RoleStore; diff --git a/src/lib/error/role-in-use-error.ts b/src/lib/error/role-in-use-error.ts index 1de4c762b1..b32ba6b522 100644 --- a/src/lib/error/role-in-use-error.ts +++ b/src/lib/error/role-in-use-error.ts @@ -21,4 +21,3 @@ class RoleInUseError extends Error { } export default RoleInUseError; -module.exports = RoleInUseError; diff --git a/src/lib/services/project-service.ts b/src/lib/services/project-service.ts index 85a9fcc1a0..c5ccf03512 100644 --- a/src/lib/services/project-service.ts +++ b/src/lib/services/project-service.ts @@ -324,11 +324,7 @@ export default class ProjectService { } } - await this.accessService.removeUserFromRole( - userId, - role.id, - projectId, - ); + await this.accessService.removeUserFromRole(userId, role.id, projectId); } async getMembers(projectId: string): Promise { diff --git a/src/test/e2e/services/access-service.e2e.test.ts b/src/test/e2e/services/access-service.e2e.test.ts index c66e8dcf92..aade13bc5b 100644 --- a/src/test/e2e/services/access-service.e2e.test.ts +++ b/src/test/e2e/services/access-service.e2e.test.ts @@ -35,11 +35,7 @@ const createUserEditorAccess = async (name, email) => { const createUserViewerAccess = async (name, email) => { const { userStore } = stores; const user = await userStore.insert({ name, email }); - await accessService.addUserToRole( - user.id, - readRole.id, - ALL_PROJECTS, - ); + await accessService.addUserToRole(user.id, readRole.id, ALL_PROJECTS); return user; }; @@ -182,11 +178,7 @@ const createSuperUser = async () => { name: 'Alice Admin', email: 'admin@getunleash.io', }); - await accessService.addUserToRole( - user.id, - adminRole.id, - ALL_PROJECTS, - ); + await accessService.addUserToRole(user.id, adminRole.id, ALL_PROJECTS); return user; }; @@ -425,11 +417,7 @@ test('should remove user from role', async () => { expect(userRoles.length).toBe(1); expect(userRoles[0].name).toBe(RoleName.EDITOR); - await accessService.removeUserFromRole( - user.id, - editorRole.id, - 'default', - ); + await accessService.removeUserFromRole(user.id, editorRole.id, 'default'); const userRolesAfterRemove = await accessService.getRolesForUser(user.id); expect(userRolesAfterRemove.length).toBe(0); }); @@ -679,17 +667,3 @@ test('Should be denied access to delete a role that is in use', async () => { ); } }); - -test('Should be given full access to project created by user', async () => { - const user = editorUser; - const newProjectName = 'AWholeNewProject'; - - const project = { - id: newProjectName, - name: newProjectName, - description: 'Blah', - }; - await projectService.createProject(project, user.id); - - hasFullProjectAccess(user, newProjectName, true); -});