development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-06-30 22:54:41 +00:00
Code Issues Projects Releases Wiki Activity

Use the right login for git askpass

Browse Source
This commit is contained in:
Sergio Padrino 2024-05-08 17:45:05 +02:00
parent 2d697532b4
commit 26a7ebd3dc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/lib/trampoline/trampoline-askpass-handler.ts
View File

@ -175,7 +175,7 @@ const handleAskPassUserPassword = async (
const warn = (msg: string) => log.warn(`askPassHandler: ${msg}`)
const { trampolineToken } = command
const { origin, hostname, username: urlUsername } = new URL(remoteUrl)
const { origin, hostname } = new URL(remoteUrl)
const account = await findAccount(trampolineToken, accountsStore, origin)
if (!account) {
@ -222,11 +222,13 @@ const handleAskPassUserPassword = async (
debug(`${accountKind} username for ${origin} found`)
return account.login
} else if (kind === 'Password') {
const login = urlUsername ? urlUsername : account.login
const token =
account instanceof Account && account.token.length > 0
? account.token
: await TokenStore.getItem(getKeyForEndpoint(account.endpoint), login)
: await TokenStore.getItem(
getKeyForEndpoint(account.endpoint),
account.login
)
if (token) {
debug(`${accountKind} password for ${origin} found`)