Skip to content

fix: preserve checked-out repo remote URL in configureGitAuth #966

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

Open
vasilii-bolgar-212 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: preserve checked-out repo remote URL in configureGitAuth #966

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions src/github/operations/git-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,21 @@ export async function configureGitAuth(
console.log("No existing authentication headers to remove");
}

// Update the remote URL to include the token for authentication
// Inject auth token into the existing remote URL, preserving the original
// repo (which may differ from context.repository if a different repo was checked out)
console.log("Updating remote URL with authentication...");
const remoteUrl = `https://x-access-token:${githubToken}@${serverUrl.host}/${context.repository.owner}/${context.repository.repo}.git`;
let remoteUrl: string;
try {
const currentUrl = (await $`git remote get-url origin`.text()).trim();
const parsed = new URL(
currentUrl.endsWith(".git") ? currentUrl : currentUrl + ".git",
);
parsed.username = "x-access-token";
parsed.password = githubToken;
remoteUrl = parsed.toString();
} catch {
remoteUrl = `https://x-access-token:${githubToken}@${serverUrl.host}/${context.repository.owner}/${context.repository.repo}.git`;
}
await $`git remote set-url origin ${remoteUrl}`;
console.log("✓ Updated remote URL with authentication token");

Expand Down