From a873fd14bd20dee0029df04e8c5ed1fda7fd752b Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Wed, 27 Mar 2024 13:44:01 +0100 Subject: [PATCH] chore: Remove old admin app auth clients API endpoint --- .../get-app-auth-clients.ee.js | 11 ----- .../get-app-auth-clients.ee.test.js | 41 ------------------- .../api/v1/admin/app-auth-clients.ee.js | 9 ---- .../app-auth-clients/get-app-auth-clients.js | 19 --------- 4 files changed, 80 deletions(-) delete mode 100644 packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-clients.ee.js delete mode 100644 packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-clients.ee.test.js delete mode 100644 packages/backend/test/mocks/rest/api/v1/admin/app-auth-clients/get-app-auth-clients.js diff --git a/packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-clients.ee.js b/packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-clients.ee.js deleted file mode 100644 index 03d0aeee..00000000 --- a/packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-clients.ee.js +++ /dev/null @@ -1,11 +0,0 @@ -import { renderObject } from '../../../../../helpers/renderer.js'; -import AppAuthClient from '../../../../../models/app-auth-client.js'; - -export default async (request, response) => { - const appAuthClients = await AppAuthClient.query().orderBy( - 'created_at', - 'desc' - ); - - renderObject(response, appAuthClients); -}; diff --git a/packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-clients.ee.test.js b/packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-clients.ee.test.js deleted file mode 100644 index b3394c89..00000000 --- a/packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-clients.ee.test.js +++ /dev/null @@ -1,41 +0,0 @@ -import { vi, describe, it, expect, beforeEach } from 'vitest'; -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 getAdminAppAuthClientsMock from '../../../../../../test/mocks/rest/api/v1/admin/app-auth-clients/get-app-auth-clients.js'; -import { createAppAuthClient } from '../../../../../../test/factories/app-auth-client.js'; -import { createRole } from '../../../../../../test/factories/role.js'; -import * as license from '../../../../../helpers/license.ee.js'; - -describe('GET /api/v1/admin/app-auth-clients', () => { - let currentUser, currentUserRole, token; - - describe('with valid license key', () => { - beforeEach(async () => { - vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true); - - currentUserRole = await createRole({ key: 'admin' }); - currentUser = await createUser({ roleId: currentUserRole.id }); - - token = createAuthTokenByUserId(currentUser.id); - }); - - it('should return app auth clients', async () => { - const appAuthClientOne = await createAppAuthClient(); - const appAuthClientTwo = await createAppAuthClient(); - - const response = await request(app) - .get('/api/v1/admin/app-auth-clients') - .set('Authorization', token) - .expect(200); - - const expectedPayload = getAdminAppAuthClientsMock([ - appAuthClientTwo, - appAuthClientOne, - ]); - - expect(response.body).toEqual(expectedPayload); - }); - }); -}); diff --git a/packages/backend/src/routes/api/v1/admin/app-auth-clients.ee.js b/packages/backend/src/routes/api/v1/admin/app-auth-clients.ee.js index cda5e2e0..961b6616 100644 --- a/packages/backend/src/routes/api/v1/admin/app-auth-clients.ee.js +++ b/packages/backend/src/routes/api/v1/admin/app-auth-clients.ee.js @@ -3,19 +3,10 @@ import asyncHandler from 'express-async-handler'; import { authenticateUser } from '../../../../helpers/authentication.js'; import { authorizeAdmin } from '../../../../helpers/authorization.js'; import { checkIsEnterprise } from '../../../../helpers/check-is-enterprise.js'; -import getAdminAppAuthClientsAction from '../../../../controllers/api/v1/admin/app-auth-clients/get-app-auth-clients.ee.js'; import getAdminAppAuthClientAction from '../../../../controllers/api/v1/admin/app-auth-clients/get-app-auth-client.ee.js'; const router = Router(); -router.get( - '/', - authenticateUser, - authorizeAdmin, - checkIsEnterprise, - asyncHandler(getAdminAppAuthClientsAction) -); - router.get( '/:appAuthClientId', authenticateUser, diff --git a/packages/backend/test/mocks/rest/api/v1/admin/app-auth-clients/get-app-auth-clients.js b/packages/backend/test/mocks/rest/api/v1/admin/app-auth-clients/get-app-auth-clients.js deleted file mode 100644 index cb40da1a..00000000 --- a/packages/backend/test/mocks/rest/api/v1/admin/app-auth-clients/get-app-auth-clients.js +++ /dev/null @@ -1,19 +0,0 @@ -const getAdminAppAuthClientsMock = (appAuthClients) => { - return { - data: appAuthClients.map((appAuthClient) => ({ - appConfigId: appAuthClient.appConfigId, - name: appAuthClient.name, - id: appAuthClient.id, - active: appAuthClient.active, - })), - meta: { - count: appAuthClients.length, - currentPage: null, - isArray: true, - totalPages: null, - type: 'AppAuthClient', - }, - }; -}; - -export default getAdminAppAuthClientsMock;