Implement review comment suggestion

Author: gustavkj

src/configuration/configuration.ts

@@ -68,16 +68,6 @@ export function useEnterprise(): boolean {
   return getConfiguration().get<boolean>(getSettingsKey("use-enterprise"), false);
 }
 
-export function getGithubUri(): string {
-  const apiUri = getGitHubApiUri();
-
-  if (apiUri === DEFAULT_GITHUB_API || apiUri.endsWith(".ghe.com")) {
-    return apiUri.replace(/^(https?):\/\/api\./, "$1://");
-  }
-
-  return apiUri.replace(/\/api\/v3$/, "");
-}
-
 export function getGitHubApiUri(): string {
   if (!useEnterprise()) return DEFAULT_GITHUB_API;
   const base = getConfiguration().get<string>("github-enterprise.uri", DEFAULT_GITHUB_API).replace(/\/$/, "");

src/git/repository.ts

@@ -4,7 +4,7 @@ import {Octokit} from "@octokit/rest";
 import {canReachGitHubAPI} from "../api/canReachGitHubAPI";
 import {handleSamlError} from "../api/handleSamlError";
 import {getSession} from "../auth/auth";
-import {getGithubUri, getRemoteName, useEnterprise} from "../configuration/configuration";
+import {getGitHubApiUri, getRemoteName, useEnterprise} from "../configuration/configuration";
 import {Protocol} from "../external/protocol";
 import {logDebug, logError} from "../log";
 import {API, GitExtension, RefType, RepositoryState} from "../typings/git";
@@ -77,7 +77,8 @@ export async function getGitHubUrls(): Promise<GitHubUrls[] | null> {
         if (
           remote.length > 0 &&
           (remote[0].pushUrl?.indexOf("github.com") !== -1 ||
-            (useEnterprise() && remote[0].pushUrl?.indexOf(new URL(getGithubUri()).host) !== -1))
+            (useEnterprise() && remote[0].pushUrl?.indexOf(new URL(getGitHubApiUri()).host) !== -1) ||
+            remote[0].pushUrl?.indexOf(".ghe.com") !== -1)
         ) {
           const url = remote[0].pushUrl;