Skip to content

Commit ac8a04f

Browse files
authored
Merge pull request #34 from desktop/remove-unused-env-vars
Remove unused env vars
2 parents f7b91a1 + d38f3fb commit ac8a04f

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

src/desktop-trampoline.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@ if (writeSocket(socket, dataString, strlen(dataString) + 1) != 0) { \
1717

1818
// This is a list of valid environment variables that GitHub Desktop might
1919
// send or expect to receive.
20-
#define NUMBER_OF_VALID_ENV_VARS 4
20+
#define NUMBER_OF_VALID_ENV_VARS 2
2121
static const char *sValidEnvVars[NUMBER_OF_VALID_ENV_VARS] = {
2222
"DESKTOP_TRAMPOLINE_IDENTIFIER",
2323
"DESKTOP_TRAMPOLINE_TOKEN",
24-
"DESKTOP_USERNAME",
25-
"DESKTOP_ENDPOINT",
2624
};
2725

2826
/** Returns 1 if a given env variable is valid, 0 otherwise. */

test/desktop-trampoline.test.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ describe('desktop-trampoline', () => {
4545
const env = {
4646
DESKTOP_TRAMPOLINE_IDENTIFIER: '123456',
4747
DESKTOP_PORT: port,
48-
DESKTOP_USERNAME: 'sergiou87',
49-
DESKTOP_USERNAME_FAKE: 'fake-user',
5048
INVALID_VARIABLE: 'foo bar',
5149
}
5250
const opts = { env }
@@ -57,9 +55,8 @@ describe('desktop-trampoline', () => {
5755
expect(outputArguments).toStrictEqual(['baz'])
5856
// output[2] is the number of env variables
5957
const outputEnv = output.slice(3)
60-
expect(outputEnv).toHaveLength(2)
58+
expect(outputEnv).toHaveLength(1)
6159
expect(outputEnv).toContain('DESKTOP_TRAMPOLINE_IDENTIFIER=123456')
62-
expect(outputEnv).toContain(`DESKTOP_USERNAME=sergiou87`)
6360

6461
server.close()
6562
})

0 commit comments

Comments
 (0)