misc: addressed review comments

backend/src/services/integration-auth/integration-auth-service.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-await-in-loop */
 import { ForbiddenError } from "@casl/ability";
 import { createAppAuth } from "@octokit/auth-app";
 import { Octokit } from "@octokit/rest";
@@ -12,6 +11,7 @@ import { getConfig } from "@app/lib/config/env";
 import { request } from "@app/lib/config/request";
 import { decryptSymmetric128BitHexKeyUTF8, encryptSymmetric128BitHexKeyUTF8 } from "@app/lib/crypto";
 import { BadRequestError, InternalServerError, NotFoundError } from "@app/lib/errors";
+import { groupBy } from "@app/lib/fn";
 import { logger } from "@app/lib/logger";
 import { TGenericPermission, TProjectPermission } from "@app/lib/types";
 
@@ -1634,58 +1634,40 @@ export const integrationAuthServiceFactory = ({
       logger.error(error);
     }
 
-    const projectsByOrg = projects.reduce<Record<string, { name: string; id: string }[]>>((accum, project) => {
-      if (!accum[project.orgName]) {
-        return {
-          ...accum,
-          [project.orgName]: [
-            {
-              name: project.projectName,
-              id: project.projectId as string
-            }
-          ]
-        };
-      }
-      return {
-        ...accum,
-        [project.orgName]: [
-          ...accum[project.orgName],
-          {
-            name: project.projectName,
-            id: project.projectId as string
-          }
-        ]
-      };
-    }, {});
+    const projectsByOrg = groupBy(
+      projects.map((p) => ({
+        orgName: p.orgName,
+        name: p.projectName,
+        id: p.projectId
+      })),
+      (p) => p.orgName
+    );
 
     const getOrgContexts = async (orgSlug: string) => {
       type NextPageToken = string | null | undefined;
 
-      type CircleCIContextResponse = {
-        items: TCircleCIContext[];
-        next_page_token: NextPageToken;
-      };
-
       try {
         const contexts: TCircleCIContext[] = [];
         let nextPageToken: NextPageToken;
 
         while (nextPageToken !== null) {
-          const res = (
-            await request.get<CircleCIContextResponse>(`${IntegrationUrls.CIRCLECI_API_URL}/v2/context`, {
-              headers: {
-                "Circle-Token": accessToken,
-                "Accept-Encoding": "application/json"
-              },
-              params: new URLSearchParams({
-                "owner-slug": orgSlug,
-                ...(nextPageToken ? { "page-token": nextPageToken } : {})
-              })
+          // eslint-disable-next-line no-await-in-loop
+          const { data } = await request.get<{
+            items: TCircleCIContext[];
+            next_page_token: NextPageToken;
+          }>(`${IntegrationUrls.CIRCLECI_API_URL}/v2/context`, {
+            headers: {
+              "Circle-Token": accessToken,
+              "Accept-Encoding": "application/json"
+            },
+            params: new URLSearchParams({
+              "owner-slug": orgSlug,
+              ...(nextPageToken ? { "page-token": nextPageToken } : {})
             })
-          ).data;
+          });
 
-          contexts.push(...res.items);
-          nextPageToken = res.next_page_token;
+          contexts.push(...data.items);
+          nextPageToken = data.next_page_token;
         }
 
         return contexts?.map((context) => ({

backend/src/services/integration-auth/integration-auth-types.ts

@@ -227,6 +227,11 @@ export enum OctopusDeployScope {
   // add tenant, variable set, etc.
 }
 
+export enum CircleCiScope {
+  Project = "project",
+  Context = "context"
+}
+
 export type TOctopusDeployVariableSet = {
   Id: string;
   OwnerId: string;

backend/src/services/integration-auth/integration-list.ts

@@ -76,8 +76,6 @@ export enum IntegrationUrls {
   RAILWAY_API_URL = "https://backboard.railway.app/graphql/v2",
   FLYIO_API_URL = "https://api.fly.io/graphql",
   CIRCLECI_API_URL = "https://circleci.com/api",
-  // eslint-disable-next-line
-  DATABRICKS_API_URL = "https:/xxxx.com/api",
   TRAVISCI_API_URL = "https://api.travis-ci.com",
   SUPABASE_API_URL = "https://api.supabase.com",
   LARAVELFORGE_API_URL = "https://forge.laravel.com",

backend/src/services/integration-auth/integration-sync-secret.ts

@@ -39,7 +39,12 @@ import { TCreateManySecretsRawFn, TUpdateManySecretsRawFn } from "@app/services/
 import { TIntegrationDALFactory } from "../integration/integration-dal";
 import { IntegrationMetadataSchema } from "../integration/integration-schema";
 import { IntegrationAuthMetadataSchema } from "./integration-auth-schema";
-import { OctopusDeployScope, TIntegrationsWithEnvironment, TOctopusDeployVariableSet } from "./integration-auth-types";
+import {
+  CircleCiScope,
+  OctopusDeployScope,
+  TIntegrationsWithEnvironment,
+  TOctopusDeployVariableSet
+} from "./integration-auth-types";
 import {
   IntegrationInitialSyncBehavior,
   IntegrationMappingBehavior,
@@ -2245,11 +2250,6 @@ const syncSecretsCircleCI = async ({
   secrets: Record<string, { value: string; comment?: string }>;
   accessToken: string;
 }) => {
-  enum CircleCiScope {
-    Project = "project",
-    Context = "context"
-  }
-
   if (integration.scope === CircleCiScope.Context) {
     // sync secrets to CircleCI
     await Promise.all(
@@ -2278,29 +2278,24 @@ const syncSecretsCircleCI = async ({
         context_id: string;
       };
 
-      type ResponseSchema = {
-        items: EnvVars[];
-        next_page_token: string | null;
-      };
-
       let nextPageToken: string | null | undefined;
       const envVars: EnvVars[] = [];
 
       while (nextPageToken !== null) {
-        const res = await request.get<ResponseSchema>(
-          `${IntegrationUrls.CIRCLECI_API_URL}/v2/context/${integration.appId}/environment-variable`,
-          {
-            headers: {
-              "Circle-Token": accessToken,
-              "Accept-Encoding": "application/json"
-            },
-            params: nextPageToken
-              ? new URLSearchParams({
-                  "page-token": nextPageToken
-                })
-              : undefined
-          }
-        );
+        const res = await request.get<{
+          items: EnvVars[];
+          next_page_token: string | null;
+        }>(`${IntegrationUrls.CIRCLECI_API_URL}/v2/context/${integration.appId}/environment-variable`, {
+          headers: {
+            "Circle-Token": accessToken,
+            "Accept-Encoding": "application/json"
+          },
+          params: nextPageToken
+            ? new URLSearchParams({
+                "page-token": nextPageToken
+              })
+            : undefined
+        });
 
         envVars.push(...res.data.items);
         nextPageToken = res.data.next_page_token;