Merge pull request #80 from datenreisender/enable_electron_apps_on_macos_again

Fix: Make Electron apps available on macOS again

Author: pimterry

src/components/intercept/config/electron-config.tsx

@@ -120,6 +120,12 @@ function getReadablePath(path: string) {
     }
 }
 
+declare global {
+    interface Window {
+        desktopApi?: { selectApplication: () => Promise<string | undefined> };
+    }
+}
+
 @inject('uiStore')
 @observer
 class ElectronConfig extends React.Component<{
@@ -141,7 +147,13 @@ class ElectronConfig extends React.Component<{
     }
 
     selectApplication = async () => {
-        const pathToApplication = await uploadFile('path');
+        const useNativePicker = window.desktopApi?.selectApplication;
+
+        const pathToApplication = await(
+            useNativePicker
+                ? window.desktopApi?.selectApplication()
+                : uploadFile('path')
+        );
 
         if (!pathToApplication) {
             this.props.closeSelf();
@@ -182,9 +194,9 @@ class ElectronConfig extends React.Component<{
             </p>
             {
                 platform === 'mac' && previousElectronAppPaths.length < 2 && <p>
-                    For .app bundles, enter either the bundle name (with or without .app)
-                    or the full path to the executable itself, typically stored in
-                    Contents/MacOS inside the bundle.
+                    For .app bundles, you can intercept either the bundle
+                    (the .app directory) or the executable itself,
+                    typically stored in Contents/MacOS inside the bundle.
                 </p>
             }
             <p>
@@ -220,4 +232,4 @@ export const ElectronCustomUi = {
     columnWidth: 1,
     rowHeight: 2,
     configComponent: ElectronConfig
-};
+};

src/model/interception/interceptors.ts

@@ -283,10 +283,6 @@ const INTERCEPT_OPTIONS: _.Dictionary<InterceptorConfig> = {
         description: ["Launch an Electron application with all its traffic intercepted"],
         iconProps: SourceIcons.Electron,
         uiConfig: ElectronCustomUi,
-        checkRequirements: ({ interceptorVersion }) => {
-            return !navigator.platform.startsWith('Mac') &&
-                versionSatisfies(interceptorVersion, "^1.0.1")
-        },
         tags: ['electron', 'desktop', 'postman']
     },
     [MANUAL_INTERCEPT_ID]: {
@@ -358,4 +354,4 @@ export function getInterceptOptions(
             });
         }
     });
-}
+}