Fix clipboard no avail in renderer proces

Auditors: @bsclifton

Fix #6302

app/browser/reducers/clipboardReducer.js

@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+'use strict'
+
+const appConstants = require('../../../js/constants/appConstants')
+const {clipboard} = require('electron')
+
+const clipboardReducer = (state, action) => {
+  switch (action.actionType) {
+    case appConstants.APP_CLIPBOARD_TEXT_UPDATED:
+      clipboard.writeText(action.text)
+      break
+  }
+  return state
+}
+
+module.exports = clipboardReducer

docs/appActions.md

@@ -620,6 +620,16 @@ Dispatches a message when a download is being redownloaded
 
 
 
+### clipboardTextCopied(text) 
+
+Dispatches a message when text is updated to the clipboard
+
+**Parameters**
+
+**text**: `string`, clipboard text which is copied
+
+
+
 
 * * *
 

js/actions/appActions.js

@@ -763,6 +763,17 @@ const appActions = {
       actionType: appConstants.APP_DOWNLOAD_REDOWNLOADED,
       downloadId
     })
+  },
+
+  /**
+   * Dispatches a message when text is updated to the clipboard
+   * @param {string} text - clipboard text which is copied
+   */
+  clipboardTextCopied: function (text) {
+    AppDispatcher.dispatch({
+      actionType: appConstants.APP_CLIPBOARD_TEXT_UPDATED,
+      text
+    })
   }
 }
 

js/components/frame.js

@@ -16,7 +16,6 @@ const UrlUtil = require('../lib/urlutil')
 const messages = require('../constants/messages')
 const contextMenus = require('../contextMenus')
 const ipc = require('electron').ipcRenderer
-const clipboard = require('electron').clipboard
 const FullScreenWarning = require('./fullScreenWarning')
 const debounce = require('../lib/debounce')
 const getSetting = require('../settings').getSetting
@@ -514,7 +513,7 @@ class Frame extends ImmutableComponent {
       case 'copy':
         let selection = window.getSelection()
         if (selection && selection.toString()) {
-          clipboard.writeText(selection.toString())
+          appActions.clipboardTextCopied(selection.toString())
         } else {
           this.webview.copy()
         }

js/constants/appConstants.js

@@ -82,7 +82,8 @@ const appConstants = {
   APP_DOWNLOAD_REDOWNLOADED: _,
   APP_ALLOW_FLASH_ONCE: _,
   APP_ALLOW_FLASH_ALWAYS: _,
-  APP_SHUTTING_DOWN: _
+  APP_SHUTTING_DOWN: _,
+  APP_CLIPBOARD_TEXT_UPDATED: _
 }
 
 module.exports = mapValuesByKeys(appConstants)

js/contextMenus.js

@@ -848,7 +848,7 @@ const copyAddressMenuItem = (label, location) => {
     label: locale.translation(label),
     click: (item, focusedWindow) => {
       if (focusedWindow && location) {
-        clipboard.writeText(location)
+        appActions.clipboardTextCopied(location)
       }
     }
   }
@@ -858,7 +858,7 @@ const copyEmailAddressMenuItem = (location) => {
   return {
     label: locale.translation('copyEmailAddress'),
     click: () => {
-      clipboard.writeText(location.substring('mailto:'.length, location.length))
+      appActions.clipboardTextCopied(location.substring('mailto:'.length, location.length))
     }
   }
 }

js/stores/appStore.js

@@ -34,7 +34,6 @@ const nativeImage = require('../../app/nativeImage')
 const Filtering = require('../../app/filtering')
 const basicAuth = require('../../app/browser/basicAuth')
 const windows = require('../../app/browser/windows')
-const downloadsReducer = require('../../app/browser/reducers/downloadsReducer')
 
 // state helpers
 const basicAuthState = require('../../app/common/state/basicAuthState')
@@ -43,8 +42,6 @@ const aboutNewTabState = require('../../app/common/state/aboutNewTabState')
 const aboutHistoryState = require('../../app/common/state/aboutHistoryState')
 const windowState = require('../../app/common/state/windowState')
 
-const flashReducer = require('../../app/browser/reducers/flashReducer')
-const tabsReducer = require('../../app/browser/reducers/tabsReducer')
 const webtorrent = require('../../app/browser/webtorrent')
 
 const isDarwin = process.platform === 'darwin'
@@ -353,16 +350,21 @@ function handleChangeSettingAction (settingKey, settingValue) {
   }
 }
 
