Skip to content

Fix ghe.com compatibility #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elbrenn merged 2 commits into from
Apr 11, 2025
Merged

Fix ghe.com compatibility #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0c4f36
Fix ghe.com compatibility
gustavkj Mar 21, 2025
3a76a0a
Implement review comment suggestion
gustavkj Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/configuration/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export function getGitHubApiUri(): string {
}

if (base.endsWith(".ghe.com")) {
return `api.${base}`;
return base.replace(/^(https?):\/\//, "$1://api.");
} else {
return `${base}/api/v3`;
}
Expand Down
6 changes: 3 additions & 3 deletions src/git/repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ import {Octokit} from "@octokit/rest";
import {canReachGitHubAPI} from "../api/canReachGitHubAPI";
import {handleSamlError} from "../api/handleSamlError";
import {getSession} from "../auth/auth";
import {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";
import {RepositoryPermission, getRepositoryPermission} from "./repository-permissions";
import {getGitHubApiUri} from "../configuration/configuration";

interface GitHubUrls {
workspaceUri: vscode.Uri;
Expand Down Expand Up @@ -78,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(getGitHubApiUri()).host) !== -1))
(useEnterprise() && remote[0].pushUrl?.indexOf(new URL(getGitHubApiUri()).host) !== -1) ||
remote[0].pushUrl?.indexOf(".ghe.com") !== -1)
) {
const url = remote[0].pushUrl;

Expand Down