Add OAuth

app/index.html

@@ -77,30 +77,51 @@ <h5 class="modal-title" id="loginModalLabel">Enter Salesforce Login</h5>
                                 <div class="modal-body">
                                     <form>
                                         <div class="form-group">
-                                            <label for="login-username">User Name</label>
-                                            <input type="text" id="login-username" class="form-control"
-                                                aria-describedby="usernameHelp" placeholder="Enter Salesforce Username">
-                                            <small id="usernameHelp" class="form-text">Your Salesforce username must be
-                                                in the form of an email address.</small>
-                                        </div>
-                                        <div class="form-group">
-                                            <label for="login-password">Password</label>
-                                            <input type="password" id="login-password" class="form-control">
-                                        </div>
-                                        <div class="form-group">
-                                            <label for="login-token">Security Token</label>
-                                            <input type="password" class="form-control" aria-describedby="tokenHelp"
-                                                id="login-token">
-                                            <small id="tokenHelp" class="form-text">Likely you will need your Salesforce
-                                                Security token. If you do not have it follow <a
-                                                    href='https://help.salesforce.com/articleView?id=user_security_token.htm&type=5'>these
-                                                    reset instructions.</a></small>
+                                            <label for="sfconnect-radio-selectors">Select Connection Type</label>
+                                            <div class="form-check">
+                                                <input class="form-check-input" type="radio"
+                                                    name="sfconnect-radio-selectors" id="sfconnect-oauth" value="oauth"
+                                                    checked>
+                                                <label class="form-check-label" for="sfconnect-oauth">OAuth2</label>
+                                            </div>
+                                            <div class="form-check">
+                                                <input class="form-check-input" type="radio"
+                                                    name="sfconnect-radio-selectors" id="sfconnect-password"
+                                                    value="password">
+                                                <label class="form-check-label"
+                                                    for="sfconnect-password">Username/Password</label>
+                                            </div>
                                         </div>
                                         <div class="form-group">
                                             <label for="login-url">Login URL</label>
                                             <input type="url" id="login-url" class="form-control"
                                                 value="https://login.salesforce.com">
                                         </div>
+                                        <div id="login-password-wrapper">
+                                            <div class="form-group">
+                                                <label for="login-username">User Name</label>
+                                                <input type="text" id="login-username" class="form-control"
+                                                    aria-describedby="usernameHelp"
+                                                    placeholder="Enter Salesforce Username">
+                                                <small id="usernameHelp" class="form-text">Your Salesforce username must
+                                                    be
+                                                    in the form of an email address.</small>
+                                            </div>
+                                            <div class="form-group">
+                                                <label for="login-password">Password</label>
+                                                <input type="password" id="login-password" class="form-control">
+                                            </div>
+                                            <div class="form-group">
+                                                <label for="login-token">Security Token</label>
+                                                <input type="password" class="form-control" aria-describedby="tokenHelp"
+                                                    id="login-token">
+                                                <small id="tokenHelp" class="form-text">Likely you will need your
+                                                    Saleforce
+                                                    Security token. If you do not have it follow <a
+                                                        href='https://help.salesforce.com/articleView?id=user_security_token.htm&type=5'>these
+                                                        reset instructions.</a></small>
+                                            </div>
+                                        </div>
                                     </form>
                                 </div>
                                 <div class="modal-footer">

app/render.js

@@ -45,12 +45,19 @@ $.when($.ready).then(() => {
     }
   });
 