+const reducers = [
+  require('../../app/browser/reducers/downloadsReducer'),
+  require('../../app/browser/reducers/flashReducer'),
+  require('../../app/browser/reducers/tabsReducer'),
+  require('../../app/browser/reducers/clipboardReducer')
+]
+
 const handleAppAction = (action) => {
   if (shuttingDown) {
     return
   }
 
   const ledger = require('../../app/ledger')
 
-  appState = downloadsReducer(appState, action)
-  appState = flashReducer(appState, action)
-  appState = tabsReducer(appState, action)
+  appState = reducers.reduce((appState, reducer) => reducer(appState, action), appState)
 
   switch (action.actionType) {
     case appConstants.APP_SET_STATE:

test/unit/app/browser/reducers/clipboardReducerTest.js

@@ -0,0 +1,41 @@
+/* global describe, it, before, after */
+const mockery = require('mockery')
+const sinon = require('sinon')
+const Immutable = require('immutable')
+const assert = require('assert')
+const fakeElectron = require('../../../lib/fakeElectron')
+
+const appConstants = require('../../../../../js/constants/appConstants')
+require('../../../braveUnit')
+
+describe('clipboardReducer', function () {
+  let clipboardReducer
+  before(function () {
+    mockery.enable({
+      warnOnReplace: false,
+      warnOnUnregistered: false,
+      useCleanCache: true
+    })
+    mockery.registerMock('electron', fakeElectron)
+    clipboardReducer = require('../../../../../app/browser/reducers/clipboardReducer')
+  })
+
+  after(function () {
+    mockery.disable()
+  })
+
+  describe('APP_CLIPBOARD_TEXT_UPDATED', function () {
+    before(function () {
+      this.spy = sinon.spy(fakeElectron.clipboard, 'writeText')
+      // Make sure clipboardReducer doesn't update state when text is updated
+      this.text = 'Mn = 2n − 1'
+      this.newState = clipboardReducer(Immutable.Map(), {actionType: appConstants.APP_CLIPBOARD_TEXT_UPDATED, text: this.text})
+    })
+    it('Does not modify state', function () {
+      assert(this.newState.isEmpty())
+    })
+    it('Copies text into electron.clipboard', function () {
+      assert(this.spy.withArgs(this.text).calledOnce)
+    })
+  })
+})

test/unit/app/browser/reducers/downloadsReducerTest.js

@@ -1,4 +1,4 @@
-/* global describe, it, before, after, beforeEach */
+/* global describe, it, before, after */
 const mockery = require('mockery')
 const sinon = require('sinon')
 const Immutable = require('immutable')
@@ -42,9 +42,6 @@ describe('downloadsReducer', function () {
     downloadsReducer = require('../../../../../app/browser/reducers/downloadsReducer')
   })
 
-  beforeEach(function () {
-  })
-
   after(function () {
     mockery.disable()
   })
@@ -120,7 +117,6 @@ describe('downloadsReducer', function () {
   describe('APP_DOWNLOAD_COPIED_TO_CLIPBOARD', function () {
     it('copies the download URL to the clipboard', function () {
       const spy = sinon.spy(fakeElectron.clipboard, 'writeText')
-      spy.withArgs(downloadUrl)
       const oldState = oneDownloadWithState(IN_PROGRESS)
       downloadsReducer(oldState, {actionType: appConstants.APP_DOWNLOAD_COPIED_TO_CLIPBOARD, downloadId: downloadId(oldState)})
       assert(spy.withArgs(downloadUrl).calledOnce)