jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a circular dependency between KeytarManager and FlipperServerImpl

Browse Source 
Reviewed By: passy

Differential Revision: D33846051

fbshipit-source-id: c83f5609308ad732a02b2ee55466f5ed0918d733
This commit is contained in:
Andrey Goncharov
2022-02-02 03:05:34 -08:00
committed by Facebook GitHub Bot
parent b1f19ecd68
commit 7bf89a840a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/flipper-server-core/src/FlipperServerImpl.tsx
View File

@@ -30,7 +30,7 @@ import {launchEmulator} from './devices/android/AndroidDevice';
import {setFlipperServerConfig} from './FlipperServerConfig'; import {setFlipperServerConfig} from './FlipperServerConfig';
import {saveSettings} from './utils/settings'; import {saveSettings} from './utils/settings';
import {saveLauncherSettings} from './utils/launcherSettings'; 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 {PluginManager} from './plugins/PluginManager';
import {runHealthcheck, getHealthChecks} from './utils/runHealthchecks'; import {runHealthcheck, getHealthChecks} from './utils/runHealthchecks';
import {openFile} from './utils/openFile'; import {openFile} from './utils/openFile';
@@ -50,8 +50,6 @@ import assert from 'assert';
const {access, copyFile, mkdir, unlink, stat, readlink, readFile, writeFile} = const {access, copyFile, mkdir, unlink, stat, readlink, readFile, writeFile} =
promises; promises;
export const SERVICE_FLIPPER = 'flipper.oAuthToken';
/** /**
* FlipperServer takes care of all incoming device & client connections. * FlipperServer takes care of all incoming device & client connections.
* It will set up managers per device type, and create the incoming * It will set up managers per device type, and create the incoming

2
desktop/flipper-server-core/src/utils/CertificateProvider.tsx
View File

@@ -21,7 +21,6 @@ import archiver from 'archiver';
import {timeout} from 'flipper-common'; import {timeout} from 'flipper-common';
import {v4 as uuid} from 'uuid'; import {v4 as uuid} from 'uuid';
import {internGraphPOSTAPIRequest} from '../fb-stubs/internRequests'; import {internGraphPOSTAPIRequest} from '../fb-stubs/internRequests';
import {SERVICE_FLIPPER} from '../FlipperServerImpl';
import {getIdbConfig} from '../devices/ios/idbConfig'; import {getIdbConfig} from '../devices/ios/idbConfig';
import {assertNotNull} from '../comms/Utilities'; import {assertNotNull} from '../comms/Utilities';
import { import {
@@ -33,6 +32,7 @@ import {
generateClientCertificate, generateClientCertificate,
getCACertificate, getCACertificate,
} from './certificateUtils'; } from './certificateUtils';
import {SERVICE_FLIPPER} from './keytar';
export type CertificateExchangeMedium = 'FS_ACCESS' | 'WWW' | 'NONE'; export type CertificateExchangeMedium = 'FS_ACCESS' | 'WWW' | 'NONE';

2
desktop/flipper-server-core/src/utils/keytar.tsx
View File

@@ -10,6 +10,8 @@
import os from 'os'; import os from 'os';
import {UserNotSignedInError} from 'flipper-common'; import {UserNotSignedInError} from 'flipper-common';
export const SERVICE_FLIPPER = 'flipper.oAuthToken';
export type KeytarModule = { export type KeytarModule = {
getPassword(service: string, username: string): string; getPassword(service: string, username: string): string;
deletePassword(service: string, username: string): void; deletePassword(service: string, username: string): void;