From 7bf89a840a68a4d3c6246683c80889fd717f2579 Mon Sep 17 00:00:00 2001
From: Andrey Goncharov <aigoncharov@fb.com>
Date: Wed, 2 Feb 2022 03:05:34 -0800
Subject: [PATCH] Remove a circular dependency between KeytarManager and
 FlipperServerImpl

Reviewed By: passy

Differential Revision: D33846051

fbshipit-source-id: c83f5609308ad732a02b2ee55466f5ed0918d733
---
 desktop/flipper-server-core/src/FlipperServerImpl.tsx         | 4 +---
 desktop/flipper-server-core/src/utils/CertificateProvider.tsx | 2 +-
 desktop/flipper-server-core/src/utils/keytar.tsx              | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/desktop/flipper-server-core/src/FlipperServerImpl.tsx b/desktop/flipper-server-core/src/FlipperServerImpl.tsx
index debb9e9f3..424cb31b2 100644
--- a/desktop/flipper-server-core/src/FlipperServerImpl.tsx
+++ b/desktop/flipper-server-core/src/FlipperServerImpl.tsx
@@ -30,7 +30,7 @@ import {launchEmulator} from './devices/android/AndroidDevice';
 import {setFlipperServerConfig} from './FlipperServerConfig';
 import {saveSettings} from './utils/settings';
 import {saveLauncherSettings} from './utils/launcherSettings';
-import {KeytarManager, KeytarModule} from './utils/keytar';
+import {KeytarManager, KeytarModule, SERVICE_FLIPPER} from './utils/keytar';
 import {PluginManager} from './plugins/PluginManager';
 import {runHealthcheck, getHealthChecks} from './utils/runHealthchecks';
 import {openFile} from './utils/openFile';
@@ -50,8 +50,6 @@ import assert from 'assert';
 const {access, copyFile, mkdir, unlink, stat, readlink, readFile, writeFile} =
   promises;
 
-export const SERVICE_FLIPPER = 'flipper.oAuthToken';
-
 /**
  * FlipperServer takes care of all incoming device & client connections.
  * It will set up managers per device type, and create the incoming
diff --git a/desktop/flipper-server-core/src/utils/CertificateProvider.tsx b/desktop/flipper-server-core/src/utils/CertificateProvider.tsx
index 50ad7c13d..7a770555a 100644
--- a/desktop/flipper-server-core/src/utils/CertificateProvider.tsx
+++ b/desktop/flipper-server-core/src/utils/CertificateProvider.tsx
@@ -21,7 +21,6 @@ import archiver from 'archiver';
 import {timeout} from 'flipper-common';
 import {v4 as uuid} from 'uuid';
 import {internGraphPOSTAPIRequest} from '../fb-stubs/internRequests';
-import {SERVICE_FLIPPER} from '../FlipperServerImpl';
 import {getIdbConfig} from '../devices/ios/idbConfig';
 import {assertNotNull} from '../comms/Utilities';
 import {
@@ -33,6 +32,7 @@ import {
   generateClientCertificate,
   getCACertificate,
 } from './certificateUtils';
+import {SERVICE_FLIPPER} from './keytar';
 
 export type CertificateExchangeMedium = 'FS_ACCESS' | 'WWW' | 'NONE';
 
diff --git a/desktop/flipper-server-core/src/utils/keytar.tsx b/desktop/flipper-server-core/src/utils/keytar.tsx
index 55dcd7741..4c81233ed 100644
--- a/desktop/flipper-server-core/src/utils/keytar.tsx
+++ b/desktop/flipper-server-core/src/utils/keytar.tsx
@@ -10,6 +10,8 @@
 import os from 'os';
 import {UserNotSignedInError} from 'flipper-common';
 
+export const SERVICE_FLIPPER = 'flipper.oAuthToken';
+
 export type KeytarModule = {
   getPassword(service: string, username: string): string;
   deletePassword(service: string, username: string): void;