From df3297b6ca2da518bc2ba1ce8bee048cadba14fb Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Mon, 25 Mar 2024 17:01:16 +0100 Subject: [PATCH] refactor: Move app config endpoint to apps namespace --- .../get-config.ee.js} | 0 .../get-config.ee.test.js} | 8 ++++---- .../backend/src/routes/api/v1/app-configs.ee.js | 16 ---------------- packages/backend/src/routes/api/v1/apps.js | 9 +++++++++ packages/backend/src/routes/index.js | 2 -- .../get-app-config.js => apps/get-config.js} | 0 6 files changed, 13 insertions(+), 22 deletions(-) rename packages/backend/src/controllers/api/v1/{app-configs/get-app-config.ee.js => apps/get-config.ee.js} (100%) rename packages/backend/src/controllers/api/v1/{app-configs/get-app-config.ee.test.js => apps/get-config.ee.test.js} (87%) delete mode 100644 packages/backend/src/routes/api/v1/app-configs.ee.js rename packages/backend/test/mocks/rest/api/v1/{app-configs/get-app-config.js => apps/get-config.js} (100%) diff --git a/packages/backend/src/controllers/api/v1/app-configs/get-app-config.ee.js b/packages/backend/src/controllers/api/v1/apps/get-config.ee.js similarity index 100% rename from packages/backend/src/controllers/api/v1/app-configs/get-app-config.ee.js rename to packages/backend/src/controllers/api/v1/apps/get-config.ee.js diff --git a/packages/backend/src/controllers/api/v1/app-configs/get-app-config.ee.test.js b/packages/backend/src/controllers/api/v1/apps/get-config.ee.test.js similarity index 87% rename from packages/backend/src/controllers/api/v1/app-configs/get-app-config.ee.test.js rename to packages/backend/src/controllers/api/v1/apps/get-config.ee.test.js index 8de80b69..ee286358 100644 --- a/packages/backend/src/controllers/api/v1/app-configs/get-app-config.ee.test.js +++ b/packages/backend/src/controllers/api/v1/apps/get-config.ee.test.js @@ -3,11 +3,11 @@ import request from 'supertest'; import app from '../../../../app.js'; import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id.js'; import { createUser } from '../../../../../test/factories/user.js'; -import getAppConfigMock from '../../../../../test/mocks/rest/api/v1/app-configs/get-app-config.js'; +import getAppConfigMock from '../../../../../test/mocks/rest/api/v1/apps/get-config.js'; import { createAppConfig } from '../../../../../test/factories/app-config.js'; import * as license from '../../../../helpers/license.ee.js'; -describe('GET /api/v1/app-configs/:appKey', () => { +describe('GET /api/v1/apps/:appKey/config', () => { let currentUser, appConfig, token; beforeEach(async () => { @@ -27,7 +27,7 @@ describe('GET /api/v1/app-configs/:appKey', () => { it('should return specified app config info', async () => { const response = await request(app) - .get(`/api/v1/app-configs/${appConfig.key}`) + .get(`/api/v1/apps/${appConfig.key}/config`) .set('Authorization', token) .expect(200); @@ -37,7 +37,7 @@ describe('GET /api/v1/app-configs/:appKey', () => { it('should return not found response for not existing app key', async () => { await request(app) - .get('/api/v1/app-configs/not-existing-app-key') + .get('/api/v1/apps/not-existing-app-key/config') .set('Authorization', token) .expect(404); }); diff --git a/packages/backend/src/routes/api/v1/app-configs.ee.js b/packages/backend/src/routes/api/v1/app-configs.ee.js deleted file mode 100644 index 0f2ea63b..00000000 --- a/packages/backend/src/routes/api/v1/app-configs.ee.js +++ /dev/null @@ -1,16 +0,0 @@ -import { Router } from 'express'; -import asyncHandler from 'express-async-handler'; -import { authenticateUser } from '../../../helpers/authentication.js'; -import { checkIsEnterprise } from '../../../helpers/check-is-enterprise.js'; -import getAppConfigAction from '../../../controllers/api/v1/app-configs/get-app-config.ee.js'; - -const router = Router(); - -router.get( - '/:appKey', - authenticateUser, - checkIsEnterprise, - asyncHandler(getAppConfigAction) -); - -export default router; diff --git a/packages/backend/src/routes/api/v1/apps.js b/packages/backend/src/routes/api/v1/apps.js index 65145714..24d9c52f 100644 --- a/packages/backend/src/routes/api/v1/apps.js +++ b/packages/backend/src/routes/api/v1/apps.js @@ -2,9 +2,11 @@ import { Router } from 'express'; import asyncHandler from 'express-async-handler'; import { authenticateUser } from '../../../helpers/authentication.js'; import { authorizeUser } from '../../../helpers/authorization.js'; +import { checkIsEnterprise } from '../../../helpers/check-is-enterprise.js'; import getAppAction from '../../../controllers/api/v1/apps/get-app.js'; import getAppsAction from '../../../controllers/api/v1/apps/get-apps.js'; import getAuthAction from '../../../controllers/api/v1/apps/get-auth.js'; +import getConfigAction from '../../../controllers/api/v1/apps/get-config.ee.js'; import getTriggersAction from '../../../controllers/api/v1/apps/get-triggers.js'; import getTriggerSubstepsAction from '../../../controllers/api/v1/apps/get-trigger-substeps.js'; import getActionsAction from '../../../controllers/api/v1/apps/get-actions.js'; @@ -17,6 +19,13 @@ router.get('/', authenticateUser, asyncHandler(getAppsAction)); router.get('/:appKey', authenticateUser, asyncHandler(getAppAction)); router.get('/:appKey/auth', authenticateUser, asyncHandler(getAuthAction)); +router.get( + '/:appKey/config', + authenticateUser, + checkIsEnterprise, + asyncHandler(getConfigAction) +); + router.get( '/:appKey/triggers', authenticateUser, diff --git a/packages/backend/src/routes/index.js b/packages/backend/src/routes/index.js index b0bc516d..6a6a5e21 100644 --- a/packages/backend/src/routes/index.js +++ b/packages/backend/src/routes/index.js @@ -7,7 +7,6 @@ import automatischRouter from './api/v1/automatisch.js'; import usersRouter from './api/v1/users.js'; import paymentRouter from './api/v1/payment.ee.js'; import appAuthClientsRouter from './api/v1/app-auth-clients.js'; -import appConfigsRouter from './api/v1/app-configs.ee.js'; import flowsRouter from './api/v1/flows.js'; import stepsRouter from './api/v1/steps.js'; import appsRouter from './api/v1/apps.js'; @@ -30,7 +29,6 @@ router.use('/api/v1/automatisch', automatischRouter); router.use('/api/v1/users', usersRouter); router.use('/api/v1/payment', paymentRouter); router.use('/api/v1/app-auth-clients', appAuthClientsRouter); -router.use('/api/v1/app-configs', appConfigsRouter); router.use('/api/v1/flows', flowsRouter); router.use('/api/v1/steps', stepsRouter); router.use('/api/v1/apps', appsRouter); diff --git a/packages/backend/test/mocks/rest/api/v1/app-configs/get-app-config.js b/packages/backend/test/mocks/rest/api/v1/apps/get-config.js similarity index 100% rename from packages/backend/test/mocks/rest/api/v1/app-configs/get-app-config.js rename to packages/backend/test/mocks/rest/api/v1/apps/get-config.js