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

feat(AppConfig): iterate how apps are managed

Browse Source 
- auth clients are always shared, cannot be disabled
- custom connections are enabled by default, can be disabled
- any existing connections can be reconnected regardless of its AppConfig or AppAuthClient states
This commit is contained in:
Ali BARIN
2024-12-09 17:46:51 +00:00
parent 17614d6d47
commit 2a77763c51
48 changed files with 192 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/backend/src/controllers/api/v1/admin/apps/create-config.ee.js
View File

@@ -10,12 +10,11 @@ export default async (request, response) => {
};
const appConfigParams = (request) => {
const { customConnectionAllowed, shared, disabled } = request.body;
const { useOnlyPredefinedAuthClients, disabled } = request.body;
return {
key: request.params.appKey,
customConnectionAllowed,
shared,
useOnlyPredefinedAuthClients,
disabled,
};
};

7
packages/backend/src/controllers/api/v1/admin/apps/create-config.ee.test.js
View File

@@ -23,8 +23,7 @@ describe('POST /api/v1/admin/apps/:appKey/config', () => {
it('should return created app config', async () => {
const appConfig = {
customConnectionAllowed: true,
shared: true,
useOnlyPredefinedAuthClients: false,
disabled: false,
};
@@ -38,14 +37,14 @@ describe('POST /api/v1/admin/apps/:appKey/config', () => {
...appConfig,
key: 'gitlab',
});
expect(response.body).toMatchObject(expectedPayload);
});
it('should return HTTP 422 for already existing app config', async () => {
const appConfig = {
key: 'gitlab',
customConnectionAllowed: true,
shared: true,
useOnlyPredefinedAuthClients: false,
disabled: false,
};

5
packages/backend/src/controllers/api/v1/admin/apps/update-config.ee.js
View File

@@ -17,11 +17,10 @@ export default async (request, response) => {
};
const appConfigParams = (request) => {
const { customConnectionAllowed, shared, disabled } = request.body;
const { useOnlyPredefinedAuthClients, disabled } = request.body;
return {
customConnectionAllowed,
shared,
useOnlyPredefinedAuthClients,
disabled,
};
};

12
packages/backend/src/controllers/api/v1/admin/apps/update-config.ee.test.js
View File

@@ -24,17 +24,15 @@ describe('PATCH /api/v1/admin/apps/:appKey/config', () => {
it('should return updated app config', async () => {
const appConfig = {
key: 'gitlab',
customConnectionAllowed: true,
shared: true,
useOnlyPredefinedAuthClients: true,
disabled: false,
};
await createAppConfig(appConfig);
const newAppConfigValues = {
shared: false,
disabled: true,
customConnectionAllowed: false,
useOnlyPredefinedAuthClients: false,
};
const response = await request(app)
@@ -53,9 +51,8 @@ describe('PATCH /api/v1/admin/apps/:appKey/config', () => {
it('should return not found response for unexisting app config', async () => {
const appConfig = {
shared: false,
disabled: true,
customConnectionAllowed: false,
useOnlyPredefinedAuthClients: false,
};
await request(app)
@@ -68,8 +65,7 @@ describe('PATCH /api/v1/admin/apps/:appKey/config', () => {
it('should return HTTP 422 for invalid app config data', async () => {
const appConfig = {
key: 'gitlab',
customConnectionAllowed: true,
shared: true,
useOnlyPredefinedAuthClients: true,
disabled: false,
};

29
packages/backend/src/controllers/api/v1/apps/create-connection.test.js
View File

@@ -155,7 +155,7 @@ describe('POST /api/v1/apps/:appKey/connections', () => {
await createAppConfig({
key: 'gitlab',
disabled: false,
customConnectionAllowed: true,
useOnlyPredefinedAuthClients: false,
});
});
@@ -218,7 +218,7 @@ describe('POST /api/v1/apps/:appKey/connections', () => {
await createAppConfig({
key: 'gitlab',
disabled: false,
customConnectionAllowed: false,
useOnlyPredefinedAuthClients: true,
});
});
@@ -266,14 +266,14 @@ describe('POST /api/v1/apps/:appKey/connections', () => {
});
});
describe('with auth clients enabled', async () => {
describe('with auth client enabled', async () => {
let appAuthClient;
beforeEach(async () => {
await createAppConfig({
key: 'gitlab',
disabled: false,
shared: true,
useOnlyPredefinedAuthClients: false,
});
appAuthClient = await createAppAuthClient({
@@ -310,19 +310,6 @@ describe('POST /api/v1/apps/:appKey/connections', () => {
expect(response.body).toStrictEqual(expectedPayload);
});
it('should return not authorized response for appAuthClientId and formattedData together', async () => {
const connectionData = {
appAuthClientId: appAuthClient.id,
formattedData: {},
};
await request(app)
.post('/api/v1/apps/gitlab/connections')
.set('Authorization', token)
.send(connectionData)
.expect(403);
});
it('should return not found response for invalid app key', async () => {
await request(app)
.post('/api/v1/apps/invalid-app-key/connections')
@@ -349,18 +336,20 @@ describe('POST /api/v1/apps/:appKey/connections', () => {
});
});
});
describe('with auth clients disabled', async () => {
describe('with auth client disabled', async () => {
let appAuthClient;
beforeEach(async () => {
await createAppConfig({
key: 'gitlab',
disabled: false,
shared: false,
useOnlyPredefinedAuthClients: false,
});
appAuthClient = await createAppAuthClient({
appKey: 'gitlab',
active: false,
});
});
@@ -373,7 +362,7 @@ describe('POST /api/v1/apps/:appKey/connections', () => {
.post('/api/v1/apps/gitlab/connections')
.set('Authorization', token)
.send(connectionData)
.expect(403);
.expect(404);
});
it('should return not found response for invalid app key', async () => {

3
packages/backend/src/controllers/api/v1/apps/get-config.ee.test.js
View File

@@ -17,8 +17,7 @@ describe('GET /api/v1/apps/:appKey/config', () => {
appConfig = await createAppConfig({
key: 'deepl',
customConnectionAllowed: true,
shared: true,
useOnlyPredefinedAuthClients: false,
disabled: false,
});

1
packages/backend/src/controllers/api/v1/connections/reset-connection.test.js
View File

@@ -47,7 +47,6 @@ describe('POST /api/v1/connections/:connectionId/reset', () => {
const expectedPayload = resetConnectionMock({
...refetchedCurrentUserConnection,
reconnectable: refetchedCurrentUserConnection.reconnectable,
formattedData: {
screenName: 'Connection name',
},

7
packages/backend/src/controllers/api/v1/connections/update-connection.test.js
View File

@@ -55,10 +55,9 @@ describe('PATCH /api/v1/connections/:connectionId', () => {
const refetchedCurrentUserConnection = await currentUserConnection.$query();
const expectedPayload = updateConnectionMock({
...refetchedCurrentUserConnection,
reconnectable: refetchedCurrentUserConnection.reconnectable,
});
const expectedPayload = updateConnectionMock(
refetchedCurrentUserConnection
);
expect(response.body).toStrictEqual(expectedPayload);
});