From 706efc5247c334651cb73bc9bdf978d20946c6dd Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Thu, 5 Apr 2018 16:40:04 +0300
Subject: [PATCH] refactor(user-management): integrate with sebi's abomination
---
.../components-faraday/src/components/Admin/utils.js | 1 +
.../src/components/SignUp/SignUpInvitationPage.js | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/packages/components-faraday/src/components/Admin/utils.js b/packages/components-faraday/src/components/Admin/utils.js
index ee33093e2..5c761760f 100644
--- a/packages/components-faraday/src/components/Admin/utils.js
+++ b/packages/components-faraday/src/components/Admin/utils.js
@@ -20,6 +20,7 @@ export const setAdmin = values => {
return {
...omit(newValues, ['role']),
+ username: newValues.email,
isConfirmed: false,
passwordResetToken: generatePasswordHash(),
password: 'defaultpass',
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
index 569988891..c78509321 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
@@ -31,7 +31,7 @@ const login = (dispatch, values, history) =>
const confirmUser = (email, token, history) => (values, dispatch) => {
const request = { ...values, email, token }
if (values) {
- return create('/users/invite/password/reset', request)
+ return create('/users/reset-password', request)
.then(r => {
const { username } = r
const { password } = values
@@ -52,6 +52,7 @@ const confirmUser = (email, token, history) => (values, dispatch) => {
export default compose(
withJournal,
withState('step', 'changeStep', 0),
+ withState('initialValues', 'setInitialValues', {}),
withProps(({ location }) => {
const params = new URLSearchParams(location.search)
const email = params.get('email')
@@ -66,11 +67,11 @@ export default compose(
}),
lifecycle({
componentDidMount() {
- const { email, token } = this.props
- const encodedUri = `?email=${encodeURIComponent(email)}&token=${token}`
- request(`/users/invite${encodedUri}`)
+ const { setInitialValues, token } = this.props
+ const encodedUri = `?passwordResetToken=${token}`
+ request(`/users/${encodedUri}`)
.then(res => {
- this.setState({ initialValues: res })
+ setInitialValues(v => res.users[0])
})
.catch(err => {
this.setState({ error: err.response })
--
GitLab