From c347fae7c10e2813a3c10429e3b82be18753533c Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Thu, 8 Jun 2023 07:17:12 -0700 Subject: [PATCH] Use getAuthToken utility function instead Summary: ^ Reviewed By: mweststrate Differential Revision: D46557801 fbshipit-source-id: 2a83613afd9482ff4ed0abe5aaaf9675ef73bc49 --- desktop/flipper-server/src/index.tsx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/desktop/flipper-server/src/index.tsx b/desktop/flipper-server/src/index.tsx index 74c604b2b..6c6ac7d47 100644 --- a/desktop/flipper-server/src/index.tsx +++ b/desktop/flipper-server/src/index.tsx @@ -234,8 +234,6 @@ async function start() { await attachDevServer(app, server, socket, rootPath); } await readyForIncomingConnections(flipperServer, companionEnv); - - return flipperServer; } process.on('uncaughtException', (error) => { @@ -256,7 +254,7 @@ process.on('unhandledRejection', (reason, promise) => { }); start() - .then(async (flipperServer) => { + .then(async () => { if (!argv.tcp) { return; } @@ -264,11 +262,8 @@ start() console.log('[flipper-server] listening at port ' + chalk.green(argv.port)); let token: string | undefined; - if (flipperServer) { + if (await hasAuthToken()) { token = await getAuthToken(); - } else { - const tokenPath = path.resolve(staticPath, 'auth.token'); - token = await fs.readFile(tokenPath, 'utf-8'); } const searchParams = new URLSearchParams({token: token ?? ''});