From e9601307efdbea93f8fdae15a69e4b800d1859c3 Mon Sep 17 00:00:00 2001
From: Tuan Dang <tony@infisical.com>
Date: Tue, 3 Jan 2023 09:33:00 +0700
Subject: [PATCH] Move service token data routes and controllers to v2

---
 backend/src/app.ts                                          | 6 +++---
 backend/src/controllers/v1/index.ts                         | 4 +---
 backend/src/controllers/v2/index.ts                         | 4 +++-
 .../controllers/{v1 => v2}/serviceTokenDataController.ts    | 0
 backend/src/ee/routes/v1/workspace.ts                       | 1 -
 backend/src/routes/v1/index.ts                              | 4 +---
 backend/src/routes/v2/index.ts                              | 4 +++-
 backend/src/routes/{v1 => v2}/serviceTokenData.ts           | 2 +-
 8 files changed, 12 insertions(+), 13 deletions(-)
 rename backend/src/controllers/{v1 => v2}/serviceTokenDataController.ts (100%)
 rename backend/src/routes/{v1 => v2}/serviceTokenData.ts (95%)

diff --git a/backend/src/app.ts b/backend/src/app.ts
index f37fd7560..ca6428447 100644
--- a/backend/src/app.ts
+++ b/backend/src/app.ts
@@ -29,7 +29,6 @@ import {
   userAction as v1UserActionRouter,
   secret as v1SecretRouter,
   serviceToken as v1ServiceTokenRouter,
-  serviceTokenData as v1ServiceTokenDataRouter,
   password as v1PasswordRouter,
   stripe as v1StripeRouter,
   integration as v1IntegrationRouter,
@@ -37,7 +36,8 @@ import {
 } from './routes/v1';
 import {
   secret as v2SecretRouter,
-  workspace as v2WorkspaceRouter
+  workspace as v2WorkspaceRouter,
+  serviceTokenData as v2ServiceTokenDataRouter,
 } from './routes/v2';
 
 import { getLogger } from './utils/logger';
@@ -85,7 +85,6 @@ app.use('/api/v1/key', v1KeyRouter);
 app.use('/api/v1/invite-org', v1InviteOrgRouter);
 app.use('/api/v1/secret', v1SecretRouter);
 app.use('/api/v1/service-token', v1ServiceTokenRouter); // deprecate
-app.use('/api/v1/service-token-data', v1ServiceTokenDataRouter);
 app.use('/api/v1/password', v1PasswordRouter);
 app.use('/api/v1/stripe', v1StripeRouter);
 app.use('/api/v1/integration', v1IntegrationRouter);
@@ -94,6 +93,7 @@ app.use('/api/v1/integration-auth', v1IntegrationAuthRouter);
 // v2 routes
 app.use('/api/v2/workspace', v2WorkspaceRouter);
 app.use('/api/v2/secret', v2SecretRouter);
+app.use('/api/v2/service-token-data', v2ServiceTokenDataRouter);
 
 //* Handle unrouted requests and respond with proper error message as well as status code
 app.use((req, res, next)=>{
diff --git a/backend/src/controllers/v1/index.ts b/backend/src/controllers/v1/index.ts
index 56c6071c5..1da61835f 100644
--- a/backend/src/controllers/v1/index.ts
+++ b/backend/src/controllers/v1/index.ts
@@ -14,7 +14,6 @@ import * as stripeController from './stripeController';
 import * as userActionController from './userActionController';
 import * as userController from './userController';
 import * as workspaceController from './workspaceController';
-import * as serviceTokenDataController from './serviceTokenDataController';
 
 export {
 	authController,
@@ -32,6 +31,5 @@ export {
 	stripeController,
 	userActionController,
 	userController,
-	workspaceController,
-	serviceTokenDataController
+	workspaceController
 };
diff --git a/backend/src/controllers/v2/index.ts b/backend/src/controllers/v2/index.ts
index dc6977c91..d4729c15c 100644
--- a/backend/src/controllers/v2/index.ts
+++ b/backend/src/controllers/v2/index.ts
@@ -1,5 +1,7 @@
 import * as workspaceController from './workspaceController';
+import * as serviceTokenDataController from './serviceTokenDataController';
 
 export { 
-    workspaceController
+    workspaceController,
+    serviceTokenDataController
 }
diff --git a/backend/src/controllers/v1/serviceTokenDataController.ts b/backend/src/controllers/v2/serviceTokenDataController.ts
similarity index 100%
rename from backend/src/controllers/v1/serviceTokenDataController.ts
rename to backend/src/controllers/v2/serviceTokenDataController.ts
diff --git a/backend/src/ee/routes/v1/workspace.ts b/backend/src/ee/routes/v1/workspace.ts
index d127599e1..bc3480280 100644
--- a/backend/src/ee/routes/v1/workspace.ts
+++ b/backend/src/ee/routes/v1/workspace.ts
@@ -25,5 +25,4 @@ router.get(
 	workspaceController.getWorkspaceSecretSnapshots
 );
 
-
 export default router;
\ No newline at end of file
diff --git a/backend/src/routes/v1/index.ts b/backend/src/routes/v1/index.ts
index 89b02ebc9..2dfe58baa 100644
--- a/backend/src/routes/v1/index.ts
+++ b/backend/src/routes/v1/index.ts
@@ -15,7 +15,6 @@ import password from './password';
 import stripe from './stripe';
 import integration from './integration';
 import integrationAuth from './integrationAuth';
-import serviceTokenData from './serviceTokenData';
 
 export {
 	signup,
@@ -34,6 +33,5 @@ export {
 	password,
 	stripe,
 	integration,
-	integrationAuth,
-	serviceTokenData
+	integrationAuth
 };
diff --git a/backend/src/routes/v2/index.ts b/backend/src/routes/v2/index.ts
index 6e6758753..acf115a92 100644
--- a/backend/src/routes/v2/index.ts
+++ b/backend/src/routes/v2/index.ts
@@ -1,7 +1,9 @@
 import secret from './secret';
 import workspace from './workspace';
+import serviceTokenData from './serviceTokenData';
 
 export {
     secret,
-    workspace
+    workspace,
+    serviceTokenData
 }
diff --git a/backend/src/routes/v1/serviceTokenData.ts b/backend/src/routes/v2/serviceTokenData.ts
similarity index 95%
rename from backend/src/routes/v1/serviceTokenData.ts
rename to backend/src/routes/v2/serviceTokenData.ts
index 1d7700615..578d4e38e 100644
--- a/backend/src/routes/v1/serviceTokenData.ts
+++ b/backend/src/routes/v2/serviceTokenData.ts
@@ -13,7 +13,7 @@ import {
     COMPLETED,
     GRANTED
 } from '../../variables';
-import { serviceTokenDataController } from '../../controllers/v1';
+import { serviceTokenDataController } from '../../controllers/v2';
 
 router.get(
     '/',