chore: More minor cleanups of code

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',

src/lib/db/role-store.ts

@@ -183,5 +183,3 @@ export default class RoleStore implements IRoleStore {
 
     destroy(): void {}
 }
-
-module.exports = RoleStore;

src/lib/error/role-in-use-error.ts

@@ -21,4 +21,3 @@ class RoleInUseError extends Error {
 }
 
 export default RoleInUseError;
-module.exports = RoleInUseError;

src/lib/services/project-service.ts

@@ -324,11 +324,7 @@ export default class ProjectService {
             }
         }
 
-        await this.accessService.removeUserFromRole(
+        await this.accessService.removeUserFromRole(userId, role.id, projectId);
-            userId,
-            role.id,
-            projectId,
-        );
     }
 
     async getMembers(projectId: string): Promise<number> {

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(
+    await accessService.addUserToRole(user.id, readRole.id, ALL_PROJECTS);
-        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(
+    await accessService.addUserToRole(user.id, adminRole.id, ALL_PROJECTS);
-        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(
+    await accessService.removeUserFromRole(user.id, editorRole.id, 'default');
-        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);
-});