TeamCity integration

backend/src/integrations/apps.ts

@@ -36,7 +36,6 @@ import {
   INTEGRATION_SUPABASE,
   INTEGRATION_SUPABASE_API_URL,
   INTEGRATION_TEAMCITY,
-  INTEGRATION_TEAMCITY_API_URL,
   INTEGRATION_TERRAFORM_CLOUD,
   INTEGRATION_TERRAFORM_CLOUD_API_URL,
   INTEGRATION_TRAVISCI,
@@ -155,6 +154,7 @@ const getApps = async ({
       break;
     case INTEGRATION_TEAMCITY:
       apps = await getAppsTeamCity({
+        integrationAuth,
         accessToken,
       });
       break;
@@ -737,12 +737,14 @@ const getAppsGitlab = async ({
  * @returns {String} apps.name - name of TeamCity projects
  */
 const getAppsTeamCity = async ({ 
+  integrationAuth,
   accessToken,
 }: {
+  integrationAuth: IIntegrationAuth;
   accessToken: string;
 }) => {
   const res = (
-    await standardRequest.get(`${INTEGRATION_TEAMCITY_API_URL}/app/rest/projects`, {
+    await standardRequest.get(`${integrationAuth.url}/app/rest/projects`, {
       headers: {
         Authorization: `Bearer ${accessToken}`,
         Accept: "application/json",

backend/src/integrations/sync.ts

@@ -45,7 +45,6 @@ import {
   INTEGRATION_SUPABASE,
   INTEGRATION_SUPABASE_API_URL,
   INTEGRATION_TEAMCITY,
-  INTEGRATION_TEAMCITY_API_URL,
   INTEGRATION_TERRAFORM_CLOUD,
   INTEGRATION_TERRAFORM_CLOUD_API_URL,
   INTEGRATION_TRAVISCI,
@@ -237,6 +236,7 @@ const syncSecrets = async ({
       break;
     case INTEGRATION_TEAMCITY:
       await syncSecretsTeamCity({
+        integrationAuth,
         integration,
         secrets,
         accessToken,
@@ -1988,10 +1988,12 @@ const syncSecretsTerraformCloud = async ({
  * @param {String} obj.accessToken - access token for TeamCity integration
  */
 const syncSecretsTeamCity = async ({
+  integrationAuth,
   integration,
   secrets,
   accessToken,
 }: {
+  integrationAuth: IIntegrationAuth;
   integration: IIntegration;
   secrets: any;
   accessToken: string;
@@ -1999,7 +2001,7 @@ const syncSecretsTeamCity = async ({
 
   // get projects from TeamCity
   const res = (
-    await standardRequest.get(`${INTEGRATION_TEAMCITY_API_URL}/app/rest/projects`, {
+    await standardRequest.get(`${integrationAuth.url}/app/rest/projects`, {
       headers: {
         Authorization: `Bearer ${accessToken}`,
         Accept: "application/json",
@@ -2010,7 +2012,7 @@ const syncSecretsTeamCity = async ({
   // get secrets from Teamcity
   const getParametersRes = (
     await standardRequest.get(
-      `${INTEGRATION_TEAMCITY_API_URL}/app/rest/projects/id:${integration.appId}/parameters`, 
+      `${integrationAuth.url}/app/rest/projects/id:${integration.appId}/parameters`, 
       {
         headers: {
           Authorization: `Bearer ${accessToken}`,
@@ -2022,7 +2024,7 @@ const syncSecretsTeamCity = async ({
   for await (const key of Object.keys(secrets)) {
     if (key in res) {
       await standardRequest.put(
-        `${INTEGRATION_TEAMCITY_API_URL}/app/rest/projects/id:${integration.appId}/parameters/${res.id}`,
+        `${integrationAuth.url}/app/rest/projects/id:${integration.appId}/parameters/${res.id}`,
         {
           name: `env.${key}`,
           value: secrets[key]
@@ -2036,7 +2038,7 @@ const syncSecretsTeamCity = async ({
       );
     } else {
       await standardRequest.post(
-        `${INTEGRATION_TEAMCITY_API_URL}/app/rest/projects/id:${integration.appId}/parameters`,
+        `${integrationAuth.url}/app/rest/projects/id:${integration.appId}/parameters`,
         {
           name: `env.${key}`,
           value: secrets[key]
@@ -2057,7 +2059,7 @@ const syncSecretsTeamCity = async ({
     
     if (!(modifiedString in secrets)) {
     await standardRequest.delete(
-      `${INTEGRATION_TEAMCITY_API_URL}/app/rest/projects/id:${integration.appId}/parameters/${sec.name}`,
+      `${integrationAuth.url}/app/rest/projects/id:${integration.appId}/parameters/${sec.name}`,
         {
           headers: {
             Authorization: `Bearer ${accessToken}`,

backend/src/variables/integration.ts

@@ -89,7 +89,6 @@ export const INTEGRATION_SUPABASE_API_URL = "https://api.supabase.com";
 export const INTEGRATION_LARAVELFORGE_API_URL = "https://forge.laravel.com";
 export const INTEGRATION_CHECKLY_API_URL = "https://api.checklyhq.com";
 export const INTEGRATION_TERRAFORM_CLOUD_API_URL = "https://app.terraform.io";
-export const INTEGRATION_TEAMCITY_API_URL = "https://devaandrew.teamcity.com"; // URL needs to be changed
 export const INTEGRATION_CLOUDFLARE_PAGES_API_URL = "https://api.cloudflare.com";
 export const INTEGRATION_BITBUCKET_API_URL = "https://api.bitbucket.org";
 export const INTEGRATION_CODEFRESH_API_URL = "https://g.codefresh.io/api";