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

Minor Bug fixes

Browse Source 
Summary: With this change, I verified that our enterprise wilde app is able to connect to Flipper.

Reviewed By: jknoxville

Differential Revision: D23318335

fbshipit-source-id: cc952297ead1e8afcb1d9f5062e593e51e8ce893
This commit is contained in:
Pritesh Nandgaonkar
2020-08-25 09:36:19 -07:00
committed by Facebook GitHub Bot
parent 8d4ff8d48e
commit 73e3cfe4a1
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
desktop/app/src/server.tsx
View File

@@ -294,12 +294,7 @@ class Server extends EventEmitter {
medium, medium,
} = clientData; } = clientData;
const transformedMedium = transformCertificateExchangeMediumToType(medium); const transformedMedium = transformCertificateExchangeMediumToType(medium);
const duplicateDevices = this.store if (transformedMedium === 'WWW') {
.getState()
.connections.devices.filter((device) => device.serial === device_id);
// When user switches from WWW to FS_ACCESS, we reset the certs folder, but we don't do it other way around. Thus when user switches to WWW from FS_ACCESS and if certs arepresent then the device id sent by Flipper SDK is the original one and in that case we need not create a device.
if (transformedMedium === 'WWW' && duplicateDevices.length == 0) {
// TODO unregister previous ClientDevice's for a particular device
this.store.dispatch({ this.store.dispatch({
type: 'REGISTER_DEVICE', type: 'REGISTER_DEVICE',
payload: new ClientDevice(device_id, app, os), payload: new ClientDevice(device_id, app, os),
@@ -501,7 +496,8 @@ class Server extends EventEmitter {
// try to get id by comparing giving `csr` to file from `csr_path` // try to get id by comparing giving `csr` to file from `csr_path`
// otherwise, use given device_id // otherwise, use given device_id
const {csr_path, csr} = csrQuery; const {csr_path, csr} = csrQuery;
return (csr_path && csr && query.medium === 'FS_ACCESS' // For iOS we do not need to confirm the device id, as it never changes unlike android.
return (csr_path && csr && query.os != 'iOS'
? this.certificateProvider.extractAppNameFromCSR(csr).then((appName) => { ? this.certificateProvider.extractAppNameFromCSR(csr).then((appName) => {
return this.certificateProvider.getTargetDeviceId( return this.certificateProvider.getTargetDeviceId(
query.os, query.os,