Add the password function for export Key

diff --git a/src/features/mockhsm/actions.js b/src/features/mockhsm/actions.js
index b009762..334af08 100644 (file)
--- a/src/features/mockhsm/actions.js
+++ b/src/features/mockhsm/actions.js
@@ -39,18 +39,22 @@ export default {
   ...create,
   ...list,
   ...reset,
-  createExport: (item) => () => {
-    clientApi().export(item.xpub).then(resp => {
-      const privateKey = resp.data.privateKey
+  createExport: (arg, fileName) => (dispatch) => {
+    clientApi().export(arg).then(resp => {
+      if(resp.status == 'success'){
+        const privateKey = resp.data.privateKey
 
-      var element = document.createElement('a')
-      element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(privateKey))
-      element.setAttribute('download', item.alias)
-      element.style.display = 'none'
-      document.body.appendChild(element)
-      element.click()
+        var element = document.createElement('a')
+        element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(privateKey))
+        element.setAttribute('download', fileName)
+        element.style.display = 'none'
+        document.body.appendChild(element)
+        element.click()
 
-      document.body.removeChild(element)
+        document.body.removeChild(element)
+      }else if(resp.status == 'fail'){
+        dispatch({ type: 'ERROR', payload: {message: resp.msg} })
+      }
     })
   }
 }

diff --git a/src/features/mockhsm/components/Show.jsx b/src/features/mockhsm/components/Show.jsx
index 802baff..e50b6f4 100644 (file)
--- a/src/features/mockhsm/components/Show.jsx
+++ b/src/features/mockhsm/components/Show.jsx
@@ -14,10 +14,21 @@ class Show extends BaseShow {
     this.submitWithErrors = this.submitWithErrors.bind(this)
   }
 
-  submitWithErrors(data) {
+  submitExportFileWithErrors(data, item) {
     return new Promise((resolve, reject) => {
       const arg = {
-        'xpub': this.props.item.xpub,
+        'xpub': item.xpub,
+        'password': data.exportsPassword
+      }
+      this.props.exportKey(arg, item.alias)
+        .catch((err) => reject({_error: err.message}))
+    })
+  }
+
+  submitWithErrors(data, xpub) {
+    return new Promise((resolve, reject) => {
+      const arg = {
+        'xpub': xpub,
         'old_password': data.oldPassword,
         'new_password': data.newPassword
       }
@@ -30,13 +41,11 @@ class Show extends BaseShow {
     const item = this.props.item
     const lang = this.props.lang
     const {
-      fields: { oldPassword, newPassword, repeatPassword },
+      fields: { exportsPassword, oldPassword, newPassword, repeatPassword },
       handleSubmit,
       submitting
     } = this.props
 
-    // let exportPassword
-
     let view
     if (item) {
       const title = <span>
@@ -54,10 +63,6 @@ class Show extends BaseShow {
             id={item.id}
             object='key'
             title={lang === 'zh' ? '详情' : 'Details'}
-            actions={[
-              <button key='export-key' className='btn btn-link' onClick={this.props.exportKey.bind(this, item)}>
-                { lang === 'zh' ? '导出私钥' : 'Export private key' }</button>,
-            ]}
             items={[
               {label: 'Alias', value: item.alias},
               {label: 'xpubs', value: item.xpub},
@@ -65,8 +70,19 @@ class Show extends BaseShow {
             lang={lang}
           />
 
+          <h5>Export private key</h5>
+          <form onSubmit={handleSubmit(value => this.submitExportFileWithErrors(value, item))}>
+            <TextField
+              title = 'Password'
+              placeholder='Please entered the password.'
+              fieldProps={exportsPassword}
+              autoFocus={true} />
+            <button type='submit' className='btn btn-primary' disabled={submitting}>
+              { lang === 'zh' ? '导出私钥' : 'Export private key' }</button>
+          </form>
+
           <h5>Reset password</h5>
-          <form onSubmit={handleSubmit(this.submitWithErrors)}>
+          <form onSubmit={handleSubmit(value => this.submitWithErrors(value, item.xpub))}>
             <TextField
               title = 'Old Password'
               placeholder='Please entered the old password.'
@@ -87,34 +103,6 @@ class Show extends BaseShow {
               Reset the password
             </button>
           </form>
-
-          {/*<form onSubmit={handleSubmit(this.submitWithErrors)}>*/}
-            {/*<TextField*/}
-              {/*placeholder='Enter the password.'*/}
-              {/*fieldProps={token}*/}
-              {/*autoFocus={true} />*/}
-
-            {/*<button type='submit' className='btn btn-primary' disabled={submitting}>*/}
-              {/*Log In*/}
-            {/*</button>*/}
-          {/*</form>*/}
-          {/*<Section*/}
-            {/*title={ lang === 'zh' ? '导出私钥' : 'Export private key' }*/}
-            {/*>*/}
-            {/*/!*<TextField*!/*/}
-              {/*/!*placeholder='Enter the password'*!/*/}
-              {/*/!*fieldProps={exportPassword}*!/*/}
-              {/*/!*autoFocus={true} />*!/*/}
-            {/*<input type="text"/>*/}
-
-
-          {/*</Section>*/}
-
-          {/*<Section*/}
-            {/*title={ lang === 'zh' ? '重置密码' : 'Reset password' }*/}
-            {/*>*/}
-
-          {/*</Section>*/}
         </PageContent>
       </div>
     }
@@ -135,7 +123,7 @@ const mapStateToProps = (state, ownProps) => ({
 
 const mapDispatchToProps = ( dispatch ) => ({
   fetchItem: (id) => dispatch(actions.key.fetchItems({id: `${id}`})),
-  exportKey: (item) => dispatch(actions.key.createExport(item)),
+  exportKey: (item, fileName) => dispatch(actions.key.createExport(item, fileName)),
   submitForm: (params) => dispatch(actions.key.submitResetForm(params))
 })
 
@@ -145,5 +133,5 @@ export default connect(
   mapDispatchToProps
 )(reduxForm({
   form: 'ResetPassword',
-  fields: ['oldPassword', 'newPassword', 'repeatPassword' ],
+  fields: ['exportsPassword', 'oldPassword', 'newPassword', 'repeatPassword' ],
 })(Show))

diff --git a/src/sdk/api/mockHsmKeys.js b/src/sdk/api/mockHsmKeys.js
index bbccee2..a19d072 100644 (file)
--- a/src/sdk/api/mockHsmKeys.js
+++ b/src/sdk/api/mockHsmKeys.js
@@ -24,7 +24,7 @@ const mockHsmKeysAPI = (client) => {
 
     queryAll: (params, processor, cb) => shared.queryAll(client, 'mockHsm.keys', params, processor, cb),
 
-    export: (xpub) => client.request('/export-private-key', {xpub, password: '123456'}),
+    export: (params) => client.request('/export-private-key', params),
 
     progress: () => client.request('/import-key-progress')
   }