Merge pull request #13345 from brave/fixMacU2F

fix path issue preventing u2f support from working on mac
brave · Mar 19, 2018 · 27f76a7 · 27f76a7
1 parent 780e7d5
commit 27f76a7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/extensions.js b/app/extensions.js
@@ -4,7 +4,7 @@ const extensionActions = require('./common/actions/extensionActions')
 const config = require('../js/constants/config')
 const appConfig = require('../js/constants/appConfig')
 const {fileUrl} = require('../js/lib/appUrlUtil')
-const {getExtensionsPath, getBraveExtUrl, getBraveExtIndexHTML} = require('../js/lib/appUrlUtil')
+const {getComponentExtensionsPath, getExtensionsPath, getBraveExtUrl, getBraveExtIndexHTML} = require('../js/lib/appUrlUtil')
 const {getSetting} = require('../js/settings')
 const settings = require('../js/constants/settings')
 const extensionStates = require('../js/constants/extensionStates')
@@ -527,7 +527,7 @@ module.exports.init = () => {
   loadExtension(config.braveExtensionId, getExtensionsPath('brave'), generateBraveManifest(), 'component')
   // Cryptotoken extension is loaded from electron_resources.pak
   extensionInfo.setState(config.cryptoTokenExtensionId, extensionStates.REGISTERED)
-  loadExtension(config.cryptoTokenExtensionId, path.join(process.resourcesPath, 'cryptotoken'), {}, 'component')
+  loadExtension(config.cryptoTokenExtensionId, getComponentExtensionsPath('cryptotoken'), {}, 'component')
   extensionInfo.setState(config.syncExtensionId, extensionStates.REGISTERED)
   loadExtension(config.syncExtensionId, getExtensionsPath('brave'), generateSyncManifest(), 'unpacked')
 

diff --git a/js/lib/appUrlUtil.js b/js/lib/appUrlUtil.js
@@ -6,6 +6,7 @@ const Immutable = require('immutable')
 const path = require('path')
 const UrlUtil = require('./urlutil')
 const config = require('../constants/config')
+const isDarwin = require('../../app/common/lib/platformUtil').isDarwin()
 
 module.exports.fileUrl = (filePath) => {
   // It's preferrable to call path.resolve but it's not available
@@ -62,6 +63,14 @@ module.exports.getExtensionsPath = function (extensionDir) {
     : path.join(__dirname, '..', '..', 'app', 'extensions', extensionDir)
 }
 
+module.exports.getComponentExtensionsPath = function (extensionDir) {
+  if (isDarwin) {
+    return path.join(process.resourcesPath, '../Frameworks/Brave Framework.framework/Resources/', extensionDir)
+  } else {
+    return path.join(process.resourcesPath, extensionDir)
+  }
+}
+
 module.exports.getGenDir = function (url) {
   const genDirRoots = [
     module.exports.getBraveIndexPath,