-  // Setup Object Select All
-  $('#btn-select-all-objects').on('click', (event) => {
-    event.preventDefault();
-    $('#results-table input[type=checkbox]').prop('checked', true);
+  // Setup login radio behaviors.
+  $('#login-password-wrapper').hide();
+  $('input[type=radio][name=sfconnect-radio-selectors]').on('change', (event) => {
+    if ($(event.target, ':checked').val() === 'oauth') {
+      $('#login-password-wrapper').hide();
+    } else {
+      $('#login-password-wrapper').show();
+    }
   });
 
+  // Get the current application preferences.
+  window.api.send('get_preferences');
+
   // Setup Object Select All
   $('#btn-deselect-all-objects').on('click', (event) => {
     event.preventDefault();
@@ -651,8 +658,10 @@ const updateSqlite3Path = (filePath) => {
 // ========= Messages to the main process ===============
 // Login
 document.getElementById('login-trigger').addEventListener('click', () => {
+  const modeRadio = document.querySelector('input[type=radio][name="sfconnect-radio-selectors"]:checked');
   showLoader('Attempting Login');
   window.api.send('sf_login', {
+    mode: modeRadio.value,
     username: document.getElementById('login-username').value,
     password: document.getElementById('login-password').value,
     token: document.getElementById('login-token').value,

main.js

@@ -55,6 +55,7 @@ function createWindow() {
     width: display.workArea.width,
     height: display.workArea.height,
     frame: true,
+    partiion: 'persist: secured-partition',
     webPreferences: {
       devTools: isDev,
       nodeIntegration: false, // Disable nodeIntegration for security.
@@ -90,7 +91,7 @@ function createWindow() {
   // https://www.electronjs.org/docs/tutorial/security#4-handle-session-permission-requests-from-remote-content
   // https://github.com/doyensec/electronegativity/wiki/PERMISSION_REQUEST_HANDLER_GLOBAL_CHECK
   session
-    .fromPartition('secured-partition')
+    .fromPartition('persist: secured-partition')
     .setPermissionRequestHandler((webContents, permission, callback) => {
       callback(false);
     });

src/sf_calls.js

@@ -4,6 +4,7 @@ const path = require('path');
 const electron = require('electron');
 const jsforce = require('jsforce');
 const knex = require('knex');
+const oauth = require('./sf_oauth2');
 const constants = require('./constants');
 
 // Get the dialog library from Electron

src/sf_oauth2.js

@@ -0,0 +1,101 @@
+const electron = require("electron"); // eslint-disable-line
+
+// Extract the needed elements.
+const {
+  BrowserWindow,
+  session,
+} = electron;
+
+// Additional Tooling.
+const jsforce = require('jsforce');
+
+function createAuthWindow() {
+  // Lock down the session.
+  const authSession = session.fromPartition('auth-partition');
+  authSession.setPermissionRequestHandler((webContents, permission, callback) => {
+    callback(false);
+  });
+
+  // Create the browser window.
+  let authWindow = new BrowserWindow({
+    width: 300,
+    height: 500,
+    resizable: false,
+    frame: false,
+    show: false,
+    session: authSession,
+    webPreferences: {
+      devTools: true,
+      nodeIntegration: false, // Disable nodeIntegration for security.
+      nodeIntegrationInWorker: false,
+      nodeIntegrationInSubFrames: false,
+      disableBlinkFeatures: 'Auxclick', // See: https://github.com/doyensec/electronegativity/wiki/AUXCLICK_JS_CHECK
+      contextIsolation: true, // Enabling contextIsolation to protect against prototype pollution.
+      worldSafeExecuteJavaScript: true, // https://github.com/electron/electron/pull/24712
+      enableRemoteModule: false, // Turn off remote to avoid temptation.
+      // preload: path.join(app.getAppPath(), 'app/authPreload.js'),
+    },
+  });
+
+  // Emitted when the window is closed.
+  authWindow.on('closed', () => {
+    // Dereference the window object, usually you would store windows
+    // in an array if your app supports multi windows, this is the time
+    // when you should delete the corresponding element.
+    authWindow = null;
+  });
+
+  authWindow.webContents.on('did-fail-load', () => {
+    console.log('did-fail-load');
+  });
+
+  return authWindow;
+}
+
+function attemptLogin(authDomain) {
+  const jsfOauth = new jsforce.OAuth2({
+    loginUrl: authDomain,
+    // Temporary testing value from trailhead org.
+    clientId: '3MVG9cHH2bfKACZaQ.djia5w9g24IaXl.LCkYPmKS.T7ud235Q8c1pX0_zN6xkDBj.88d1qLf1pTcmZwGODB.',
+    redirectUri: 'https://localhost/completesetup',
+  });
+
+  const authWindow = createAuthWindow();
+
+  // Prepare to filter only the callbacks for my redirectUri
+  const filter = {
+    urls: [`${authDomain}/*`],
+  };
+
+  // Intercept 302's triggered on page load attempt and redirect.
+  authWindow.webContents.session.webRequest.onHeadersReceived(filter, (details, callback) => {
+    const { statusCode, responseHeaders } = details;
+
+    // This is redirect, so let's try again.
+    if (statusCode === 302) {
+      authWindow.loadURL(responseHeaders.Location.pop());
+    }
+
+    // don't forget to let the request proceed
+    callback({
+      cancel: false,
+    });
+  });
+
+  // 'will-navigate' is an event emitted when the window.location changes
+  // newUrl should contain the tokens you need
+  authWindow.webContents.on('will-navigate', (event, newUrl) => {
+    console.log(`Redirected to: ${newUrl}`);
+    // More complex code to handle tokens goes here.
+  });
+
+  authWindow.once('ready-to-show', () => {
+    authWindow.show();
+  });
+
+  // Load the authUrl from Salesforce.
+  const authUrl = jsfOauth.getAuthorizationUrl({ scope: 'api id web refresh_token' });
+  authWindow.loadURL(authUrl);
+}
+
+exports.attemptLogin = attemptLogin;