import { baseListActions, baseCreateActions } from 'features/shared/actions'
import { chainClient } from 'utility/environment'
-import {push} from 'react-router-redux'
+import {reset} from 'redux-form'
const type = 'key'
const clientApi = () => chainClient().mockHsm.keys
clientApi,
})
-const reset = {
+const resetPassword = {
submitResetForm: (params) => {
+ let promise = Promise.resolve()
return (dispatch) => {
- return clientApi().resetPassword(params).then((resp) => {
+ return promise.then(() => clientApi().resetPassword(params).then((resp) => {
if(resp.data.changed){
dispatch({ type: `RESET_PASSWORD_${type.toUpperCase()}`, resp })
+ dispatch(reset('ResetPassword'))
}else{
- dispatch({ type: 'ERROR', payload: {message: 'Unable to reset the key password.'} })
+ let msg = 'Unable to reset the key password.'
+ dispatch({ type: 'ERROR', payload: {message: msg} })
+ throw new Error(msg)
}
-
- dispatch(push({
- pathname: `/${type}s/${id}`,
- state: {
- preserveFlash: true
- }
- }))
- })
+ }))
}
}
}
export default {
...create,
...list,
- ...reset,
+ ...resetPassword,
createExport: (arg, fileName) => (dispatch) => {
clientApi().export(arg).then(resp => {
if(resp.status == 'success'){
--- /dev/null
+import React, { Component } from 'react'
+import { TextField } from 'features/shared/components'
+import {reduxForm} from 'redux-form'
+
+class ExportKey extends Component {
+ constructor(props) {
+ super(props)
+ this.submitWithErrors = this.submitWithErrors.bind(this)
+ }
+
+ submitWithErrors(data, item) {
+ return new Promise((resolve, reject) => {
+ const arg = {
+ 'xpub': item.xpub,
+ 'password': data.password
+ }
+ this.props.exportKey(arg, item.alias)
+ .catch((err) => reject({_error: err.message}))
+ })
+ }
+
+ render() {
+ const item = this.props.item
+ const lang = this.props.lang
+ const {
+ fields: { password },
+ handleSubmit,
+ submitting
+ } = this.props
+
+ return (
+ <div>
+ <h5>{ lang === 'zh' ? '导出私钥' : 'Export private key' }</h5>
+ <form onSubmit={handleSubmit(value => this.submitWithErrors(value, item))}>
+ <TextField
+ title = { lang === 'zh' ? '密码' : 'Password' }
+ placeholder= { lang === 'zh' ? '请输入密码' : 'Please entered the password.' }
+ fieldProps={password}
+ type= 'password'
+ />
+ <button type='submit' className='btn btn-primary' disabled={submitting}>
+ { lang === 'zh' ? '导出私钥' : 'Export private key' }</button>
+ </form>
+ </div>
+ )
+ }
+}
+
+const validate = values => {
+ const errors = {}
+ if (!values.password) {
+ errors.password = 'Required'
+ }
+ return errors
+}
+
+export default (reduxForm({
+ form: 'ExportKey',
+ fields: ['password'],
+ validate
+})(ExportKey))
--- /dev/null
+import React, {Component} from 'react'
+import {reduxForm} from 'redux-form'
+import {
+ TextField
+} from 'features/shared/components'
+
+class ResetPassword extends Component {
+ constructor(props) {
+ super(props)
+ this.submitWithErrors = this.submitWithErrors.bind(this)
+ }
+
+ submitWithErrors(data, xpub) {
+ return new Promise((resolve, reject) => {
+ const arg = {
+ 'xpub': xpub,
+ 'old_password': data.oldPassword,
+ 'new_password': data.newPassword
+ }
+ this.props.submitForm(arg)
+ .catch((err) => reject({_error: err.message}))
+ })
+ }
+
+ render() {
+ const item = this.props.item
+ const lang = this.props.lang
+ const {
+ fields: { oldPassword, newPassword, repeatPassword },
+ handleSubmit,
+ submitting
+ } = this.props
+
+ return (
+ <div>
+ <h5>{ lang === 'zh' ? '重置密码' : 'Reset password' }</h5>
+ <form onSubmit={handleSubmit(value => this.submitWithErrors(value, item.xpub))}>
+ <TextField
+ title = { lang === 'zh' ? '原始密码' : 'Old Password' }
+ placeholder={ lang === 'zh' ? '请输入原始密码。' : 'Please entered the old password.' }
+ fieldProps={oldPassword}
+ type= 'password'
+ />
+ <TextField
+ title = { lang === 'zh' ? '新密码' : 'New Password' }
+ placeholder={ lang === 'zh' ? '请输入新密码。' : 'Please entered the new password.' }
+ fieldProps={newPassword}
+ type= 'password'
+ />
+ <TextField
+ title = { lang === 'zh' ? '重复新密码' : 'Repeat Password' }
+ placeholder={ lang === 'zh' ? '请重复输入新密码。' : 'Please repeated the new password.' }
+ fieldProps={repeatPassword}
+ type= 'password'
+ />
+
+ <button type='submit' className='btn btn-primary' disabled={submitting}>
+ { lang === 'zh' ? '重置密码' : 'Reset the password' }
+ </button>
+ </form>
+ </div>
+ )
+ }
+}
+
+const validate = values => {
+ const errors = {}
+ if (!values.oldPassword) {
+ errors.oldPassword = 'Required'
+ }
+
+ if (!values.newPassword) {
+ errors.newPassword = 'Required'
+ }else if(values.newPassword.length < 5){
+ errors.newPassword = 'Please enter at least 5 characters password.'
+ }
+
+ if ( values.newPassword !== values.repeatPassword ) {
+ errors.repeatPassword = 'Please match the repeat password.'
+ }
+ return errors
+}
+
+export default (reduxForm({
+ form: 'ResetPassword',
+ fields: ['oldPassword', 'newPassword', 'repeatPassword' ],
+ validate
+})(ResetPassword))
KeyValueTable,
PageContent,
PageTitle,
- TextField
} from 'features/shared/components'
+import ExportKey from './ExportKey'
+import ResetPassword from './ResetPassword'
import componentClassNames from 'utility/componentClassNames'
class Show extends BaseShow {
constructor(props) {
super(props)
- this.submitWithErrors = this.submitWithErrors.bind(this)
- }
-
- submitExportFileWithErrors(data, item) {
- return new Promise((resolve, reject) => {
- const arg = {
- '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
- }
- this.props.submitForm(arg)
- .catch((err) => reject({_error: err.message}))
- })
}
render() {
const item = this.props.item
const lang = this.props.lang
- const {
- fields: { exportsPassword, oldPassword, newPassword, repeatPassword },
- handleSubmit,
- submitting
- } = this.props
let view
if (item) {
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(value => this.submitWithErrors(value, item.xpub))}>
- <TextField
- title = 'Old Password'
- placeholder='Please entered the old password.'
- fieldProps={oldPassword}
- autoFocus={true} />
- <TextField
- title = 'New Password'
- placeholder='Please entered the new password.'
- fieldProps={newPassword}
- autoFocus={true} />
- <TextField
- title = 'Repeat Password'
- placeholder='Please repeated the new password.'
- fieldProps={repeatPassword}
- autoFocus={true} />
+ <ExportKey
+ key='export-key-form' // required by React
+ item={item}
+ lang={lang}
+ exportKey={this.props.exportKey}
+ />
+ <ResetPassword
+ key='reset-password-form' // required by React
+ item={item}
+ lang={lang}
+ submitForm={this.props.submitForm}
+ />
- <button type='submit' className='btn btn-primary' disabled={submitting}>
- Reset the password
- </button>
- </form>
</PageContent>
</div>
}
import {connect} from 'react-redux'
import actions from 'actions'
-import {reduxForm} from 'redux-form'
const mapStateToProps = (state, ownProps) => ({
item: state.key.items[ownProps.params.id],
export default connect(
mapStateToProps,
mapDispatchToProps
-)(reduxForm({
- form: 'ResetPassword',
- fields: ['exportsPassword', 'oldPassword', 'newPassword', 'repeatPassword' ],
-})(Show))
+)(Show)
OSDN Git Service
