@backstage/integration 1.13.0 → 1.14.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @backstage/integration
 
+## 1.14.0-next.0
+
+### Minor Changes
+
+- 78c1329: Updated `GitlabUrlReader.readUrl` and `GitlabUrlReader.readTree` to accept a user-provided token, supporting both bearer and private tokens.
+
+### Patch Changes
+
+- c591670: Updated functions for `getHarnessEditContentsUrl`, `getHarnessFileContentsUrl`, `getHarnessArchiveUrl`, `getHarnessLatestCommitUrl` and `parseHarnessUrl` to handle account and org level urls
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 1.13.0
 
 ### Minor Changes

package/dist/gitlab/core.esm.js

@@ -1,16 +1,20 @@
-import { getGitLabIntegrationRelativePath } from './config.esm.js';
 import fetch from 'cross-fetch';
+import { getGitLabIntegrationRelativePath } from './config.esm.js';
 
 async function getGitLabFileFetchUrl(url, config) {
   const projectID = await getProjectId(url, config);
   return buildProjectUrl(url, projectID, config).toString();
 }
-function getGitLabRequestOptions(config) {
-  const { token = "" } = config;
+function getGitLabRequestOptions(config, token) {
+  if (token) {
+    return {
+      headers: token.startsWith("gl") ? { "PRIVATE-TOKEN": token } : { Authorization: `Bearer ${token}` }
+      // Otherwise, it's a bearer token
+    };
+  }
+  const { token: configToken = "" } = config;
   return {
-    headers: {
-      "PRIVATE-TOKEN": token
-    }
+    headers: { "PRIVATE-TOKEN": configToken }
   };
 }
 function buildProjectUrl(target, projectID, config) {

package/dist/gitlab/core.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"core.esm.js","sources":["../../src/gitlab/core.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  getGitLabIntegrationRelativePath,\n  GitLabIntegrationConfig,\n} from './config';\nimport fetch from 'cross-fetch';\n\n/**\n * Given a URL pointing to a file on a provider, returns a URL that is suitable\n * for fetching the contents of the data.\n *\n * @remarks\n *\n * Converts\n * from: https://gitlab.example.com/a/b/blob/master/c.yaml\n * to:   https://gitlab.com/api/v4/projects/projectId/repository/c.yaml?ref=master\n * -or-\n * from: https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/filepath\n * to:   https://gitlab.com/api/v4/projects/projectId/repository/files/filepath?ref=branch\n *\n * @param url - A URL pointing to a file\n * @param config - The relevant provider config\n * @public\n */\nexport async function getGitLabFileFetchUrl(\n  url: string,\n  config: GitLabIntegrationConfig,\n): Promise<string> {\n  const projectID = await getProjectId(url, config);\n  return buildProjectUrl(url, projectID, config).toString();\n}\n\n/**\n * Gets the request options necessary to make requests to a given provider.\n *\n * @param config - The relevant provider config\n * @public\n */\nexport function getGitLabRequestOptions(config: GitLabIntegrationConfig): {\n  headers: Record<string, string>;\n} {\n  const { token = '' } = config;\n  return {\n    headers: {\n      'PRIVATE-TOKEN': token,\n    },\n  };\n}\n\n// Converts\n// from: https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/filepath\n// to:   https://gitlab.com/api/v4/projects/projectId/repository/files/filepath?ref=branch\nexport function buildProjectUrl(\n  target: string,\n  projectID: Number,\n  config: GitLabIntegrationConfig,\n): URL {\n  try {\n    const url = new URL(target);\n\n    const branchAndFilePath = url.pathname\n      .split('/blob/')\n      .slice(1)\n      .join('/blob/');\n    const [branch, ...filePath] = branchAndFilePath.split('/');\n    const relativePath = getGitLabIntegrationRelativePath(config);\n\n    url.pathname = [\n      ...(relativePath ? [relativePath] : []),\n      'api/v4/projects',\n      projectID,\n      'repository/files',\n      encodeURIComponent(decodeURIComponent(filePath.join('/'))),\n      'raw',\n    ].join('/');\n\n    url.search = `?ref=${branch}`;\n\n    return url;\n  } catch (e) {\n    throw new Error(`Incorrect url: ${target}, ${e}`);\n  }\n}\n\n// Convert\n// from: https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/filepath\n// to:   The project ID that corresponds to the URL\nexport async function getProjectId(\n  target: string,\n  config: GitLabIntegrationConfig,\n): Promise<number> {\n  const url = new URL(target);\n\n  if (!url.pathname.includes('/blob/')) {\n    throw new Error('Please provide full path to yaml file from GitLab');\n  }\n\n  try {\n    let repo = url.pathname.split('/-/blob/')[0].split('/blob/')[0];\n\n    // Get gitlab relative path\n    const relativePath = getGitLabIntegrationRelativePath(config);\n\n    // Check relative path exist and replace it if it's the case.\n    if (relativePath) {\n      repo = repo.replace(relativePath, '');\n    }\n\n    // Convert\n    // to: https://gitlab.com/api/v4/projects/groupA%2Fteams%2FsubgroupA%2FteamA%2Frepo\n    const repoIDLookup = new URL(\n      `${url.origin}${relativePath}/api/v4/projects/${encodeURIComponent(\n        repo.replace(/^\\//, ''),\n      )}`,\n    );\n\n    const response = await fetch(\n      repoIDLookup.toString(),\n      getGitLabRequestOptions(config),\n    );\n\n    const data = await response.json();\n\n    if (!response.ok) {\n      throw new Error(\n        `GitLab Error '${data.error}', ${data.error_description}`,\n      );\n    }\n\n    return Number(data.id);\n  } catch (e) {\n    throw new Error(`Could not get GitLab project ID for: ${target}, ${e}`);\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.esm.js","sources":["../../src/gitlab/core.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport fetch from 'cross-fetch';\nimport {\n  getGitLabIntegrationRelativePath,\n  GitLabIntegrationConfig,\n} from './config';\n\n/**\n * Given a URL pointing to a file on a provider, returns a URL that is suitable\n * for fetching the contents of the data.\n *\n * @remarks\n *\n * Converts\n * from: https://gitlab.example.com/a/b/blob/master/c.yaml\n * to:   https://gitlab.com/api/v4/projects/projectId/repository/c.yaml?ref=master\n * -or-\n * from: https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/filepath\n * to:   https://gitlab.com/api/v4/projects/projectId/repository/files/filepath?ref=branch\n *\n * @param url - A URL pointing to a file\n * @param config - The relevant provider config\n * @public\n */\nexport async function getGitLabFileFetchUrl(\n  url: string,\n  config: GitLabIntegrationConfig,\n): Promise<string> {\n  const projectID = await getProjectId(url, config);\n  return buildProjectUrl(url, projectID, config).toString();\n}\n\n/**\n * Gets the request options necessary to make requests to a given provider.\n *\n * @param config - The relevant provider config\n * @public\n */\nexport function getGitLabRequestOptions(\n  config: GitLabIntegrationConfig,\n  token?: string,\n): { headers: Record<string, string> } {\n  if (token) {\n    // If token comes from the user and starts with \"gl\", it's a private token (see https://docs.gitlab.com/ee/security/token_overview.html#token-prefixes)\n    return {\n      headers: token.startsWith('gl')\n        ? { 'PRIVATE-TOKEN': token }\n        : { Authorization: `Bearer ${token}` }, // Otherwise, it's a bearer token\n    };\n  }\n\n  // If token not provided, fetch the integration token\n  const { token: configToken = '' } = config;\n  return {\n    headers: { 'PRIVATE-TOKEN': configToken },\n  };\n}\n\n// Converts\n// from: https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/filepath\n// to:   https://gitlab.com/api/v4/projects/projectId/repository/files/filepath?ref=branch\nexport function buildProjectUrl(\n  target: string,\n  projectID: Number,\n  config: GitLabIntegrationConfig,\n): URL {\n  try {\n    const url = new URL(target);\n\n    const branchAndFilePath = url.pathname\n      .split('/blob/')\n      .slice(1)\n      .join('/blob/');\n    const [branch, ...filePath] = branchAndFilePath.split('/');\n    const relativePath = getGitLabIntegrationRelativePath(config);\n\n    url.pathname = [\n      ...(relativePath ? [relativePath] : []),\n      'api/v4/projects',\n      projectID,\n      'repository/files',\n      encodeURIComponent(decodeURIComponent(filePath.join('/'))),\n      'raw',\n    ].join('/');\n\n    url.search = `?ref=${branch}`;\n\n    return url;\n  } catch (e) {\n    throw new Error(`Incorrect url: ${target}, ${e}`);\n  }\n}\n\n// Convert\n// from: https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/filepath\n// to:   The project ID that corresponds to the URL\nexport async function getProjectId(\n  target: string,\n  config: GitLabIntegrationConfig,\n): Promise<number> {\n  const url = new URL(target);\n\n  if (!url.pathname.includes('/blob/')) {\n    throw new Error('Please provide full path to yaml file from GitLab');\n  }\n\n  try {\n    let repo = url.pathname.split('/-/blob/')[0].split('/blob/')[0];\n\n    // Get gitlab relative path\n    const relativePath = getGitLabIntegrationRelativePath(config);\n\n    // Check relative path exist and replace it if it's the case.\n    if (relativePath) {\n      repo = repo.replace(relativePath, '');\n    }\n\n    // Convert\n    // to: https://gitlab.com/api/v4/projects/groupA%2Fteams%2FsubgroupA%2FteamA%2Frepo\n    const repoIDLookup = new URL(\n      `${url.origin}${relativePath}/api/v4/projects/${encodeURIComponent(\n        repo.replace(/^\\//, ''),\n      )}`,\n    );\n\n    const response = await fetch(\n      repoIDLookup.toString(),\n      getGitLabRequestOptions(config),\n    );\n\n    const data = await response.json();\n\n    if (!response.ok) {\n      throw new Error(\n        `GitLab Error '${data.error}', ${data.error_description}`,\n      );\n    }\n\n    return Number(data.id);\n  } catch (e) {\n    throw new Error(`Could not get GitLab project ID for: ${target}, ${e}`);\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/harness/core.esm.js

@@ -1,18 +1,18 @@
 function getHarnessEditContentsUrl(config, url) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/ng/account/${parsedUrl.accountId}/module/code/orgs/${parsedUrl.orgName}/projects/${parsedUrl.projectName}/repos/${parsedUrl.repoName}/files/${parsedUrl.branch}/~/${parsedUrl.path}`;
+  return `${parsedUrl.baseUrl}/ng/account/${parsedUrl.accountId}/module/code${parsedUrl.orgName !== "" ? `/orgs/${parsedUrl.orgName}` : ""}${parsedUrl.projectName !== "" ? `/projects/${parsedUrl.projectName}` : ""}/repos/${parsedUrl.repoName}/files/${parsedUrl.branch}/~/${parsedUrl.path}`;
 }
 function getHarnessFileContentsUrl(config, url) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/raw/${parsedUrl.path}?routingId=${parsedUrl.accountId}&git_ref=refs/heads/${parsedUrl.refString}`;
+  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}${parsedUrl.projectName !== "" ? `/${parsedUrl.projectName}/` : "/"}${parsedUrl.repoName}/+/raw/${parsedUrl.path}?routingId=${parsedUrl.accountId}&git_ref=refs/heads/${parsedUrl.refString}`;
 }
 function getHarnessArchiveUrl(config, url) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/archive/${parsedUrl.branch}.zip?routingId=${parsedUrl.accountId}`;
+  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}${parsedUrl.projectName !== "" ? `/${parsedUrl.projectName}/` : "/"}${parsedUrl.repoName}/+/archive/${parsedUrl.branch}.zip?routingId=${parsedUrl.accountId}`;
 }
 function getHarnessLatestCommitUrl(config, url) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/content?routingId=${parsedUrl.accountId}&include_commit=true&git_ref=refs/heads/${parsedUrl.branch}`;
+  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}${parsedUrl.projectName !== "" ? `/${parsedUrl.projectName}/` : "/"}${parsedUrl.repoName}/+/content?routingId=${parsedUrl.accountId}&include_commit=true&git_ref=refs/heads/${parsedUrl.branch}`;
 }
 function getHarnessRequestOptions(config) {
   const headers = {};
@@ -32,23 +32,16 @@ function parseHarnessUrl(config, url) {
     const pathUrl = new URL(url);
     const pathSegments = pathUrl.pathname.split("/").filter((segment) => segment !== "");
     const urlParts = pathUrl.pathname.split("/");
-    const [
-      _ng,
-      _account,
-      accountId,
-      _module,
-      _moduleName,
-      _org,
-      orgName,
-      _projects,
-      projectName,
-      _repos,
-      repoName,
-      _files,
-      _ref,
-      _branch,
-      ..._path
-    ] = pathSegments;
+    const accountIdIndex = pathSegments.findIndex((segment) => segment === "account") + 1;
+    const accountId = pathSegments[accountIdIndex];
+    const orgNameIndex = pathSegments.findIndex((segment) => segment === "orgs");
+    const orgName = orgNameIndex !== -1 ? pathSegments[orgNameIndex + 1] : "";
+    const projectNameIndex = pathSegments.findIndex(
+      (segment) => segment === "projects"
+    );
+    const projectName = projectNameIndex !== -1 ? pathSegments[projectNameIndex + 1] : "";
+    const repoNameIndex = pathSegments.findIndex((segment) => segment === "repos") + 1;
+    const repoName = pathSegments[repoNameIndex];
     const refAndPath = urlParts.slice(
       urlParts.findIndex((i) => i === "files" || i === "edit") + 1
     );

package/dist/harness/core.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"core.esm.js","sources":["../../src/harness/core.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { HarnessIntegrationConfig } from './config';\n\n/**\n * Given a URL pointing to a file, returns a URL\n * for editing the contents of the data.\n *\n * @remarks\n *\n * Converts\n * from: https://app.harness.io/a/b/src/branchname/path/to/c.yaml\n * or:   https://app.harness.io/a/b/_edit/branchname/path/to/c.yaml\n *\n * @param url - A URL pointing to a file\n * @param config - The relevant provider config\n * @public\n */\nexport function getHarnessEditContentsUrl(\n  config: HarnessIntegrationConfig,\n  url: string,\n) {\n  const parsedUrl = parseHarnessUrl(config, url);\n  return `${parsedUrl.baseUrl}/ng/account/${parsedUrl.accountId}/module/code/orgs/${parsedUrl.orgName}/projects/${parsedUrl.projectName}/repos/${parsedUrl.repoName}/files/${parsedUrl.branch}/~/${parsedUrl.path}`;\n}\n\n/**\n * Given a file path URL,\n * it returns an API URL which returns the contents of the file .\n * @remarks\n *\n * Converts\n * from: https://app.harness.io/ng/account/accountId/module/code/orgs/orgName/projects/projName/repos/repoName/files/refMain/~/all-apis.yaml\n * to:   https://app.harness.io/gateway/code/api/v1/repos/accountId/orgName/projName/repoName/+/content/all-apis.yaml?routingId=accountId&include_commit=false&ref=refMain\n *\n * @param url - A URL pointing to a file\n * @param config - The relevant provider config\n * @public\n */\nexport function getHarnessFileContentsUrl(\n  config: HarnessIntegrationConfig,\n  url: string,\n) {\n  const parsedUrl = parseHarnessUrl(config, url);\n  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/raw/${parsedUrl.path}?routingId=${parsedUrl.accountId}&git_ref=refs/heads/${parsedUrl.refString}`;\n}\n\n/**\n * Given a URL pointing to a repository/path, returns a URL\n * for archive contents of the repository.\n *\n * @remarks\n *\n * Converts\n * from: https://qa.harness.io/ng/account/accountId/module/code/orgs/orgId/projects/projectName/repos/repoName/files/branch/~/fileName\n * to:   https://qa.harness.io/gateway/code/api/v1/repos/accountId/orgId/projectName/repoName/+/archive/branch.zip?routingId=accountId\n *\n * @param url - A URL pointing to a repository/path\n * @param config - The relevant provider config\n * @public\n */\nexport function getHarnessArchiveUrl(\n  config: HarnessIntegrationConfig,\n  url: string,\n) {\n  const parsedUrl = parseHarnessUrl(config, url);\n  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/archive/${parsedUrl.branch}.zip?routingId=${parsedUrl.accountId}`;\n}\n\n/**\n * Given a URL pointing to a repository branch, returns a URL\n * for latest commit information.\n *\n * @remarks\n *\n * Converts\n * from: https://app.harness.io/ng/account/accountId/module/code/orgs/orgName/projects/projectName/repos/repoName/files/branchName\n * to:   https://app.harness.io/gateway/code/api/v1/repos/accountId/orgName/projectName/repoName/+/content?routingId=accountId&include_commit=true&git_ref=refs/heads/branchName\n *\n * @param url - A URL pointing to a repository branch\n * @param config - The relevant provider config\n * @public\n */\nexport function getHarnessLatestCommitUrl(\n  config: HarnessIntegrationConfig,\n  url: string,\n) {\n  const parsedUrl = parseHarnessUrl(config, url);\n  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/content?routingId=${parsedUrl.accountId}&include_commit=true&git_ref=refs/heads/${parsedUrl.branch}`;\n}\n\n/**\n * Return request headers for a Harness Code provider.\n *\n * @param config - A Harness Code provider config\n * @public\n */\nexport function getHarnessRequestOptions(config: HarnessIntegrationConfig): {\n  headers?: Record<string, string>;\n} {\n  const headers: Record<string, string> = {};\n  const { token, apiKey } = config;\n\n  if (apiKey) {\n    headers['x-api-key'] = apiKey;\n  } else if (token) {\n    headers.Authorization = `Bearer ${token}`;\n  }\n\n  return {\n    headers,\n  };\n}\n\n/**\n * Return parsed git url properties.\n *\n * @param config - A Harness provider config\n * @param url - A URL pointing to a repository\n * @public\n */\nexport function parseHarnessUrl(\n  config: HarnessIntegrationConfig,\n  url: string,\n): {\n  baseUrl: string;\n  accountId: string;\n  orgName: string;\n  projectName: string;\n  refString: string;\n  repoName: string;\n  path: string;\n  refDashStr: string;\n  branch: string;\n} {\n  const baseUrl = `https://${config.host}`;\n  try {\n    const pathUrl = new URL(url);\n    const pathSegments = pathUrl.pathname\n      .split('/')\n      .filter(segment => segment !== '');\n    const urlParts = pathUrl.pathname.split('/');\n    const [\n      _ng,\n      _account,\n      accountId,\n      _module,\n      _moduleName,\n      _org,\n      orgName,\n      _projects,\n      projectName,\n      _repos,\n      repoName,\n      _files,\n      _ref,\n      _branch,\n      ..._path\n    ] = pathSegments;\n    const refAndPath = urlParts.slice(\n      urlParts.findIndex(i => i === 'files' || i === 'edit') + 1,\n    );\n    const refIndex = refAndPath.findIndex(item => item === '~');\n    const refString = refAndPath.slice(0, refIndex).join('/');\n    const pathWithoutSlash =\n      refIndex !== -1\n        ? refAndPath\n            .slice(refIndex + 1)\n            .join('/')\n            .replace(/^\\//, '')\n        : '';\n    return {\n      baseUrl: baseUrl,\n      accountId: accountId,\n      orgName: orgName,\n      projectName: projectName,\n      refString: refString,\n      path: pathWithoutSlash,\n      repoName: repoName,\n      refDashStr: refAndPath.slice(0, refIndex).join('-'),\n      branch:\n        refIndex !== -1\n          ? refAndPath.slice(0, refIndex).join('/')\n          : refAndPath.join('/'),\n    };\n  } catch (e) {\n    throw new Error(`Incorrect URL: ${url}, ${e}`);\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.esm.js","sources":["../../src/harness/core.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { HarnessIntegrationConfig } from './config';\n\n/**\n * Given a URL pointing to a file, returns a URL\n * for editing the contents of the data.\n *\n * @remarks\n *\n * Converts\n * from: https://app.harness.io/a/b/src/branchname/path/to/c.yaml\n * or:   https://app.harness.io/a/b/_edit/branchname/path/to/c.yaml\n *\n * @param url - A URL pointing to a file\n * @param config - The relevant provider config\n * @public\n */\nexport function getHarnessEditContentsUrl(\n  config: HarnessIntegrationConfig,\n  url: string,\n) {\n  const parsedUrl = parseHarnessUrl(config, url);\n\n  return `${parsedUrl.baseUrl}/ng/account/${parsedUrl.accountId}/module/code${\n    parsedUrl.orgName !== '' ? `/orgs/${parsedUrl.orgName}` : ''\n  }${\n    parsedUrl.projectName !== '' ? `/projects/${parsedUrl.projectName}` : ''\n  }/repos/${parsedUrl.repoName}/files/${parsedUrl.branch}/~/${parsedUrl.path}`;\n}\n\n/**\n * Given a file path URL,\n * it returns an API URL which returns the contents of the file .\n * @remarks\n *\n * Converts\n * from: https://app.harness.io/ng/account/accountId/module/code/orgs/orgName/projects/projName/repos/repoName/files/refMain/~/all-apis.yaml\n *       https://qa.harness.io/ng/account/bDCAuAjFSJCLFj_0ug3lCg/module/code/orgs/HiteshTest/repos/impoorter/files/main/~/catalog.yaml\n * to:   https://app.harness.io/gateway/code/api/v1/repos/accountId/orgName/projName/repoName/+/content/all-apis.yaml?routingId=accountId&include_commit=false&ref=refMain\n *\n * @param url - A URL pointing to a file\n * @param config - The relevant provider config\n * @public\n */\nexport function getHarnessFileContentsUrl(\n  config: HarnessIntegrationConfig,\n  url: string,\n) {\n  const parsedUrl = parseHarnessUrl(config, url);\n\n  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${\n    parsedUrl.accountId\n  }/${parsedUrl.orgName}${\n    parsedUrl.projectName !== '' ? `/${parsedUrl.projectName}/` : '/'\n  }${parsedUrl.repoName}/+/raw/${parsedUrl.path}?routingId=${\n    parsedUrl.accountId\n  }&git_ref=refs/heads/${parsedUrl.refString}`;\n}\n\n/**\n * Given a URL pointing to a repository/path, returns a URL\n * for archive contents of the repository.\n *\n * @remarks\n *\n * Converts\n * from: https://qa.harness.io/ng/account/accountId/module/code/orgs/orgId/projects/projectName/repos/repoName/files/branch/~/fileName\n * to:   https://qa.harness.io/gateway/code/api/v1/repos/accountId/orgId/projectName/repoName/+/archive/branch.zip?routingId=accountId\n *\n * @param url - A URL pointing to a repository/path\n * @param config - The relevant provider config\n * @public\n */\nexport function getHarnessArchiveUrl(\n  config: HarnessIntegrationConfig,\n  url: string,\n) {\n  const parsedUrl = parseHarnessUrl(config, url);\n  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${\n    parsedUrl.accountId\n  }/${parsedUrl.orgName}${\n    parsedUrl.projectName !== '' ? `/${parsedUrl.projectName}/` : '/'\n  }${parsedUrl.repoName}/+/archive/${parsedUrl.branch}.zip?routingId=${\n    parsedUrl.accountId\n  }`;\n}\n\n/**\n * Given a URL pointing to a repository branch, returns a URL\n * for latest commit information.\n *\n * @remarks\n *\n * Converts\n * from: https://app.harness.io/ng/account/accountId/module/code/orgs/orgName/projects/projectName/repos/repoName/files/branchName\n * to:   https://app.harness.io/gateway/code/api/v1/repos/accountId/orgName/projectName/repoName/+/content?routingId=accountId&include_commit=true&git_ref=refs/heads/branchName\n *\n * @param url - A URL pointing to a repository branch\n * @param config - The relevant provider config\n * @public\n */\nexport function getHarnessLatestCommitUrl(\n  config: HarnessIntegrationConfig,\n  url: string,\n) {\n  const parsedUrl = parseHarnessUrl(config, url);\n  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${\n    parsedUrl.accountId\n  }/${parsedUrl.orgName}${\n    parsedUrl.projectName !== '' ? `/${parsedUrl.projectName}/` : '/'\n  }${parsedUrl.repoName}/+/content?routingId=${\n    parsedUrl.accountId\n  }&include_commit=true&git_ref=refs/heads/${parsedUrl.branch}`;\n}\n\n/**\n * Return request headers for a Harness Code provider.\n *\n * @param config - A Harness Code provider config\n * @public\n */\nexport function getHarnessRequestOptions(config: HarnessIntegrationConfig): {\n  headers?: Record<string, string>;\n} {\n  const headers: Record<string, string> = {};\n  const { token, apiKey } = config;\n\n  if (apiKey) {\n    headers['x-api-key'] = apiKey;\n  } else if (token) {\n    headers.Authorization = `Bearer ${token}`;\n  }\n\n  return {\n    headers,\n  };\n}\n\n/**\n * Return parsed git url properties.\n *\n * @param config - A Harness provider config\n * @param url - A URL pointing to a repository\n * @public\n */\nexport function parseHarnessUrl(\n  config: HarnessIntegrationConfig,\n  url: string,\n): {\n  baseUrl: string;\n  accountId: string;\n  orgName: string;\n  projectName: string;\n  refString: string;\n  repoName: string;\n  path: string;\n  refDashStr: string;\n  branch: string;\n} {\n  const baseUrl = `https://${config.host}`;\n  try {\n    const pathUrl = new URL(url);\n    const pathSegments = pathUrl.pathname\n      .split('/')\n      .filter(segment => segment !== '');\n    const urlParts = pathUrl.pathname.split('/');\n\n    const accountIdIndex =\n      pathSegments.findIndex(segment => segment === 'account') + 1;\n    const accountId = pathSegments[accountIdIndex];\n\n    const orgNameIndex = pathSegments.findIndex(segment => segment === 'orgs');\n    const orgName = orgNameIndex !== -1 ? pathSegments[orgNameIndex + 1] : '';\n\n    const projectNameIndex = pathSegments.findIndex(\n      segment => segment === 'projects',\n    );\n\n    const projectName =\n      projectNameIndex !== -1 ? pathSegments[projectNameIndex + 1] : '';\n\n    const repoNameIndex =\n      pathSegments.findIndex(segment => segment === 'repos') + 1;\n    const repoName = pathSegments[repoNameIndex];\n\n    const refAndPath = urlParts.slice(\n      urlParts.findIndex(i => i === 'files' || i === 'edit') + 1,\n    );\n    const refIndex = refAndPath.findIndex(item => item === '~');\n\n    const refString = refAndPath.slice(0, refIndex).join('/');\n    const pathWithoutSlash =\n      refIndex !== -1\n        ? refAndPath\n            .slice(refIndex + 1)\n            .join('/')\n            .replace(/^\\//, '')\n        : '';\n\n    return {\n      baseUrl: baseUrl,\n      accountId: accountId,\n      orgName: orgName,\n      projectName: projectName,\n      refString: refString,\n      path: pathWithoutSlash,\n      repoName: repoName,\n      refDashStr: refAndPath.slice(0, refIndex).join('-'),\n      branch:\n        refIndex !== -1\n          ? refAndPath.slice(0, refIndex).join('/')\n          : refAndPath.join('/'),\n    };\n  } catch (e) {\n    throw new Error(`Incorrect URL: ${url}, ${e}`);\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/index.cjs.js

@@ -1927,12 +1927,16 @@ async function getGitLabFileFetchUrl(url, config) {
   const projectID = await getProjectId(url, config);
   return buildProjectUrl(url, projectID, config).toString();
 }
-function getGitLabRequestOptions(config) {
-  const { token = "" } = config;
+function getGitLabRequestOptions(config, token) {
+  if (token) {
+    return {
+      headers: token.startsWith("gl") ? { "PRIVATE-TOKEN": token } : { Authorization: `Bearer ${token}` }
+      // Otherwise, it's a bearer token
+    };
+  }
+  const { token: configToken = "" } = config;
   return {
-    headers: {
-      "PRIVATE-TOKEN": token
-    }
+    headers: { "PRIVATE-TOKEN": configToken }
   };
 }
 function buildProjectUrl(target, projectID, config) {
@@ -2094,19 +2098,19 @@ function readHarnessConfig(config) {
 
 function getHarnessEditContentsUrl(config, url) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/ng/account/${parsedUrl.accountId}/module/code/orgs/${parsedUrl.orgName}/projects/${parsedUrl.projectName}/repos/${parsedUrl.repoName}/files/${parsedUrl.branch}/~/${parsedUrl.path}`;
+  return `${parsedUrl.baseUrl}/ng/account/${parsedUrl.accountId}/module/code${parsedUrl.orgName !== "" ? `/orgs/${parsedUrl.orgName}` : ""}${parsedUrl.projectName !== "" ? `/projects/${parsedUrl.projectName}` : ""}/repos/${parsedUrl.repoName}/files/${parsedUrl.branch}/~/${parsedUrl.path}`;
 }
 function getHarnessFileContentsUrl(config, url) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/raw/${parsedUrl.path}?routingId=${parsedUrl.accountId}&git_ref=refs/heads/${parsedUrl.refString}`;
+  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}${parsedUrl.projectName !== "" ? `/${parsedUrl.projectName}/` : "/"}${parsedUrl.repoName}/+/raw/${parsedUrl.path}?routingId=${parsedUrl.accountId}&git_ref=refs/heads/${parsedUrl.refString}`;
 }
 function getHarnessArchiveUrl(config, url) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/archive/${parsedUrl.branch}.zip?routingId=${parsedUrl.accountId}`;
+  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}${parsedUrl.projectName !== "" ? `/${parsedUrl.projectName}/` : "/"}${parsedUrl.repoName}/+/archive/${parsedUrl.branch}.zip?routingId=${parsedUrl.accountId}`;
 }
 function getHarnessLatestCommitUrl(config, url) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/content?routingId=${parsedUrl.accountId}&include_commit=true&git_ref=refs/heads/${parsedUrl.branch}`;
+  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}${parsedUrl.projectName !== "" ? `/${parsedUrl.projectName}/` : "/"}${parsedUrl.repoName}/+/content?routingId=${parsedUrl.accountId}&include_commit=true&git_ref=refs/heads/${parsedUrl.branch}`;
 }
 function getHarnessRequestOptions(config) {
   const headers = {};
@@ -2126,23 +2130,16 @@ function parseHarnessUrl(config, url) {
     const pathUrl = new URL(url);
     const pathSegments = pathUrl.pathname.split("/").filter((segment) => segment !== "");
     const urlParts = pathUrl.pathname.split("/");
-    const [
-      _ng,
-      _account,
-      accountId,
-      _module,
-      _moduleName,
-      _org,
-      orgName,
-      _projects,
-      projectName,
-      _repos,
-      repoName,
-      _files,
-      _ref,
-      _branch,
-      ..._path
-    ] = pathSegments;
+    const accountIdIndex = pathSegments.findIndex((segment) => segment === "account") + 1;
+    const accountId = pathSegments[accountIdIndex];
+    const orgNameIndex = pathSegments.findIndex((segment) => segment === "orgs");
+    const orgName = orgNameIndex !== -1 ? pathSegments[orgNameIndex + 1] : "";
+    const projectNameIndex = pathSegments.findIndex(
+      (segment) => segment === "projects"
+    );
+    const projectName = projectNameIndex !== -1 ? pathSegments[projectNameIndex + 1] : "";
+    const repoNameIndex = pathSegments.findIndex((segment) => segment === "repos") + 1;
+    const repoName = pathSegments[repoNameIndex];
     const refAndPath = urlParts.slice(
       urlParts.findIndex((i) => i === "files" || i === "edit") + 1
     );