development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-19 08:02:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify trampoline command parsing: pick identifier from env

Browse source
This commit is contained in:
Sergio Padrino 2021-01-26 18:04:29 +01:00
parent 2151b42920
commit d8dcb45248
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/lib/git/authentication.ts
View file

@ -8,7 +8,7 @@ export function envForAuthentication(auth: IGitAccount | null): Object {
const env = {
DESKTOP_PATH: process.execPath,
DESKTOP_ASKPASS_SCRIPT: getAskPassScriptPath(),
DESKTOP_IDENTIFIER: 'ASKPASS',
DESKTOP_TRAMPOLINE_IDENTIFIER: 'ASKPASS',
GIT_ASKPASS: getAskPassTrampolinePath(),
// supported since Git 2.3, this is used to ensure we never interactively prompt
// for credentials - even as a fallback

18
app/src/lib/trampoline/trampoline-server.ts
View file

@ -9,7 +9,6 @@ interface ITrampolineCommand {
}
enum TrampolineCommandParserState {
Identifier,
ParameterCount,
Parameters,
EnvironmentVariablesCount,
@ -18,14 +17,13 @@ enum TrampolineCommandParserState {
}
class TrampolineCommandParser {
private identifier: string | null = null
private parameterCount: number = 0
private readonly parameters: string[] = []
private environmentVariablesCount: number = 0
private readonly environmentVariables = new Map<string, string>()
private state: TrampolineCommandParserState =
TrampolineCommandParserState.Identifier
TrampolineCommandParserState.ParameterCount
public hasFinished() {
return this.state === TrampolineCommandParserState.Finished
@ -33,12 +31,6 @@ class TrampolineCommandParser {
public processValue(value: string) {
switch (this.state) {
case TrampolineCommandParserState.Identifier:
this.identifier = value
console.log(`Trampoline parsed identifier ${value}`)
this.state = TrampolineCommandParserState.ParameterCount
break
case TrampolineCommandParserState.ParameterCount:
this.parameterCount = parseInt(value)
console.log(`Trampoline parsed parameterCount ${value}`)
@ -108,10 +100,12 @@ class TrampolineCommandParser {
)
}
const identifier = this.identifier
const identifier = this.environmentVariables.get(
'DESKTOP_TRAMPOLINE_IDENTIFIER'
)
if (identifier === null) {
throw new Error('The command identifier cannot be null')
if (identifier === undefined) {
throw new Error('The command identifier is missing')
}
return {