josh/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Implement isOwner flag only for get flow API endpoint

Browse Source
This commit is contained in:
Ali BARIN
2025-04-23 12:35:32 +00:00
parent e95ffb44e4
commit f32303154a
15 changed files with 54 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/backend/src/controllers/internal/api/v1/apps/get-flows.js
View File

@@ -1,6 +1,5 @@
import { renderObject } from '../../../../../helpers/renderer.js';
import App from '../../../../../models/app.js';
import Flow from '../../../../../models/flow.js';
import paginateRest from '../../../../../helpers/pagination.js';
export default async (request, response) => {
@@ -15,10 +14,6 @@ export default async (request, response) => {
.withGraphFetched({
steps: true,
})
.select('flows.*')
.select(
Flow.raw('flows.user_id = ? as "isOwner"', [request.currentUser.id])
)
.where('steps.app_key', app.key)
.orderBy('active', 'desc')
.orderBy('updated_at', 'desc');

8
packages/backend/src/controllers/internal/api/v1/apps/get-flows.test.js
View File

@@ -6,7 +6,7 @@ import { createUser } from '../../../../../../test/factories/user.js';
import { createFlow } from '../../../../../../test/factories/flow.js';
import { createStep } from '../../../../../../test/factories/step.js';
import { createPermission } from '../../../../../../test/factories/permission.js';
import getFlowsMock from '../../../../../../test/mocks/rest/internal/api/v1/apps/get-flows.js';
import getFlowsMock from '../../../../../../test/mocks/rest/internal/api/v1/flows/get-flows.js';
describe('GET /internal/api/v1/apps/:appKey/flows', () => {
let currentUser, currentUserRole, token;
@@ -59,8 +59,7 @@ describe('GET /internal/api/v1/apps/:appKey/flows', () => {
const expectedPayload = await getFlowsMock(
[currentUserFlowOne],
[triggerStepFlowOne, actionStepFlowOne],
currentUser.id
[triggerStepFlowOne, actionStepFlowOne]
);
expect(response.body).toStrictEqual(expectedPayload);
@@ -108,8 +107,7 @@ describe('GET /internal/api/v1/apps/:appKey/flows', () => {
const expectedPayload = await getFlowsMock(
[anotherUserFlowOne],
[triggerStepFlowOne, actionStepFlowOne],
currentUser.id
[triggerStepFlowOne, actionStepFlowOne]
);
expect(response.body).toStrictEqual(expectedPayload);

5
packages/backend/src/controllers/internal/api/v1/connections/get-flows.js
View File

@@ -1,6 +1,5 @@
import { renderObject } from '../../../../../helpers/renderer.js';
import paginateRest from '../../../../../helpers/pagination.js';
import Flow from '../../../../../models/flow.js';
export default async (request, response) => {
const flowsQuery = request.currentUser.authorizedFlows
@@ -12,10 +11,6 @@ export default async (request, response) => {
.withGraphFetched({
steps: true,
})
.select('flows.*')
.select(
Flow.raw('flows.user_id = ? as "isOwner"', [request.currentUser.id])
)
.where('steps.connection_id', request.params.connectionId)
.orderBy('active', 'desc')
.orderBy('updated_at', 'desc');

8
packages/backend/src/controllers/internal/api/v1/connections/get-flows.test.js
View File

@@ -7,7 +7,7 @@ import { createConnection } from '../../../../../../test/factories/connection.js
import { createFlow } from '../../../../../../test/factories/flow.js';
import { createStep } from '../../../../../../test/factories/step.js';
import { createPermission } from '../../../../../../test/factories/permission.js';
import getFlowsMock from '../../../../../../test/mocks/rest/internal/api/v1/connections/get-flows.js';
import getFlowsMock from '../../../../../../test/mocks/rest/internal/api/v1/flows/get-flows.js';
describe('GET /internal/api/v1/connections/:connectionId/flows', () => {
let currentUser, currentUserRole, token;
@@ -66,8 +66,7 @@ describe('GET /internal/api/v1/connections/:connectionId/flows', () => {
const expectedPayload = await getFlowsMock(
[currentUserFlowOne],
[triggerStepFlowOne, actionStepFlowOne],
currentUser.id
[triggerStepFlowOne, actionStepFlowOne]
);
expect(response.body).toStrictEqual(expectedPayload);
@@ -121,8 +120,7 @@ describe('GET /internal/api/v1/connections/:connectionId/flows', () => {
const expectedPayload = await getFlowsMock(
[anotherUserFlowOne],
[triggerStepFlowOne, actionStepFlowOne],
currentUser.id
[triggerStepFlowOne, actionStepFlowOne]
);
expect(response.body).toStrictEqual(expectedPayload);

4
packages/backend/src/controllers/internal/api/v1/flows/get-flow.js
View File

@@ -1,9 +1,13 @@
import Flow from '../../../../../models/flow.js';
import { renderObject } from '../../../../../helpers/renderer.js';
export default async (request, response) => {
const flow = await request.currentUser.authorizedFlows
.clone()
.withGraphJoined({ steps: true })
.select(
Flow.raw('flows.user_id = ? as "isOwner"', [request.currentUser.id])
)
.orderBy('steps.position', 'asc')
.findOne({ 'flows.id': request.params.flowId })
.throwIfNotFound();

18
packages/backend/src/controllers/internal/api/v1/flows/get-flow.test.js
View File

@@ -36,10 +36,11 @@ describe('GET /internal/api/v1/flows/:flowId', () => {
.set('Authorization', token)
.expect(200);
const expectedPayload = await getFlowMock(currentUserflow, [
triggerStep,
actionStep,
]);
const expectedPayload = await getFlowMock(
currentUserflow,
[triggerStep, actionStep],
currentUser.id
);
expect(response.body).toStrictEqual(expectedPayload);
});
@@ -62,10 +63,11 @@ describe('GET /internal/api/v1/flows/:flowId', () => {
.set('Authorization', token)
.expect(200);
const expectedPayload = await getFlowMock(anotherUserFlow, [
triggerStep,
actionStep,
]);
const expectedPayload = await getFlowMock(
anotherUserFlow,
[triggerStep, actionStep],
currentUser.id
);
expect(response.body).toStrictEqual(expectedPayload);
});

15
packages/backend/src/controllers/internal/api/v1/flows/get-flows.test.js
View File

@@ -61,8 +61,7 @@ describe('GET /internal/api/v1/flows', () => {
actionStepFlowOne,
triggerStepFlowTwo,
actionStepFlowTwo,
],
currentUser.id
]
);
expect(response.body).toStrictEqual(expectedPayload);
@@ -112,8 +111,7 @@ describe('GET /internal/api/v1/flows', () => {
actionStepFlowOne,
triggerStepFlowTwo,
actionStepFlowTwo,
],
currentUser.id
]
);
expect(response.body).toStrictEqual(expectedPayload);
@@ -186,8 +184,7 @@ describe('GET /internal/api/v1/flows', () => {
actionStepFlowTwo,
triggerStepFlowThree,
actionStepFlowThree,
],
currentUser.id
]
);
expect(response.body).toStrictEqual(expectedPayload);
@@ -273,8 +270,7 @@ describe('GET /internal/api/v1/flows', () => {
actionStepFlowThree,
triggerStepFlowFour,
actionStepFlowFour,
],
currentUser.id
]
);
expect(response.body).toStrictEqual(expectedPayload);
@@ -360,8 +356,7 @@ describe('GET /internal/api/v1/flows', () => {
actionStepFlowOne,
triggerStepFlowTwo,
actionStepFlowTwo,
],
currentUser.id
]
);
expect(response.body).toStrictEqual(expectedPayload);

6
packages/backend/src/controllers/internal/api/v1/flows/update-flow.test.js
View File

@@ -6,7 +6,7 @@ import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by
import { createUser } from '../../../../../../test/factories/user.js';
import { createFlow } from '../../../../../../test/factories/flow.js';
import { createPermission } from '../../../../../../test/factories/permission.js';
import getFlowMock from '../../../../../../test/mocks/rest/internal/api/v1/flows/get-flow.js';
import updateFlowMock from '../../../../../../test/mocks/rest/internal/api/v1/flows/update-flow.js';
describe('PATCH /internal/api/v1/flows/:flowId', () => {
let currentUser, currentUserRole, token;
@@ -45,7 +45,7 @@ describe('PATCH /internal/api/v1/flows/:flowId', () => {
const refetchedCurrentUserFlow = await currentUserFlow.$query();
const expectedPayload = await getFlowMock({
const expectedPayload = await updateFlowMock({
...refetchedCurrentUserFlow,
name: 'Updated flow',
});
@@ -81,7 +81,7 @@ describe('PATCH /internal/api/v1/flows/:flowId', () => {
const refetchedAnotherUserFlow = await anotherUserFlow.$query();
const expectedPayload = await getFlowMock({
const expectedPayload = await updateFlowMock({
...refetchedAnotherUserFlow,
name: 'Updated flow',
});

2
packages/backend/src/models/user.js
View File

@@ -537,8 +537,6 @@ class User extends Base {
.withGraphFetched({
steps: true,
})
.select('flows.*')
.select(Flow.raw('flows.user_id = ? as "isOwner"', [this.id]))
.where((builder) => {
if (name) {
builder.where('flows.name', 'ilike', `%${name}%`);

17
packages/backend/src/models/user.test.js
View File

@@ -1333,23 +1333,6 @@ describe('User model', () => {
);
});
it('should return isOwner false if the flow is owned by another user', async () => {
const anotherUser = await createUser();
await createFlow({
userId: anotherUser.id,
folderId: folder.id,
active: true,
name: 'Another User Flow One',
});
const flows = await currentUser.getFlows({ onlyOwnedFlows: false }, [
folder.id,
]);
expect(flows[0].isOwner).toBe(false);
});
it('should return specified flows with all filters together', async () => {
const flows = await currentUser.getFlows(
{