Merge branch 'main' into separate-helper-trampoline

src/desktop-trampoline.c

@@ -17,12 +17,10 @@ if (writeSocket(socket, dataString, strlen(dataString) + 1) != 0) { \
 
 // This is a list of valid environment variables that GitHub Desktop might
 // send or expect to receive.
-#define NUMBER_OF_VALID_ENV_VARS 4
+#define NUMBER_OF_VALID_ENV_VARS 2
 static const char *sValidEnvVars[NUMBER_OF_VALID_ENV_VARS] = {
   "DESKTOP_TRAMPOLINE_IDENTIFIER",
   "DESKTOP_TRAMPOLINE_TOKEN",
-  "DESKTOP_USERNAME",
-  "DESKTOP_ENDPOINT",
 };
 
 /** Returns 1 if a given env variable is valid, 0 otherwise. */

test/desktop-trampoline.test.js

@@ -45,8 +45,6 @@ describe('desktop-trampoline', () => {
     const env = {
       DESKTOP_TRAMPOLINE_IDENTIFIER: '123456',
       DESKTOP_PORT: port,
-      DESKTOP_USERNAME: 'sergiou87',
-      DESKTOP_USERNAME_FAKE: 'fake-user',
       INVALID_VARIABLE: 'foo bar',
     }
     const opts = { env }
@@ -57,9 +55,8 @@ describe('desktop-trampoline', () => {
     expect(outputArguments).toStrictEqual(['baz'])
     // output[2] is the number of env variables
     const outputEnv = output.slice(3)
-    expect(outputEnv).toHaveLength(2)
+    expect(outputEnv).toHaveLength(1)
     expect(outputEnv).toContain('DESKTOP_TRAMPOLINE_IDENTIFIER=123456')
-    expect(outputEnv).toContain(`DESKTOP_USERNAME=sergiou87`)
 
     server.close()
   })