Implement naieve JSON file importing

Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet.  Will need to raise its sophistication before deploying to production.
feature/default_network_editable
Dan Finlay 8 years ago
parent b52346388b
commit 9126652f2e
  1. 1
      package.json
  2. 6
      ui/app/accounts/import/index.js
  3. 75
      ui/app/accounts/import/json.js

@ -84,6 +84,7 @@
"react-markdown": "^2.3.0", "react-markdown": "^2.3.0",
"react-redux": "^4.4.5", "react-redux": "^4.4.5",
"react-select": "^1.0.0-rc.2", "react-select": "^1.0.0-rc.2",
"react-simple-file-input": "^1.0.0",
"react-tooltip-component": "^0.3.0", "react-tooltip-component": "^0.3.0",
"readable-stream": "^2.1.2", "readable-stream": "^2.1.2",
"redux": "^3.0.5", "redux": "^3.0.5",

@ -6,11 +6,11 @@ import Select from 'react-select'
// Subviews // Subviews
const JsonImportView = require('./json.js') const JsonImportView = require('./json.js')
const SeedImportView = require('./seed.js')
const PrivateKeyImportView = require('./private-key.js') const PrivateKeyImportView = require('./private-key.js')
const menuItems = [ const menuItems = [
'Private Key', 'Private Key',
'JSON File',
] ]
module.exports = connect(mapStateToProps)(AccountImportSubview) module.exports = connect(mapStateToProps)(AccountImportSubview)
@ -81,10 +81,10 @@ AccountImportSubview.prototype.renderImportView = function() {
const current = type || menuItems[0] const current = type || menuItems[0]
switch (current) { switch (current) {
case 'HD Key Tree':
return h(SeedImportView)
case 'Private Key': case 'Private Key':
return h(PrivateKeyImportView) return h(PrivateKeyImportView)
case 'JSON File':
return h(JsonImportView)
default: default:
return h(JsonImportView) return h(JsonImportView)
} }

@ -2,11 +2,15 @@ const inherits = require('util').inherits
const Component = require('react').Component const Component = require('react').Component
const h = require('react-hyperscript') const h = require('react-hyperscript')
const connect = require('react-redux').connect const connect = require('react-redux').connect
const actions = require('../../actions')
const FileInput = require('react-simple-file-input').default
module.exports = connect(mapStateToProps)(JsonImportSubview) module.exports = connect(mapStateToProps)(JsonImportSubview)
function mapStateToProps (state) { function mapStateToProps (state) {
return {} return {
error: state.appState.warning,
}
} }
inherits(JsonImportSubview, Component) inherits(JsonImportSubview, Component)
@ -15,13 +19,80 @@ function JsonImportSubview () {
} }
JsonImportSubview.prototype.render = function () { JsonImportSubview.prototype.render = function () {
const { error } = this.props
return ( return (
h('div', { h('div', {
style: { style: {
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
padding: '5px 15px 0px 15px',
}, },
}, [ }, [
`Upload your json file here!`,
h('p', 'Used by a variety of different clients'),
h(FileInput, {
readAs: 'text',
onLoad: this.onLoad.bind(this),
style: {
margin: '20px 0px 12px 20px',
fontSize: '15px',
},
}),
h('input.large-input.letter-spacey', {
type: 'password',
placeholder: 'Enter password',
id: 'json-password-box',
onKeyPress: this.createKeyringOnEnter.bind(this),
style: {
width: 260,
marginTop: 12,
},
}),
h('button.primary', {
onClick: this.createNewKeychain.bind(this),
style: {
margin: 12,
},
}, 'Import'),
error ? h('span.warning', error) : null,
]) ])
) )
} }
JsonImportSubview.prototype.onLoad = function (event, file) {
this.setState({file: file, fileContents: event.target.result})
}
JsonImportSubview.prototype.createKeyringOnEnter = function (event) {
if (event.key === 'Enter') {
event.preventDefault()
this.createNewKeychain()
}
}
JsonImportSubview.prototype.createNewKeychain = function () {
const state = this.state
const { fileContents } = state
if (!fileContents) {
const message = 'You must select a file to import.'
return this.props.dispatch(actions.displayWarning(message))
}
const passwordInput = document.getElementById('json-password-box')
const password = passwordInput.value
if (!password) {
const message = 'You must enter a password for the selected file.'
return this.props.dispatch(actions.displayWarning(message))
}
this.props.dispatch(actions.importNewAccount('JSON File', [ fileContents, password ]))
}

Loading…
Cancel
Save