Move service token data routes and controllers to v2

backend/src/app.ts

@@ -29,15 +29,15 @@ import {
   userAction as v1UserActionRouter,
   secret as v1SecretRouter,
   serviceToken as v1ServiceTokenRouter,
-  serviceTokenData as v1ServiceTokenDataRouter,
   password as v1PasswordRouter,
   stripe as v1StripeRouter,
   integration as v1IntegrationRouter,
   integrationAuth as v1IntegrationAuthRouter
 } 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)=>{

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
 };

backend/src/controllers/v2/index.ts

@@ -1,5 +1,7 @@
 import * as workspaceController from './workspaceController';
+import * as serviceTokenDataController from './serviceTokenDataController';
 
 export { 
-    workspaceController
+    workspaceController,
+    serviceTokenDataController
 }

backend/src/ee/routes/v1/workspace.ts

@@ -25,5 +25,4 @@ router.get(
 	workspaceController.getWorkspaceSecretSnapshots
 );
 
-
 export default router;

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
 };

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
 }

backend/src/routes/v1/serviceTokenData.ts → 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(
     '/',