Move keychain storage to server, some constants cleanup
Summary: This diff moves keychain storage to the server. Figured to leave request logic itself in the UI-core, as basically all use cases happen there, except for streaming download for mobile build plugin, so sending the requests from the backend doesn't really seem to add value, unless we run into some CORS issues later. Reviewed By: passy Differential Revision: D32596715 fbshipit-source-id: f5ab9d794f91a6eb8a8dc07ae723bf2890726771
This commit is contained in:
committed by
Facebook GitHub Bot
parent
bca169df73
commit
e742322eb1
@@ -33,6 +33,7 @@ import {launchEmulator} from './devices/android/AndroidDevice';
|
||||
import {setFlipperServerConfig} from './FlipperServerConfig';
|
||||
import {saveSettings} from './utils/settings';
|
||||
import {saveLauncherSettings} from './utils/launcherSettings';
|
||||
import {KeytarManager} from './utils/keytar';
|
||||
|
||||
/**
|
||||
* FlipperServer takes care of all incoming device & client connections.
|
||||
@@ -51,12 +52,18 @@ export class FlipperServerImpl implements FlipperServer {
|
||||
state: FlipperServerState = 'pending';
|
||||
android: AndroidDeviceManager;
|
||||
ios: IOSDeviceManager;
|
||||
keytarManager: KeytarManager;
|
||||
|
||||
constructor(public config: FlipperServerConfig, public logger: Logger) {
|
||||
constructor(
|
||||
public config: FlipperServerConfig,
|
||||
public logger: Logger,
|
||||
keytarModule?: any,
|
||||
) {
|
||||
setFlipperServerConfig(config);
|
||||
const server = (this.server = new ServerController(this));
|
||||
this.android = new AndroidDeviceManager(this);
|
||||
this.ios = new IOSDeviceManager(this);
|
||||
this.keytarManager = new KeytarManager(keytarModule);
|
||||
|
||||
server.addListener('error', (err) => {
|
||||
this.emit('server-error', err);
|
||||
@@ -227,6 +234,10 @@ export class FlipperServerImpl implements FlipperServer {
|
||||
'persist-settings': async (settings) => saveSettings(settings),
|
||||
'persist-launcher-settings': async (settings) =>
|
||||
saveLauncherSettings(settings),
|
||||
'keychain-read': (service) => this.keytarManager.retrieveToken(service),
|
||||
'keychain-write': (service, password) =>
|
||||
this.keytarManager.writeKeychain(service, password),
|
||||
'keychain-unset': (service) => this.keytarManager.unsetKeychain(service),
|
||||
};
|
||||
|
||||
registerDevice(device: ServerDevice) {
|
||||
|
||||
Reference in New Issue
Block a user