Fix merge conflicts

backend/src/controllers/v2/workspaceController.ts

@@ -2,6 +2,7 @@ import { Request, Response } from 'express';
 import * as Sentry from '@sentry/node';
 import {
     Key,
+	ServiceTokenData
 } from '../../models';
 import {
 	v2PushSecrets as push,
@@ -182,4 +183,30 @@ export const getWorkspaceKey = async (req: Request, res: Response) => {
 	return res.status(200).send({
 		key
 	});
+}
+export const getWorkspaceServiceTokenData = async (
+	req: Request,
+	res: Response
+) => {
+	let serviceTokenData;
+	try {
+		const { workspaceId } = req.query;
+
+		serviceTokenData = await ServiceTokenData
+			.find({
+				workspace: workspaceId
+			})
+			.select('+encryptedKey +iv +tag');
+
+	} catch (err) {
+		Sentry.setUser({ email: req.user.email });
+		Sentry.captureException(err);
+		return res.status(400).send({
+			message: 'Failed to get workspace service token data'
+		});
+	}
+	
+	return res.status(200).send({
+		serviceTokenData
+	});
 }