kaori 4 лет назад
Родитель
Сommit
ea491236e8

+ 54 - 5
src/client/js/components/PasswordResetExecutionForm.jsx

@@ -1,21 +1,70 @@
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import { withTranslation } from 'react-i18next';
+import { toastSuccess, toastError } from '../util/apiNotification';
 
 
 
 
 const PasswordResetExecutionForm = (props) => {
 const PasswordResetExecutionForm = (props) => {
-  const { t } = props;
+  const { t /* appContainer, personalContainer */ } = props;
+
+  const [newPassword, setNewPassword] = useState('');
+  const [newPasswordConfirm, setNewPasswordConfirm] = useState('');
+
+  // console.log(newPassword);
+  // console.log(newPasswordConfirm);
+
+  const onClickSubmit = async(e) => {
+    e.preventDefault();
+
+    if (newPassword === '' || newPasswordConfirm === '') {
+      toastError('err', t('personal_settings.password_is_not_set'));
+      return;
+    }
+
+    if (newPassword !== newPasswordConfirm) {
+      toastError('err', t('forgot_password.new_password_and_confirmation_are_not_same'));
+      return;
+    }
+
+    try {
+      // await appContainer.apiv3Put('/personal-setting/password', {
+      //   oldPassword, newPassword, newPasswordConfirm,
+      // });
+
+      setNewPassword();
+      setNewPasswordConfirm();
+      // this.setState({ oldPassword: '', newPassword: '', newPasswordConfirm: '' });
+      // await personalContainer.retrievePersonalData();
+      toastSuccess(t('toaster.update_successed', { target: t('Password') }));
+    }
+    catch (err) {
+      toastError(err);
+    }
+
+  };
 
 
   return (
   return (
-    <form role="form" className="form" method="post">
+    <form role="form" className="form" onSubmit={onClickSubmit}>
       <div className="form-group">
       <div className="form-group">
         <div className="input-group">
         <div className="input-group">
-          <input name="password" placeholder={t('forgot_password.new_password')} className="form-control" type="password" />
+          <input
+            name="password"
+            placeholder={t('forgot_password.new_password')}
+            className="form-control"
+            type="password"
+            onChange={e => setNewPassword(e.target.value)}
+          />
         </div>
         </div>
       </div>
       </div>
       <div className="form-group">
       <div className="form-group">
         <div className="input-group">
         <div className="input-group">
-          <input name="password" placeholder={t('forgot_password.confirm_new_password')} className="form-control" type="password" />
+          <input
+            name="password"
+            placeholder={t('forgot_password.confirm_new_password')}
+            className="form-control"
+            type="password"
+            onChange={e => setNewPasswordConfirm(e.target.value)}
+          />
         </div>
         </div>
       </div>
       </div>
       <div className="form-group">
       <div className="form-group">

+ 2 - 2
src/client/js/components/PasswordResetRequestForm.jsx

@@ -9,7 +9,7 @@ import { withUnstatedContainers } from './UnstatedUtils';
 
 
 const PasswordResetRequestForm = (props) => {
 const PasswordResetRequestForm = (props) => {
   const { t, appContainer } = props;
   const { t, appContainer } = props;
-  const [email, setEmail] = useState();
+  const [email, setEmail] = useState('');
 
 
   const changeEmail = (inputValue) => {
   const changeEmail = (inputValue) => {
     setEmail(inputValue);
     setEmail(inputValue);
@@ -17,7 +17,7 @@ const PasswordResetRequestForm = (props) => {
 
 
   const sendPasswordResetRequestMail = async(e) => {
   const sendPasswordResetRequestMail = async(e) => {
     e.preventDefault();
     e.preventDefault();
-    if (email == null) {
+    if (email === '') {
       toastError('err', t('forgot_password.email_is_required'));
       toastError('err', t('forgot_password.email_is_required'));
       return;
       return;
     }
     }