@red-hat-developer-hub/backstage-plugin-bulk-import-backend 7.2.1 → 7.3.0

package/dist/github/githubApiService.cjs.js

@@ -7,7 +7,7 @@ require('@backstage/plugin-permission-common');
 require('@red-hat-developer-hub/backstage-plugin-bulk-import-common');
 require('just-kebab-case');
 var loggingUtils = require('../helpers/loggingUtils.cjs.js');
-var utils$1 = require('../helpers/utils.cjs.js');
+var utils = require('../helpers/utils.cjs.js');
 var handlers = require('../service/handlers/handlers.cjs.js');
 var GithubAppManager = require('./GithubAppManager.cjs.js');
 var types = require('./types.cjs.js');
@@ -15,7 +15,7 @@ var ghUtils = require('./utils/ghUtils.cjs.js');
 var orgUtils = require('./utils/orgUtils.cjs.js');
 var prUtils = require('./utils/prUtils.cjs.js');
 var repoUtils = require('./utils/repoUtils.cjs.js');
-var utils = require('./utils/utils.cjs.js');
+var utils$1 = require('./utils/utils.cjs.js');
 
 class GithubApiService {
   logger;
@@ -31,6 +31,28 @@ class GithubApiService {
     this.githubCredentialsProvider = GithubAppManager.CustomGithubCredentialsProvider.fromIntegrations(this.integrations);
     this.cache = cacheService;
   }
+  get integrationDeps() {
+    return {
+      logger: this.logger,
+      cache: this.cache,
+      githubCredentialsProvider: this.githubCredentialsProvider
+    };
+  }
+  get executionDeps() {
+    return {
+      ...this.integrationDeps,
+      config: this.config
+    };
+  }
+  buildRepositoryResponse(repositories, result, pageSize) {
+    const repoList = Array.from(repositories.values());
+    const totalCount = utils.computeTotalCount(repoList, result.data, pageSize);
+    return {
+      repositories: repoList,
+      errors: Array.from(result.errors.values()),
+      totalCount
+    };
+  }
   async getCredentials(repoUrl) {
     const provider = integration.DefaultGithubCredentialsProvider.fromIntegrations(
       this.integrations
@@ -46,12 +68,8 @@ class GithubApiService {
     };
   }
   async getRepositoryFromIntegrations(repoUrl) {
-    const { data, errors } = await utils.fetchFromMatchedIntegration(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    const { data, errors } = await utils$1.fetchFromMatchedIntegration(
+      this.integrationDeps,
       this.integrations,
       repoUrl,
       async (octokit, gitUrl) => {
@@ -78,14 +96,10 @@ class GithubApiService {
       errors
     };
   }
-  async getOrganizationsFromIntegrations(search, pageNumber = handlers.DefaultPageNumber, pageSize = handlers.DefaultPageSize) {
+  async getOrganizationsFromIntegrations(pageNumber = handlers.DefaultPageNumber, pageSize = handlers.DefaultPageSize, search) {
     const orgs = /* @__PURE__ */ new Map();
-    const result = await utils.fetchFromAllIntegrations(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    const result = await utils$1.fetchFromAllIntegrations(
+      this.integrationDeps,
       this.integrations,
       {
         dataFetcher: async (octokit, credential, ghConfig) => {
@@ -128,21 +142,63 @@ class GithubApiService {
       }
     );
     const orgList = Array.from(orgs.values());
-    const totalCount = utils$1.computeTotalCount(orgList, result.data, pageSize);
+    const totalCount = utils.computeTotalCount(orgList, result.data, pageSize);
     return {
       organizations: orgList,
       errors: Array.from(result.errors?.values() ?? []),
       totalCount
     };
   }
-  async getOrgRepositoriesFromIntegrations(orgName, search, pageNumber = handlers.DefaultPageNumber, pageSize = handlers.DefaultPageSize) {
+  async fetchUserTokenGithubIntegrationRepositories(userTokens, fetcher) {
+    const allErrors = [];
+    let totalCount;
+    const ghConfigs = this.integrations.github.list().map((i) => i.config);
+    for (const ghConfig of ghConfigs) {
+      const hostUrl = `https://${ghConfig.host}`;
+      const token = userTokens[hostUrl];
+      if (!token) {
+        continue;
+      }
+      const userCredential = { token, type: "token" };
+      const userOctokit = ghUtils.buildOcto(
+        { logger: this.logger, cache: void 0 },
+        { credential: userCredential },
+        ghConfig.apiBaseUrl
+      );
+      if (!userOctokit) {
+        continue;
+      }
+      const dataFetchErrors = /* @__PURE__ */ new Map();
+      const result = await fetcher(
+        userOctokit,
+        userCredential,
+        dataFetchErrors
+      );
+      totalCount = (totalCount ?? 0) + (result.totalCount ?? 0);
+      dataFetchErrors.forEach((err) => allErrors.push(err));
+    }
+    return { errors: allErrors, totalCount };
+  }
+  async getOrgRepositoriesFromIntegrations(orgName, search, pageNumber = handlers.DefaultPageNumber, pageSize = handlers.DefaultPageSize, userTokens) {
     const repositories = /* @__PURE__ */ new Map();
-    const result = await utils.fetchFromAllIntegrations(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    if (userTokens && Object.keys(userTokens).length > 0) {
+      const { errors: allErrors, totalCount } = await this.fetchUserTokenGithubIntegrationRepositories(
+        userTokens,
+        (userOctokit, userCredential, dataFetchErrors) => repoUtils.addGithubTokenOrgRepositories(
+          { logger: this.logger },
+          userOctokit,
+          userCredential,
+          orgName,
+          repositories,
+          dataFetchErrors,
+          { search, pageNumber, pageSize }
+        )
+      );
+      const repoList = Array.from(repositories.values());
+      return { repositories: repoList, errors: allErrors, totalCount };
+    }
+    const result = await utils$1.fetchFromAllIntegrations(
+      this.integrationDeps,
       this.integrations,
       {
         dataFetcher: async (octokit, credential, ghConfig) => {
@@ -159,13 +215,10 @@ class GithubApiService {
               },
               octokit,
               credential,
-              ghConfig,
               repositories,
               dataFetchErrors,
               {
-                search,
-                pageNumber,
-                pageSize
+                search
               }
             );
           } else {
@@ -179,9 +232,7 @@ class GithubApiService {
               repositories,
               dataFetchErrors,
               {
-                search,
-                pageNumber,
-                pageSize
+                search
               }
             );
           }
@@ -196,27 +247,32 @@ class GithubApiService {
         }
       }
     );
-    const repoList = Array.from(repositories.values());
-    const totalCount = utils$1.computeTotalCount(repoList, result.data, pageSize);
-    return {
-      repositories: repoList,
-      errors: Array.from(result.errors?.values() ?? []),
-      totalCount
-    };
+    return this.buildRepositoryResponse(repositories, result, pageSize);
   }
   /**
    * Returns GithubRepositoryResponse containing:
    *   - a list of unique repositories the github integrations have access to
    *   - a list of errors encountered by each app and/or token (if any exist)
    */
-  async getRepositoriesFromIntegrations(search, pageNumber = handlers.DefaultPageNumber, pageSize = handlers.DefaultPageSize) {
+  async getRepositoriesFromIntegrations(search, userTokens) {
     const repositories = /* @__PURE__ */ new Map();
-    const result = await utils.fetchFromAllIntegrations(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    if (userTokens && Object.keys(userTokens).length > 0) {
+      const { errors: allErrors, totalCount } = await this.fetchUserTokenGithubIntegrationRepositories(
+        userTokens,
+        (userOctokit, userCredential, dataFetchErrors) => repoUtils.addGithubTokenRepositories(
+          { logger: this.logger },
+          userOctokit,
+          userCredential,
+          repositories,
+          dataFetchErrors,
+          { search }
+        )
+      );
+      const repoList = Array.from(repositories.values());
+      return { repositories: repoList, errors: allErrors, totalCount };
+    }
+    const result = await utils$1.fetchFromAllIntegrations(
+      this.integrationDeps,
       this.integrations,
       {
         dataFetcher: async (octokit, credential, ghConfig) => {
@@ -228,13 +284,10 @@ class GithubApiService {
             },
             octokit,
             credential,
-            ghConfig,
             repositories,
             dataFetchErrors,
             {
-              search,
-              pageNumber,
-              pageSize
+              search
             }
           ) : await repoUtils.addGithubTokenRepositories(
             {
@@ -245,9 +298,7 @@ class GithubApiService {
             repositories,
             dataFetchErrors,
             {
-              search,
-              pageNumber,
-              pageSize
+              search
             }
           );
           this.logger.debug(
@@ -260,48 +311,34 @@ class GithubApiService {
         }
       }
     );
-    const repoList = Array.from(repositories.values());
-    const totalCount = utils$1.computeTotalCount(repoList, result.data, pageSize);
-    return {
-      repositories: repoList,
-      errors: Array.from(result.errors?.values() ?? []),
-      totalCount
-    };
+    return this.buildRepositoryResponse(repositories, result, handlers.DefaultPageSize);
   }
   async filterLocationsAccessibleFromIntegrations(locationUrls) {
-    const locationGitOwnerMap = utils$1.extractLocationOwnerMap(locationUrls);
+    const locationGitOwnerMap = utils.extractLocationOwnerMap(locationUrls);
     const allAccessibleAppOrgs = /* @__PURE__ */ new Set();
     const allAccessibleTokenOrgs = /* @__PURE__ */ new Set();
     const allAccessibleUsernames = /* @__PURE__ */ new Set();
-    await utils.fetchFromAllIntegrations(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
-      this.integrations,
-      {
-        dataFetcher: async (octokit, credential, ghConfig) => {
-          if (types.isGithubAppCredential(credential)) {
-            const appOrgMap = await orgUtils.getAllAppOrgs(
-              this.githubCredentialsProvider,
-              ghConfig,
-              credential.accountLogin
-            );
-            for (const [_, ghOrg] of appOrgMap) {
-              allAccessibleAppOrgs.add(ghOrg.name);
-            }
-          } else {
-            const username = (await octokit.rest.users.getAuthenticated())?.data?.login;
-            if (username) {
-              allAccessibleUsernames.add(username);
-            }
-            (await octokit.paginate(octokit.rest.orgs.listForAuthenticatedUser))?.map((org) => org.login)?.forEach((orgName) => allAccessibleTokenOrgs.add(orgName));
+    await utils$1.fetchFromAllIntegrations(this.integrationDeps, this.integrations, {
+      dataFetcher: async (octokit, credential, ghConfig) => {
+        if (types.isGithubAppCredential(credential)) {
+          const appOrgMap = await orgUtils.getAllAppOrgs(
+            this.githubCredentialsProvider,
+            ghConfig,
+            credential.accountLogin
+          );
+          for (const [_, ghOrg] of appOrgMap) {
+            allAccessibleAppOrgs.add(ghOrg.name);
           }
-          return {};
+        } else {
+          const username = (await octokit.rest.users.getAuthenticated())?.data?.login;
+          if (username) {
+            allAccessibleUsernames.add(username);
+          }
+          (await octokit.paginate(octokit.rest.orgs.listForAuthenticatedUser))?.map((org) => org.login)?.forEach((orgName) => allAccessibleTokenOrgs.add(orgName));
         }
+        return {};
       }
-    );
+    });
     return locationUrls.filter((loc) => {
       if (!locationGitOwnerMap.has(loc)) {
         return false;
@@ -311,12 +348,8 @@ class GithubApiService {
     });
   }
   async getPullRequest(repoUrl, pullRequestNumber) {
-    const { data } = await utils.fetchFromMatchedIntegration(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    const { data } = await utils$1.fetchFromMatchedIntegration(
+      this.integrationDeps,
       this.integrations,
       repoUrl,
       async (octokit, gitUrl) => {
@@ -344,12 +377,8 @@ class GithubApiService {
     return data ?? {};
   }
   async updatePullRequest(repoUrl, pullRequestNumber, title, body) {
-    await utils.fetchFromMatchedIntegration(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    await utils$1.fetchFromMatchedIntegration(
+      this.integrationDeps,
       this.integrations,
       repoUrl,
       async (octokit, gitUrl) => {
@@ -443,12 +472,8 @@ class GithubApiService {
   }
   async findImportOpenPr(logger, input) {
     const branchName = catalogUtils.getBranchName(this.config);
-    const { data } = await utils.fetchFromMatchedIntegration(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    const { data } = await utils$1.fetchFromMatchedIntegration(
+      this.integrationDeps,
       this.integrations,
       input.repoUrl,
       async (octokit, gitUrl) => {
@@ -471,12 +496,8 @@ class GithubApiService {
     return data ?? {};
   }
   async getCatalogInfoFile(logger, input) {
-    const { data } = await utils.fetchFromMatchedIntegration(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    const { data } = await utils$1.fetchFromMatchedIntegration(
+      this.integrationDeps,
       this.integrations,
       input.repoUrl,
       async (octokit, gitUrl) => {
@@ -505,13 +526,8 @@ class GithubApiService {
   async submitPrToRepo(logger, input) {
     const fileName = catalogUtils.getCatalogFilename(this.config);
     const errors = [];
-    const result = await utils.executeFunctionOnFirstSuccessfulIntegration(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        config: this.config,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    const result = await utils$1.executeFunctionOnFirstSuccessfulIntegration(
+      this.executionDeps,
       this.integrations,
       {
         repoUrl: input.repoUrl,
@@ -660,13 +676,8 @@ class GithubApiService {
     };
   }
   async hasFileInRepo(input) {
-    const fileExists = await utils.executeFunctionOnFirstSuccessfulIntegration(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        config: this.config,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    const fileExists = await utils$1.executeFunctionOnFirstSuccessfulIntegration(
+      this.executionDeps,
       this.integrations,
       {
         repoUrl: input.repoUrl,
@@ -695,13 +706,8 @@ class GithubApiService {
     return fileExists;
   }
   async closeImportPR(logger, input) {
-    await utils.executeFunctionOnFirstSuccessfulIntegration(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        config: this.config,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    await utils$1.executeFunctionOnFirstSuccessfulIntegration(
+      this.executionDeps,
       this.integrations,
       {
         repoUrl: input.repoUrl,
@@ -739,13 +745,8 @@ class GithubApiService {
     );
   }
   async deleteImportBranch(input) {
-    await utils.executeFunctionOnFirstSuccessfulIntegration(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        config: this.config,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    await utils$1.executeFunctionOnFirstSuccessfulIntegration(
+      this.executionDeps,
       this.integrations,
       {
         repoUrl: input.repoUrl,
@@ -771,13 +772,8 @@ class GithubApiService {
     );
   }
   async isRepoEmpty(input) {
-    return await utils.executeFunctionOnFirstSuccessfulIntegration(
-      {
-        logger: this.logger,
-        cache: this.cache,
-        config: this.config,
-        githubCredentialsProvider: this.githubCredentialsProvider
-      },
+    return await utils$1.executeFunctionOnFirstSuccessfulIntegration(
+      this.executionDeps,
       this.integrations,
       {
         repoUrl: input.repoUrl,