Move certificate exchange bits to app-connectivity

Summary: Bit of reorganising as utils is a bit too generic and crowded.

Reviewed By: passy

Differential Revision: D47186536

fbshipit-source-id: 7b1dd26db95aef00778ff4f23d91f7371c4d07ad

desktop/flipper-server-core/src/app-connectivity/ServerController.tsx

@@ -17,7 +17,7 @@ import {
   reportPlatformFailures,
   FlipperServerEvents,
 } from 'flipper-common';
-import CertificateProvider from '../utils/CertificateProvider';
+import CertificateProvider from './certificate-exchange/CertificateProvider';
 import {ClientConnection, ConnectionStatus} from './ClientConnection';
 import {EventEmitter} from 'events';
 import invariant from 'invariant';
@@ -44,7 +44,7 @@ import {
 import {
   extractAppNameFromCSR,
   loadSecureServerConfig,
-} from '../utils/certificateUtils';
+} from './certificate-exchange/certificate-utils';
 import DesktopCertificateProvider from '../devices/desktop/DesktopCertificateProvider';
 import WWWCertificateProvider from '../fb-stubs/WWWCertificateProvider';
 import {tracker} from '../utils/tracker';

desktop/flipper-server-core/src/app-connectivity/ServerFactory.tsx

@@ -7,7 +7,7 @@
  * @format
  */
 
-import {SecureServerConfig} from '../utils/certificateUtils';
+import {SecureServerConfig} from './certificate-exchange/certificate-utils';
 import ServerWebSocketBase, {ServerEventsListener} from './ServerWebSocketBase';
 import ServerRSocket from './ServerRSocket';
 import SecureServerWebSocket from './SecureServerWebSocket';

desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx

@@ -7,7 +7,7 @@
  * @format
  */
 
-import {SecureServerConfig} from '../utils/certificateUtils';
+import {SecureServerConfig} from './certificate-exchange/certificate-utils';
 import ServerWebSocketBase, {
   SecureClientQuery,
   ServerEventsListener,

desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx

@@ -24,7 +24,7 @@ import {
   parseMessageToJson,
   verifyClientQueryComesFromCertExchangeSupportedOS,
 } from './Utilities';
-import {SecureServerConfig} from '../utils/certificateUtils';
+import {SecureServerConfig} from './certificate-exchange/certificate-utils';
 import {Server} from 'net';
 import {serializeError} from 'serialize-error';
 import {WSCloseCode} from '../utils/WSCloseCode';

desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx

@@ -13,7 +13,7 @@ import {
   ClientQuery,
   SignCertificateMessage,
 } from 'flipper-common';
-import {SecureServerConfig} from '../utils/certificateUtils';
+import {SecureServerConfig} from './certificate-exchange/certificate-utils';
 
 /**
  * ClientCsrQuery defines a client query with CSR

desktop/flipper-server-core/src/utils/CertificateProvider.tsx → desktop/flipper-server-core/src/app-connectivity/certificate-exchange/CertificateProvider.tsx

@@ -15,7 +15,7 @@ import {
   extractAppNameFromCSR,
   generateClientCertificate,
   getCACertificate,
-} from './certificateUtils';
+} from './certificate-utils';
 
 export default abstract class CertificateProvider {
   abstract medium: CertificateExchangeMedium;

desktop/flipper-server-core/src/utils/certificateUtils.tsx → desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx

@@ -18,9 +18,9 @@ import path from 'path';
 import tmp, {FileOptions} from 'tmp';
 import {FlipperServerConfig, reportPlatformFailures} from 'flipper-common';
 import {isTest} from 'flipper-common';
-import {flipperDataFolder} from './paths';
+import {flipperDataFolder} from '../../utils/paths';
 import * as jwt from 'jsonwebtoken';
-import {getFlipperServerConfig} from '../FlipperServerConfig';
+import {getFlipperServerConfig} from '../../FlipperServerConfig';
 
 const tmpFile = promisify(tmp.file) as (
   options?: FileOptions,

desktop/flipper-server-core/src/devices/android/AndroidCertificateProvider.tsx

@@ -7,10 +7,13 @@
  * @format
  */
 
-import CertificateProvider from '../../utils/CertificateProvider';
+import CertificateProvider from '../../app-connectivity/certificate-exchange/CertificateProvider';
 import {Client} from 'adbkit';
 import * as androidUtil from './androidContainerUtility';
-import {csrFileName, extractAppNameFromCSR} from '../../utils/certificateUtils';
+import {
+  csrFileName,
+  extractAppNameFromCSR,
+} from '../../app-connectivity/certificate-exchange/certificate-utils';
 
 const logTag = 'AndroidCertificateProvider';
 

desktop/flipper-server-core/src/devices/desktop/DesktopCertificateProvider.tsx

@@ -7,7 +7,7 @@
  * @format
  */
 
-import CertificateProvider from '../../utils/CertificateProvider';
+import CertificateProvider from '../../app-connectivity/certificate-exchange/CertificateProvider';
 import fs from 'fs-extra';
 
 export default class DesktopCertificateProvider extends CertificateProvider {

desktop/flipper-server-core/src/devices/ios/iOSCertificateProvider.tsx

@@ -7,12 +7,15 @@
  * @format
  */
 
-import CertificateProvider from '../../utils/CertificateProvider';
+import CertificateProvider from '../../app-connectivity/certificate-exchange/CertificateProvider';
 import iosUtil, {IdbConfig} from './iOSContainerUtility';
 import fs from 'fs-extra';
 import {promisify} from 'util';
 import tmp, {DirOptions} from 'tmp';
-import {csrFileName, extractAppNameFromCSR} from '../../utils/certificateUtils';
+import {
+  csrFileName,
+  extractAppNameFromCSR,
+} from '../../app-connectivity/certificate-exchange/certificate-utils';
 import path from 'path';
 
 const tmpDir = promisify(tmp.dir) as (options?: DirOptions) => Promise<string>;

desktop/flipper-server-core/src/fb-stubs/WWWCertificateProvider.tsx

@@ -8,7 +8,7 @@
  */
 
 import {KeytarManager} from '../utils/keytar';
-import CertificateProvider from '../utils/CertificateProvider';
+import CertificateProvider from '../app-connectivity/certificate-exchange/CertificateProvider';
 
 export default class WWWCertificateProvider extends CertificateProvider {
   name = 'WWWCertificateProvider';

desktop/flipper-server-core/src/index.tsx

@@ -23,4 +23,7 @@ export {isFBBuild} from './fb-stubs/constants';
 
 export {WEBSOCKET_MAX_MESSAGE_SIZE} from './app-connectivity/ServerWebSocket';
 
-export {getAuthToken, hasAuthToken} from './utils/certificateUtils';
+export {
+  getAuthToken,
+  hasAuthToken,
+} from './app-connectivity/certificate-exchange/certificate-utils';

desktop/flipper-server-core/src/server/startServer.tsx

@@ -23,7 +23,7 @@ import exitHook from 'exit-hook';
 import {attachSocketServer} from './attachSocketServer';
 import {FlipperServerImpl} from '../FlipperServerImpl';
 import {FlipperServerCompanionEnv} from 'flipper-server-companion';
-import {validateAuthToken} from '../utils/certificateUtils';
+import {validateAuthToken} from '../app-connectivity/certificate-exchange/certificate-utils';
 import {tracker} from '../utils/tracker';
 
 type Config = {