Compare commits

...

5 Commits

Author SHA1 Message Date
Ali BARIN
96544df7d5 refactor(role): remove transactions and tidy up logic in model (#2141)
* refactor(role): remove returning this in model methods

* refactor(role): assert altering admin in model before update and delete

* refactor(role): rename overridePermissions with updatePermissions in model

* refactor(role): remove transactions in model

* refactor(role): remove transactions in model

* refactor(role): return with permissions upon update in model

* fix(role): assert admin check on old instance in model

* refactor(role): fetch and use current role in preventAlteringAdmin
2024-10-28 14:57:33 +01:00
Ali BARIN
036db63a33 test(role): write model tests 2024-10-28 08:22:07 +00:00
Ali BARIN
41568904ab Merge pull request #2142 from automatisch/refactor-tests
refactor: Use toStrictEqual instead of toEqual for tests
2024-10-28 08:49:34 +01:00
Faruk AYDIN
2e5b44c424 refactor: Use toStrictEqual instead of toEqual for tests 2024-10-25 12:33:39 +02:00
Faruk AYDIN
7a437660d1 refactor: Remove id column from app config serializer 2024-10-25 11:47:41 +02:00
88 changed files with 504 additions and 170 deletions

View File

@@ -32,7 +32,7 @@ describe('POST /api/v1/access-tokens', () => {
})
.expect(422);
expect(response.body.errors.general).toEqual([
expect(response.body.errors.general).toStrictEqual([
'Incorrect email or password.',
]);
});

View File

@@ -83,7 +83,7 @@ describe('POST /api/v1/admin/apps/:appKey/auth-clients', () => {
.send(appAuthClient)
.expect(422);
expect(response.body.meta.type).toEqual('ModelValidation');
expect(response.body.meta.type).toStrictEqual('ModelValidation');
expect(response.body.errors).toMatchObject({
name: ["must have required property 'name'"],
formattedAuthDefaults: [

View File

@@ -59,7 +59,7 @@ describe('POST /api/v1/admin/apps/:appKey/config', () => {
})
.expect(422);
expect(response.body.meta.type).toEqual('UniqueViolationError');
expect(response.body.meta.type).toStrictEqual('UniqueViolationError');
expect(response.body.errors).toMatchObject({
key: ["'key' must be unique."],
});

View File

@@ -32,7 +32,7 @@ describe('GET /api/v1/admin/apps/:appKey/auth-clients/:appAuthClientId', () => {
.expect(200);
const expectedPayload = getAppAuthClientMock(currentAppAuthClient);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing app auth client ID', async () => {

View File

@@ -39,6 +39,6 @@ describe('GET /api/v1/admin/apps/:appKey/auth-clients', () => {
appAuthClientOne,
]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -83,7 +83,7 @@ describe('PATCH /api/v1/admin/apps/:appKey/config', () => {
})
.expect(422);
expect(response.body.meta.type).toEqual('ModelValidation');
expect(response.body.meta.type).toStrictEqual('ModelValidation');
expect(response.body.errors).toMatchObject({
disabled: ['must be boolean'],
});

View File

@@ -50,8 +50,8 @@ describe('PATCH /api/v1/admin/config', () => {
.send(newConfigValues)
.expect(200);
expect(response.body.data.title).toEqual(newTitle);
expect(response.body.meta.type).toEqual('Config');
expect(response.body.data.title).toStrictEqual(newTitle);
expect(response.body.meta.type).toStrictEqual('Config');
});
it('should return created config for unexisting config', async () => {
@@ -67,8 +67,8 @@ describe('PATCH /api/v1/admin/config', () => {
.send(newConfigValues)
.expect(200);
expect(response.body.data.title).toEqual(newTitle);
expect(response.body.meta.type).toEqual('Config');
expect(response.body.data.title).toStrictEqual(newTitle);
expect(response.body.meta.type).toStrictEqual('Config');
});
it('should return null for deleted config entry', async () => {
@@ -83,6 +83,6 @@ describe('PATCH /api/v1/admin/config', () => {
.expect(200);
expect(response.body.data.title).toBeNull();
expect(response.body.meta.type).toEqual('Config');
expect(response.body.meta.type).toStrictEqual('Config');
});
});

View File

@@ -27,6 +27,6 @@ describe('GET /api/v1/admin/permissions/catalog', () => {
const expectedPayload = await getPermissionsCatalogMock();
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -58,7 +58,7 @@ describe('POST /api/v1/admin/roles', () => {
]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return unprocessable entity response for invalid role data', async () => {

View File

@@ -92,21 +92,4 @@ describe('DELETE /api/v1/admin/roles/:roleId', () => {
},
});
});
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);
});
});

View File

@@ -34,7 +34,7 @@ describe('GET /api/v1/admin/roles/:roleId', () => {
permissionTwo,
]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing role UUID', async () => {

View File

@@ -28,6 +28,6 @@ describe('GET /api/v1/admin/roles', () => {
const expectedPayload = await getRolesMock([roleOne, roleTwo]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -46,6 +46,6 @@ describe('GET /api/v1/admin/saml-auth-providers/:samlAuthProviderId/role-mapping
roleMappingTwo,
]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -30,7 +30,7 @@ describe('GET /api/v1/admin/saml-auth-provider/:samlAuthProviderId', () => {
const expectedPayload = await getSamlAuthProviderMock(samlAuthProvider);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing saml auth provider UUID', async () => {

View File

@@ -34,6 +34,6 @@ describe('GET /api/v1/admin/saml-auth-providers', () => {
samlAuthProviderOne,
]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -30,7 +30,7 @@ describe('GET /api/v1/admin/users/:userId', () => {
.expect(200);
const expectedPayload = getUserMock(anotherUser, anotherUserRole);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing user UUID', async () => {

View File

@@ -40,6 +40,6 @@ describe('GET /api/v1/admin/users', () => {
[anotherUserRole, currentUserRole]
);
expect(response.body).toEqual(expectedResponsePayload);
expect(response.body).toStrictEqual(expectedResponsePayload);
});
});

View File

@@ -61,7 +61,8 @@ describe('PATCH /api/v1/admin/users/:userId', () => {
.send(anotherUserUpdatedData)
.expect(422);
expect(response.body.meta.type).toEqual('ModelValidation');
expect(response.body.meta.type).toStrictEqual('ModelValidation');
expect(response.body.errors).toMatchObject({
email: ['must be string'],
fullName: ['must be string'],

View File

@@ -29,7 +29,7 @@ describe('GET /api/v1/apps/:appKey/actions/:actionKey/substeps', () => {
.expect(200);
const expectedPayload = getActionSubstepsMock(exampleAction.substeps);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for invalid app key', async () => {
@@ -47,6 +47,6 @@ describe('GET /api/v1/apps/:appKey/actions/:actionKey/substeps', () => {
.set('Authorization', token)
.expect(200);
expect(response.body.data).toEqual([]);
expect(response.body.data).toStrictEqual([]);
});
});

View File

@@ -23,7 +23,7 @@ describe('GET /api/v1/apps/:appKey/actions', () => {
.expect(200);
const expectedPayload = getActionsMock(exampleApp.actions);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for invalid app key', async () => {

View File

@@ -23,7 +23,7 @@ describe('GET /api/v1/apps/:appKey', () => {
.expect(200);
const expectedPayload = getAppMock(exampleApp);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for invalid app key', async () => {

View File

@@ -22,7 +22,7 @@ describe('GET /api/v1/apps', () => {
.expect(200);
const expectedPayload = getAppsMock(apps);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return all apps filtered by name', async () => {
@@ -34,7 +34,7 @@ describe('GET /api/v1/apps', () => {
.expect(200);
const expectedPayload = getAppsMock(appsWithNameGit);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return only the apps with triggers', async () => {
@@ -46,7 +46,7 @@ describe('GET /api/v1/apps', () => {
.expect(200);
const expectedPayload = getAppsMock(appsWithTriggers);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return only the apps with actions', async () => {
@@ -58,6 +58,6 @@ describe('GET /api/v1/apps', () => {
.expect(200);
const expectedPayload = getAppsMock(appsWithActions);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -29,7 +29,7 @@ describe('GET /api/v1/apps/:appKey/auth-clients/:appAuthClientId', () => {
.expect(200);
const expectedPayload = getAppAuthClientMock(currentAppAuthClient);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing app auth client ID', async () => {

View File

@@ -37,6 +37,6 @@ describe('GET /api/v1/apps/:appKey/auth-clients', () => {
appAuthClientOne,
]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -23,7 +23,7 @@ describe('GET /api/v1/apps/:appKey/auth', () => {
.expect(200);
const expectedPayload = getAuthMock(exampleApp.auth);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for invalid app key', async () => {

View File

@@ -32,7 +32,7 @@ describe('GET /api/v1/apps/:appKey/config', () => {
.expect(200);
const expectedPayload = getAppConfigMock(appConfig);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing app key', async () => {

View File

@@ -47,7 +47,7 @@ describe('GET /api/v1/apps/:appKey/connections', () => {
currentUserConnectionOne,
]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return the connections data of specified app for another user', async () => {
@@ -82,7 +82,7 @@ describe('GET /api/v1/apps/:appKey/connections', () => {
anotherUserConnectionOne,
]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for invalid connection UUID', async () => {

View File

@@ -62,7 +62,7 @@ describe('GET /api/v1/apps/:appKey/flows', () => {
[triggerStepFlowOne, actionStepFlowOne]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return the flows data of specified app for another user', async () => {
@@ -110,7 +110,7 @@ describe('GET /api/v1/apps/:appKey/flows', () => {
[triggerStepFlowOne, actionStepFlowOne]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for invalid app key', async () => {

View File

@@ -29,7 +29,7 @@ describe('GET /api/v1/apps/:appKey/triggers/:triggerKey/substeps', () => {
.expect(200);
const expectedPayload = getTriggerSubstepsMock(exampleTrigger.substeps);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for invalid app key', async () => {
@@ -47,6 +47,6 @@ describe('GET /api/v1/apps/:appKey/triggers/:triggerKey/substeps', () => {
.set('Authorization', token)
.expect(200);
expect(response.body.data).toEqual([]);
expect(response.body.data).toStrictEqual([]);
});
});

View File

@@ -23,7 +23,7 @@ describe('GET /api/v1/apps/:appKey/triggers', () => {
.expect(200);
const expectedPayload = getTriggersMock(exampleApp.triggers);
expect(response.body).toEqual(expectedPayload);
expect(expectedPayload).toMatchObject(response.body);
});
it('should return not found response for invalid app key', async () => {

View File

@@ -20,6 +20,6 @@ describe('GET /api/v1/automatisch/info', () => {
const expectedPayload = infoMock();
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -18,6 +18,6 @@ describe('GET /api/v1/automatisch/license', () => {
const expectedPayload = licenseMock();
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -21,6 +21,6 @@ describe('GET /api/v1/automatisch/version', () => {
},
};
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -69,7 +69,7 @@ describe('GET /api/v1/connections/:connectionId/flows', () => {
[triggerStepFlowOne, actionStepFlowOne]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return the flows data of specified connection for another user', async () => {
@@ -123,6 +123,6 @@ describe('GET /api/v1/connections/:connectionId/flows', () => {
[triggerStepFlowOne, actionStepFlowOne]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -43,7 +43,7 @@ describe('POST /api/v1/connections/:connectionId/test', () => {
.set('Authorization', token)
.expect(200);
expect(response.body.data.verified).toEqual(false);
expect(response.body.data.verified).toStrictEqual(false);
});
it('should update the connection as not verified for another user', async () => {
@@ -74,7 +74,7 @@ describe('POST /api/v1/connections/:connectionId/test', () => {
.set('Authorization', token)
.expect(200);
expect(response.body.data.verified).toEqual(false);
expect(response.body.data.verified).toStrictEqual(false);
});
it('should return not found response for not existing connection UUID', async () => {

View File

@@ -47,7 +47,7 @@ describe('POST /api/v1/connections/:connectionId/verify', () => {
.set('Authorization', token)
.expect(200);
expect(response.body.data.verified).toEqual(true);
expect(response.body.data.verified).toStrictEqual(true);
});
it('should return not found response for not existing connection UUID', async () => {

View File

@@ -69,7 +69,7 @@ describe('GET /api/v1/executions/:executionId/execution-steps', () => {
[stepOne, stepTwo]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return the execution steps of another user execution', async () => {
@@ -118,7 +118,7 @@ describe('GET /api/v1/executions/:executionId/execution-steps', () => {
[stepOne, stepTwo]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing execution step UUID', async () => {

View File

@@ -57,7 +57,7 @@ describe('GET /api/v1/executions/:executionId', () => {
[stepOne, stepTwo]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return the execution data of another user', async () => {
@@ -99,7 +99,7 @@ describe('GET /api/v1/executions/:executionId', () => {
[stepOne, stepTwo]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing execution UUID', async () => {

View File

@@ -66,7 +66,7 @@ describe('GET /api/v1/executions', () => {
[stepOne, stepTwo]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return the executions of another user', async () => {
@@ -114,6 +114,6 @@ describe('GET /api/v1/executions', () => {
[stepOne, stepTwo]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -41,7 +41,7 @@ describe('GET /api/v1/flows/:flowId', () => {
actionStep,
]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return the flow data of another user', async () => {
@@ -67,7 +67,7 @@ describe('GET /api/v1/flows/:flowId', () => {
actionStep,
]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing flow UUID', async () => {

View File

@@ -63,7 +63,7 @@ describe('GET /api/v1/flows', () => {
]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return the flows data of another user', async () => {
@@ -113,6 +113,6 @@ describe('GET /api/v1/flows', () => {
]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -53,7 +53,7 @@ describe('POST /api/v1/installation/users', () => {
const usersCountAfter = await User.query().resultSize();
expect(usersCountBefore).toEqual(usersCountAfter);
expect(usersCountBefore).toStrictEqual(usersCountAfter);
});
});

View File

@@ -28,6 +28,6 @@ describe('GET /api/v1/payment/paddle-info', () => {
const expectedResponsePayload = await getPaddleInfoMock();
expect(response.body).toEqual(expectedResponsePayload);
expect(response.body).toStrictEqual(expectedResponsePayload);
});
});

View File

@@ -24,6 +24,6 @@ describe('GET /api/v1/payment/plans', () => {
const expectedResponsePayload = await getPaymentPlansMock();
expect(response.body).toEqual(expectedResponsePayload);
expect(response.body).toStrictEqual(expectedResponsePayload);
});
});

View File

@@ -25,6 +25,6 @@ describe('GET /api/v1/saml-auth-providers', () => {
samlAuthProviderOne,
]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -78,7 +78,7 @@ describe('POST /api/v1/steps/:stepId/dynamic-data', () => {
})
.expect(200);
expect(response.body.data).toEqual(repositories);
expect(response.body.data).toStrictEqual(repositories);
});
it('of the another users step', async () => {
@@ -117,7 +117,7 @@ describe('POST /api/v1/steps/:stepId/dynamic-data', () => {
})
.expect(200);
expect(response.body.data).toEqual(repositories);
expect(response.body.data).toStrictEqual(repositories);
});
});
@@ -171,7 +171,7 @@ describe('POST /api/v1/steps/:stepId/dynamic-data', () => {
})
.expect(422);
expect(response.body.errors).toEqual(errors);
expect(response.body.errors).toStrictEqual(errors);
});
});

View File

@@ -56,7 +56,7 @@ describe('POST /api/v1/steps/:stepId/dynamic-fields', () => {
const expectedPayload = await createDynamicFieldsMock();
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return dynamically created fields of the another users step', async () => {
@@ -97,7 +97,7 @@ describe('POST /api/v1/steps/:stepId/dynamic-fields', () => {
const expectedPayload = await createDynamicFieldsMock();
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing step UUID', async () => {

View File

@@ -43,7 +43,7 @@ describe('GET /api/v1/steps/:stepId/connection', () => {
const expectedPayload = await getConnectionMock(currentUserConnection);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return the current user connection data of specified step', async () => {
@@ -70,7 +70,7 @@ describe('GET /api/v1/steps/:stepId/connection', () => {
const expectedPayload = await getConnectionMock(anotherUserConnection);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing step without connection', async () => {

View File

@@ -70,7 +70,7 @@ describe('GET /api/v1/steps/:stepId/previous-steps', () => {
[executionStepOne, executionStepTwo]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return the previous steps of the specified step of another user', async () => {
@@ -124,7 +124,7 @@ describe('GET /api/v1/steps/:stepId/previous-steps', () => {
[executionStepOne, executionStepTwo]
);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response for not existing step UUID', async () => {

View File

@@ -79,7 +79,7 @@ describe('GET /api/v1/users/:userId/apps', () => {
.expect(200);
const expectedPayload = getAppsMock();
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return all apps of the another user', async () => {
@@ -143,7 +143,7 @@ describe('GET /api/v1/users/:userId/apps', () => {
.expect(200);
const expectedPayload = getAppsMock();
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return specified app of the current user', async () => {
@@ -204,7 +204,7 @@ describe('GET /api/v1/users/:userId/apps', () => {
.set('Authorization', token)
.expect(200);
expect(response.body.data.length).toEqual(1);
expect(response.body.data[0].key).toEqual('deepl');
expect(response.body.data.length).toStrictEqual(1);
expect(response.body.data[0].key).toStrictEqual('deepl');
});
});

View File

@@ -39,6 +39,6 @@ describe('GET /api/v1/users/me', () => {
permissionTwo,
]);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -29,6 +29,6 @@ describe('GET /api/v1/user/invoices', () => {
const expectedPayload = await getInvoicesMock(invoices);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
});

View File

@@ -36,7 +36,7 @@ describe('GET /api/v1/users/:userId/plan-and-usage', () => {
},
};
expect(response.body.data).toEqual(expectedResponseData);
expect(response.body.data).toStrictEqual(expectedResponseData);
});
it('should return current plan and usage data', async () => {
@@ -63,6 +63,6 @@ describe('GET /api/v1/users/:userId/plan-and-usage', () => {
},
};
expect(response.body.data).toEqual(expectedResponseData);
expect(response.body.data).toStrictEqual(expectedResponseData);
});
});

View File

@@ -33,7 +33,7 @@ describe('GET /api/v1/users/:userId/subscription', () => {
const expectedPayload = getSubscriptionMock(subscription);
expect(response.body).toEqual(expectedPayload);
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not found response if there is no current subscription', async () => {

View File

@@ -32,7 +32,7 @@ describe('GET /api/v1/users/:userId/trial', () => {
.expect(200);
const expectedResponsePayload = await getUserTrialMock(user);
expect(response.body).toEqual(expectedResponsePayload);
expect(response.body).toStrictEqual(expectedResponsePayload);
});
});
});

View File

@@ -43,7 +43,7 @@ describe('PATCH /api/v1/users/:userId/password', () => {
.send(userData)
.expect(422);
expect(response.body.meta.type).toEqual('ValidationError');
expect(response.body.meta.type).toStrictEqual('ValidationError');
expect(response.body.errors).toMatchObject({
currentPassword: ['is incorrect.'],
});

View File

@@ -47,7 +47,8 @@ describe('PATCH /api/v1/users/:userId', () => {
.send(userData)
.expect(422);
expect(response.body.meta.type).toEqual('ModelValidation');
expect(response.body.meta.type).toStrictEqual('ModelValidation');
expect(response.body.errors).toMatchObject({
email: ['must be string'],
fullName: ['must be string'],

View File

@@ -0,0 +1,33 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
exports[`Role model > jsonSchema should have correct validations 1`] = `
{
"properties": {
"createdAt": {
"type": "string",
},
"description": {
"maxLength": 255,
"type": [
"string",
"null",
],
},
"id": {
"format": "uuid",
"type": "string",
},
"name": {
"minLength": 1,
"type": "string",
},
"updatedAt": {
"type": "string",
},
},
"required": [
"name",
],
"type": "object",
}
`;

View File

@@ -69,7 +69,9 @@ describe('AppAuthClient model', () => {
);
expect(formattedAuthDefaults).toStrictEqual(expectedDecryptedValue);
expect(appAuthClient.authDefaults).not.toEqual(formattedAuthDefaults);
expect(appAuthClient.authDefaults).not.toStrictEqual(
formattedAuthDefaults
);
});
it('should encrypt formattedAuthDefaults and remove formattedAuthDefaults', async () => {
@@ -124,7 +126,9 @@ describe('AppAuthClient model', () => {
expect(appAuthClient.formattedAuthDefaults).toStrictEqual(
formattedAuthDefaults
);
expect(appAuthClient.authDefaults).not.toEqual(formattedAuthDefaults);
expect(appAuthClient.authDefaults).not.toStrictEqual(
formattedAuthDefaults
);
});
});

View File

@@ -193,7 +193,7 @@ describe('Connection model', () => {
);
expect(formattedData).toStrictEqual(expectedDecryptedValue);
expect(connection.data).not.toEqual(formattedData);
expect(connection.data).not.toStrictEqual(formattedData);
});
it('should encrypt formattedData and remove formattedData', async () => {
@@ -243,7 +243,7 @@ describe('Connection model', () => {
connection.decryptData();
expect(connection.formattedData).toStrictEqual(formattedData);
expect(connection.data).not.toEqual(formattedData);
expect(connection.data).not.toStrictEqual(formattedData);
});
});

View File

@@ -52,16 +52,19 @@ class Role extends Base {
return await this.query().findOne({ name: 'Admin' });
}
async updateWithPermissions(data) {
if (this.isAdmin) {
async preventAlteringAdmin() {
const currentRole = await Role.query().findById(this.id);
if (currentRole.isAdmin) {
throw new NotAuthorizedError('The admin role cannot be altered!');
}
}
const { name, description, permissions } = data;
return await Role.transaction(async (trx) => {
await this.$relatedQuery('permissions', trx).delete();
async deletePermissions() {
return await this.$relatedQuery('permissions').delete();
}
async createPermissions(permissions) {
if (permissions?.length) {
const validPermissions = Permission.filter(permissions).map(
(permission) => ({
@@ -72,37 +75,41 @@ class Role extends Base {
await Permission.query().insert(validPermissions);
}
}
await this.$query(trx).patch({
async updatePermissions(permissions) {
await this.deletePermissions();
await this.createPermissions(permissions);
}
async updateWithPermissions(data) {
const { name, description, permissions } = data;
await this.updatePermissions(permissions);
await this.$query().patchAndFetch({
id: this.id,
name,
description,
});
return await this.$query(trx)
return await this.$query()
.leftJoinRelated({
permissions: true,
})
.withGraphFetched({
permissions: true,
});
});
}
async deleteWithPermissions() {
return await Role.transaction(async (trx) => {
await this.$relatedQuery('permissions', trx).delete();
await this.deletePermissions();
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!');
return await this.$query().delete();
}
async assertNoRoleUserExists() {
const userCount = await this.$relatedQuery('users').limit(1).resultSize();
const hasUsers = userCount > 0;
@@ -118,7 +125,9 @@ class Role extends Base {
type: 'ValidationError',
});
}
}
async assertNoConfigurationUsage() {
const samlAuthProviderUsingDefaultRole = await SamlAuthProvider.query()
.where({
default_role_id: this.id,
@@ -140,6 +149,26 @@ class Role extends Base {
});
}
}
async assertRoleIsNotUsed() {
await this.assertNoRoleUserExists();
await this.assertNoConfigurationUsage();
}
async $beforeUpdate(opt, queryContext) {
await super.$beforeUpdate(opt, queryContext);
await this.preventAlteringAdmin();
}
async $beforeDelete(queryContext) {
await super.$beforeDelete(queryContext);
await this.preventAlteringAdmin();
await this.assertRoleIsNotUsed();
}
}
export default Role;

View File

@@ -0,0 +1,287 @@
import { describe, it, expect, vi } from 'vitest';
import Role from './role';
import Base from './base.js';
import Permission from './permission.js';
import User from './user.js';
import { createRole } from '../../test/factories/role.js';
import { createPermission } from '../../test/factories/permission.js';
import { createUser } from '../../test/factories/user.js';
import { createSamlAuthProvider } from '../../test/factories/saml-auth-provider.ee.js';
describe('Role model', () => {
it('tableName should return correct name', () => {
expect(Role.tableName).toBe('roles');
});
it('jsonSchema should have correct validations', () => {
expect(Role.jsonSchema).toMatchSnapshot();
});
it('relationMappingsshould return correct associations', () => {
const relationMappings = Role.relationMappings();
const expectedRelations = {
users: {
relation: Base.HasManyRelation,
modelClass: User,
join: {
from: 'roles.id',
to: 'users.role_id',
},
},
permissions: {
relation: Base.HasManyRelation,
modelClass: Permission,
join: {
from: 'roles.id',
to: 'permissions.role_id',
},
},
};
expect(relationMappings).toStrictEqual(expectedRelations);
});
it('virtualAttributes should return correct attributes', () => {
expect(Role.virtualAttributes).toStrictEqual(['isAdmin']);
});
describe('isAdmin', () => {
it('should return true for admin named role', () => {
const role = new Role();
role.name = 'Admin';
expect(role.isAdmin).toBe(true);
});
it('should return false for not admin named roles', () => {
const role = new Role();
role.name = 'User';
expect(role.isAdmin).toBe(false);
});
});
it('findAdmin should return admin role', async () => {
const createdAdminRole = await createRole({ name: 'Admin' });
const adminRole = await Role.findAdmin();
expect(createdAdminRole).toStrictEqual(adminRole);
});
describe('preventAlteringAdmin', () => {
it('preventAlteringAdmin should throw an error when altering admin role', async () => {
const role = await createRole({ name: 'Admin' });
await expect(() => role.preventAlteringAdmin()).rejects.toThrowError(
'The admin role cannot be altered!'
);
});
it('preventAlteringAdmin should not throw an error when altering non-admin roles', async () => {
const role = await createRole({ name: 'User' });
expect(await role.preventAlteringAdmin()).toBe(undefined);
});
});
it("deletePermissions should delete role's permissions", async () => {
const role = await createRole({ name: 'User' });
await createPermission({ roleId: role.id });
await role.deletePermissions();
expect(await role.$relatedQuery('permissions')).toStrictEqual([]);
});
describe('createPermissions', () => {
it('should create permissions', async () => {
const role = await createRole({ name: 'User' });
await role.createPermissions([
{ action: 'read', subject: 'Flow', conditions: [] },
]);
expect(await role.$relatedQuery('permissions')).toMatchObject([
{
action: 'read',
subject: 'Flow',
conditions: [],
},
]);
});
it('should call Permission.filter', async () => {
const role = await createRole({ name: 'User' });
const permissions = [{ action: 'read', subject: 'Flow', conditions: [] }];
const permissionFilterSpy = vi
.spyOn(Permission, 'filter')
.mockReturnValue(permissions);
await role.createPermissions(permissions);
expect(permissionFilterSpy).toHaveBeenCalledWith(permissions);
});
});
it('updatePermissions should delete existing permissions and create new permissions', async () => {
const permissionsData = [
{ action: 'read', subject: 'Flow', conditions: [] },
];
const deletePermissionsSpy = vi
.spyOn(Role.prototype, 'deletePermissions')
.mockResolvedValueOnce();
const createPermissionsSpy = vi
.spyOn(Role.prototype, 'createPermissions')
.mockResolvedValueOnce();
const role = await createRole({ name: 'User' });
await role.updatePermissions(permissionsData);
expect(deletePermissionsSpy.mock.invocationCallOrder[0]).toBeLessThan(
createPermissionsSpy.mock.invocationCallOrder[0]
);
expect(deletePermissionsSpy).toHaveBeenNthCalledWith(1);
expect(createPermissionsSpy).toHaveBeenNthCalledWith(1, permissionsData);
});
describe('updateWithPermissions', () => {
it('should update role along with given permissions', async () => {
const role = await createRole({ name: 'User' });
await createPermission({
roleId: role.id,
subject: 'Flow',
action: 'read',
conditions: [],
});
const newRoleData = {
name: 'Updated user',
description: 'Updated description',
permissions: [
{
action: 'update',
subject: 'Flow',
conditions: [],
},
],
};
await role.updateWithPermissions(newRoleData);
const roleWithPermissions = await role
.$query()
.leftJoinRelated({ permissions: true })
.withGraphFetched({ permissions: true });
expect(roleWithPermissions).toMatchObject(newRoleData);
});
});
describe('deleteWithPermissions', () => {
it('should delete role along with given permissions', async () => {
const role = await createRole({ name: 'User' });
await createPermission({
roleId: role.id,
subject: 'Flow',
action: 'read',
conditions: [],
});
await role.deleteWithPermissions();
const refetchedRole = await role.$query();
const rolePermissions = await Permission.query().where({
roleId: role.id,
});
expect(refetchedRole).toBe(undefined);
expect(rolePermissions).toStrictEqual([]);
});
});
describe('assertNoRoleUserExists', () => {
it('should reject with an error when the role has users', async () => {
const role = await createRole({ name: 'User' });
await createUser({ roleId: role.id });
await expect(() => role.assertNoRoleUserExists()).rejects.toThrowError(
`All users must be migrated away from the "User" role.`
);
});
it('should resolve when the role does not have any users', async () => {
const role = await createRole();
expect(await role.assertNoRoleUserExists()).toBe(undefined);
});
});
describe('assertNoConfigurationUsage', () => {
it('should reject with an error when the role is used in configuration', async () => {
const role = await createRole();
await createSamlAuthProvider({ defaultRoleId: role.id });
await expect(() =>
role.assertNoConfigurationUsage()
).rejects.toThrowError(
'samlAuthProvider: You need to change the default role in the SAML configuration before deleting this role.'
);
});
it('should resolve when the role does not have any users', async () => {
const role = await createRole();
expect(await role.assertNoConfigurationUsage()).toBe(undefined);
});
});
it('assertRoleIsNotUsed should call assertNoRoleUserExists and assertNoConfigurationUsage', async () => {
const role = new Role();
const assertNoRoleUserExistsSpy = vi
.spyOn(role, 'assertNoRoleUserExists')
.mockResolvedValue();
const assertNoConfigurationUsageSpy = vi
.spyOn(role, 'assertNoConfigurationUsage')
.mockResolvedValue();
await role.assertRoleIsNotUsed();
expect(assertNoRoleUserExistsSpy).toHaveBeenCalledOnce();
expect(assertNoConfigurationUsageSpy).toHaveBeenCalledOnce();
});
describe('$beforeDelete', () => {
it('should call preventAlteringAdmin', async () => {
const role = await createRole({ name: 'User' });
const preventAlteringAdminSpy = vi
.spyOn(role, 'preventAlteringAdmin')
.mockResolvedValue();
await role.$query().delete();
expect(preventAlteringAdminSpy).toHaveBeenCalledOnce();
});
it('should call assertRoleIsNotUsed', async () => {
const role = await createRole({ name: 'User' });
const assertRoleIsNotUsedSpy = vi
.spyOn(role, 'assertRoleIsNotUsed')
.mockResolvedValue();
await role.$query().delete();
expect(assertRoleIsNotUsedSpy).toHaveBeenCalledOnce();
});
});
});

View File

@@ -16,6 +16,6 @@ describe('actionSerializer', () => {
type: action.type,
};
expect(actionSerializer(action)).toEqual(expectedPayload);
expect(expectedPayload).toMatchObject(actionSerializer(action));
});
});

View File

@@ -25,7 +25,7 @@ describe('adminSamlAuthProviderSerializer', () => {
defaultRoleId: samlAuthProvider.defaultRoleId,
};
expect(adminSamlAuthProviderSerializer(samlAuthProvider)).toEqual(
expect(adminSamlAuthProviderSerializer(samlAuthProvider)).toStrictEqual(
expectedPayload
);
});

View File

@@ -12,7 +12,7 @@ describe('adminUserSerializer', () => {
it('should return user data with accept invitation url', async () => {
const serializedUser = adminUserSerializer(user);
expect(serializedUser.acceptInvitationUrl).toEqual(
expect(serializedUser.acceptInvitationUrl).toStrictEqual(
user.acceptInvitationUrl
);
});

View File

@@ -17,6 +17,8 @@ describe('appAuthClient serializer', () => {
active: appAuthClient.active,
};
expect(appAuthClientSerializer(appAuthClient)).toEqual(expectedPayload);
expect(appAuthClientSerializer(appAuthClient)).toStrictEqual(
expectedPayload
);
});
});

View File

@@ -1,6 +1,5 @@
const appConfigSerializer = (appConfig) => {
return {
id: appConfig.id,
key: appConfig.key,
customConnectionAllowed: appConfig.customConnectionAllowed,
shared: appConfig.shared,

View File

@@ -11,7 +11,6 @@ describe('appConfig serializer', () => {
it('should return app config data', async () => {
const expectedPayload = {
id: appConfig.id,
key: appConfig.key,
customConnectionAllowed: appConfig.customConnectionAllowed,
shared: appConfig.shared,
@@ -21,6 +20,6 @@ describe('appConfig serializer', () => {
updatedAt: appConfig.updatedAt.getTime(),
};
expect(appConfigSerializer(appConfig)).toEqual(expectedPayload);
expect(appConfigSerializer(appConfig)).toStrictEqual(expectedPayload);
});
});

View File

@@ -15,6 +15,6 @@ describe('appSerializer', () => {
primaryColor: app.primaryColor,
};
expect(appSerializer(app)).toEqual(expectedPayload);
expect(appSerializer(app)).toStrictEqual(expectedPayload);
});
});

View File

@@ -12,6 +12,6 @@ describe('authSerializer', () => {
reconnectionSteps: auth.reconnectionSteps,
};
expect(authSerializer(auth)).toEqual(expectedPayload);
expect(authSerializer(auth)).toStrictEqual(expectedPayload);
});
});

View File

@@ -27,6 +27,6 @@ describe('configSerializer', () => {
updatedAt: config.updatedAt.getTime(),
};
expect(configSerializer(config)).toEqual(expectedPayload);
expect(configSerializer(config)).toStrictEqual(expectedPayload);
});
});

View File

@@ -23,6 +23,6 @@ describe('connectionSerializer', () => {
updatedAt: connection.updatedAt.getTime(),
};
expect(connectionSerializer(connection)).toEqual(expectedPayload);
expect(connectionSerializer(connection)).toStrictEqual(expectedPayload);
});
});

View File

@@ -26,7 +26,9 @@ describe('executionStepSerializer', () => {
updatedAt: executionStep.updatedAt.getTime(),
};
expect(executionStepSerializer(executionStep)).toEqual(expectedPayload);
expect(executionStepSerializer(executionStep)).toStrictEqual(
expectedPayload
);
});
it('should return the execution step data with the step', async () => {

View File

@@ -23,7 +23,7 @@ describe('executionSerializer', () => {
updatedAt: execution.updatedAt.getTime(),
};
expect(executionSerializer(execution)).toEqual(expectedPayload);
expect(executionSerializer(execution)).toStrictEqual(expectedPayload);
});
it('should return the execution data with status', async () => {
@@ -37,7 +37,7 @@ describe('executionSerializer', () => {
status: 'success',
};
expect(executionSerializer(execution)).toEqual(expectedPayload);
expect(executionSerializer(execution)).toStrictEqual(expectedPayload);
});
it('should return the execution data with the flow', async () => {

View File

@@ -31,7 +31,7 @@ describe('flowSerializer', () => {
updatedAt: flow.updatedAt.getTime(),
};
expect(flowSerializer(flow)).toEqual(expectedPayload);
expect(flowSerializer(flow)).toStrictEqual(expectedPayload);
});
it('should return flow data with the steps', async () => {

View File

@@ -20,6 +20,6 @@ describe('permissionSerializer', () => {
updatedAt: permission.updatedAt.getTime(),
};
expect(permissionSerializer(permission)).toEqual(expectedPayload);
expect(permissionSerializer(permission)).toStrictEqual(expectedPayload);
});
});

View File

@@ -34,7 +34,7 @@ describe('roleSerializer', () => {
isAdmin: role.isAdmin,
};
expect(roleSerializer(role)).toEqual(expectedPayload);
expect(roleSerializer(role)).toStrictEqual(expectedPayload);
});
it('should return role data with the permissions', async () => {

View File

@@ -17,7 +17,7 @@ describe('samlAuthProviderSerializer', () => {
issuer: samlAuthProvider.issuer,
};
expect(samlAuthProviderSerializer(samlAuthProvider)).toEqual(
expect(samlAuthProviderSerializer(samlAuthProvider)).toStrictEqual(
expectedPayload
);
});

View File

@@ -24,7 +24,7 @@ describe('stepSerializer', () => {
parameters: step.parameters,
};
expect(stepSerializer(step)).toEqual(expectedPayload);
expect(stepSerializer(step)).toStrictEqual(expectedPayload);
});
it('should return step data with the last execution step', async () => {

View File

@@ -30,6 +30,6 @@ describe('subscriptionSerializer', () => {
cancellationEffectiveDate: subscription.cancellationEffectiveDate,
};
expect(subscriptionSerializer(subscription)).toEqual(expectedPayload);
expect(subscriptionSerializer(subscription)).toStrictEqual(expectedPayload);
});
});

View File

@@ -16,6 +16,6 @@ describe('triggerSerializer', () => {
type: trigger.type,
};
expect(triggerSerializer(trigger)).toEqual(expectedPayload);
expect(triggerSerializer(trigger)).toStrictEqual(expectedPayload);
});
});

View File

@@ -39,7 +39,7 @@ describe('userSerializer', () => {
updatedAt: user.updatedAt.getTime(),
};
expect(userSerializer(user)).toEqual(expectedPayload);
expect(userSerializer(user)).toStrictEqual(expectedPayload);
});
it('should return user data with the role', async () => {

View File

@@ -3,7 +3,6 @@ const getAppAuthClientMock = (appAuthClient) => {
data: {
name: appAuthClient.name,
id: appAuthClient.id,
appConfigId: appAuthClient.appConfigId,
active: appAuthClient.active,
},
meta: {

View File

@@ -10,7 +10,6 @@ const getUserMock = (currentUser, role) => {
description: null,
id: role.id,
isAdmin: role.isAdmin,
key: role.key,
name: role.name,
updatedAt: role.updatedAt.getTime(),
},

View File

@@ -13,7 +13,6 @@ const getUsersMock = async (users, roles) => {
description: role.description,
id: role.id,
isAdmin: role.isAdmin,
key: role.key,
name: role.name,
updatedAt: role.updatedAt.getTime(),
}

View File

@@ -3,7 +3,6 @@ const getAppAuthClientMock = (appAuthClient) => {
data: {
name: appAuthClient.name,
id: appAuthClient.id,
appConfigId: appAuthClient.appConfigId,
active: appAuthClient.active,
},
meta: {

View File

@@ -1,7 +1,6 @@
const getAppConfigMock = (appConfig) => {
return {
data: {
id: appConfig.id,
key: appConfig.key,
customConnectionAllowed: appConfig.customConnectionAllowed,
shared: appConfig.shared,

View File

@@ -19,7 +19,6 @@ const getCurrentUserMock = (currentUser, role, permissions) => {
description: null,
id: role.id,
isAdmin: role.isAdmin,
key: role.key,
name: role.name,
updatedAt: role.updatedAt.getTime(),
},