Merge pull request #115 from seknox/fix-#111

Fix for #111 and #112

Author: bhrg3se

dashboard/src/pages/Publicpages/PasswordSetupReset.test.js

@@ -0,0 +1,37 @@
+import { configure, mount } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+import React from 'react';
+import { SetPasswordComponent } from './PasswordSetupReset';
+
+
+jest.setTimeout(30000);
+
+configure({ adapter: new Adapter() });
+
+const cPassData = {
+    password: 'cH@ng3meNever1#a',
+    cpassword: 'cH@ng3meNever1#a',
+};
+
+
+describe('Test change password component', () => {
+
+
+    test('submit button should be enabled by default', () => {
+        const page = mount(<SetPasswordComponent update={false} token={'12345'}  />);
+
+
+        expect(page.find('super')).toBeTruthy();
+
+        const button = page.find('button').first()
+        expect(button.props().disabled).toBe(false);
+
+
+    });
+
+
+
+
+
+
+});

dashboard/src/pages/Publicpages/PasswordSetupReset.tsx

@@ -1,5 +1,5 @@
 /*
-FirstTimePasswordSetup does two things. validate user setPassword token. 
+FirstTimePasswordSetup does two things. validate user setPassword token.
 If the token is validated, present change password card or display invalid token alert.
 
 */
@@ -24,30 +24,31 @@ const useStyles = makeStyles((theme) => ({
   root: {
     flexGrow: 1,
     marginTop: '5%',
-    marginLeft: '30%',
+    marginLeft: '40%',
   },
   checkInbox: {
     fontSize: 15,
     color: 'green',
   },
   // //card
   card: {
-    minWidth: 275,
-    // marginLeft: '50%',
+    minWidth: 250,
+    maxWidth: 300,
+
   },
   textFieldRoot: {
     padding: 1,
     'label + &': {
       marginTop: theme.spacing(3),
     },
+    maxWidth: '200px'
   },
   textFieldInputBig: {
     borderRadius: 4,
     backgroundColor: theme.palette.common.white,
     border: '1px solid #ced4da',
     fontSize: 16,
-    // padding: '10px 100px',
-    // width: 'calc(100% - 4px)',
+
     transition: theme.transitions.create(['border-color', 'box-shadow']),
     '&:focus': {
       borderColor: '#80bdff',
@@ -64,6 +65,7 @@ const useStyles = makeStyles((theme) => ({
     fontWeight: 'bold',
     fontFamily: 'Open Sans ,Rajdhani',
   },
+
 }));
 
 type ValidatesetPasswordTokenProps = {
@@ -96,15 +98,14 @@ export default function ValidatesetPasswordToken(props: ValidatesetPasswordToken
 
   return (
     <div>
-      <div>
-        {/* Herein starts inner comopnents. we add create user component and user view component */}
+
 
         {showSetPasswordCard ? (
           <SetPasswordComponent update={false} token={token} />
         ) : (
-          ' Aww Snap. Good guess but your token is invalid '
-        )}
-      </div>
+            ' Aww Snap. Good guess but your token is invalid '
+          )}
+
     </div>
   );
 }
@@ -128,6 +129,8 @@ export function SetPasswordComponent(props: SetPasswordComponentProps) {
   // const [password, setPassword] = useState('');
   const [zscore, setZScore] = useState<zxcvbn.ZXCVBNScore>(0);
 
+
+
   const classes = useStyles();
 
   const zxcvbnscore = () => {
@@ -137,17 +140,26 @@ export function SetPasswordComponent(props: SetPasswordComponentProps) {
   };
 
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    // const email = e.target.value;
-    // setState({data});
+
     setData({ ...data, [event.target.name]: event.target.value });
+    zxcvbnscore()
+
 
-    // setState({country: event.target.value});
-    if (event.target.name === 'cpassword') {
-      zxcvbnscore();
-    }
   };
 
   const handleSubmit = (event: React.FormEvent<{}>) => {
+    if (data.password !== data.cpassword) {
+      alert('Your passwords does not match')    
+      return
+
+    }
+
+    if (zscore < 2) {
+      alert('Please enter strong password (the password strength should indicate "Good")') 
+      return      
+     }
+
+
     setLoader(true);
     const reqData = data;
     event.preventDefault();
@@ -192,19 +204,20 @@ export function SetPasswordComponent(props: SetPasswordComponentProps) {
                   Good to Login! <br />
                 </Typography>
               ) : (
-                ''
-              )}
+                  ''
+                )}
 
               <br />
               <form onSubmit={handleSubmit}>
                 <Grid container spacing={2} alignItems="center" direction="row" justify="center">
-                  <Grid item xs={6}>
+                  <Grid item xs={12} >
                     <TextField
                       fullWidth
                       label="Password"
                       onChange={handleChange}
                       name="password"
                       type="password"
+                      autoFocus
                       value={data.password}
                       InputProps={{
                         disableUnderline: true,
@@ -219,11 +232,10 @@ export function SetPasswordComponent(props: SetPasswordComponentProps) {
                       }}
                     />
                     <div>
-                      {/* <TextField  className={classes.selectCustom} autoComplete="off" type="password" onChange={e => setState({ password: e.target.value })} /> */}
                       <PassStrength password={data.password} />
                     </div>
                   </Grid>
-                  <Grid item xs={6}>
+                  <Grid item xs={12} >
                     <TextField
                       fullWidth
                       label="Confirm Password"
@@ -244,15 +256,14 @@ export function SetPasswordComponent(props: SetPasswordComponentProps) {
                       }}
                     />
                     <div>
-                      {/* <TextField  className={classes.selectCustom} autoComplete="off" type="password" onChange={e => setState({ password: e.target.value })} /> */}
                       <PassStrength password={data.cpassword} />
                     </div>
                   </Grid>
                 </Grid>
 
                 <Grid container spacing={2} alignItems="center" direction="row" justify="flex-end">
                   <Grid item xs={6}>
-                    <Button disabled={zscore < 2} variant="contained" color="primary" type="submit">
+                    <Button variant="contained" color="primary" name="submit" type="submit">
                       Submit
                     </Button>
                   </Grid>

dashboard/src/utils/Components/PassStrengthMeter.css

@@ -1,11 +1,13 @@
 .password-strength-meter {
+  margin-top: 5px;
+  margin-bottom: 5px;
     text-align: left;
   }
 
   .password-strength-meter-progress {
     -webkit-appearance: none;
     appearance: none;
-    width: 220px;
+    width: 200px;
     height: 8px;
   }
 
@@ -15,6 +17,7 @@
   }
 
   .password-strength-meter-label {
+    position: 'absolute';
     font-size: 14px;
   }
 

dashboard/src/utils/Components/PasswordStrengthMeter.tsx

@@ -29,18 +29,19 @@ function PasswordStrengthMeter(props: any) {
       <progress
         className={`password-strength-meter-progress strength-${createPasswordLabel(testedResult)}`}
         value={testedResult.score}
-        max="4"
+        max="5"
       />
-      <br />
-      <form>
+  
+
         <label className="password-strength-meter-label">
+         
           {password && (
             <div>
               <strong>Password strength:</strong> {createPasswordLabel(testedResult)}
             </div>
           )}
         </label>
-      </form>
+
     </div>
   );
 }

server/api/my/hPassword.go

@@ -65,8 +65,9 @@ func ForgotPassword(w http.ResponseWriter, r *http.Request) {
 }
 
 type setPassword struct {
-	Token    string `json:"token"`
-	Password string `json:"password"`
+	Token     string `json:"token"`
+	Password  string `json:"password"`
+	CPassword string `json:"cpassword"`
 }
 
 // FirstTimePasswordSetup used in case of forget password and after user account is created for first time.
@@ -80,6 +81,11 @@ func FirstTimePasswordSetup(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if strings.Compare(req.Password, req.CPassword) != 0 {
+		utils.TrasaResponse(w, 200, "failed", "password mismatch", "ChangePassword")
+		return
+	}
+
 	res, err := redis.Store.MGet(req.Token, "orguser", "intent")
 	if err != nil {
 		logrus.Error(err)
@@ -120,6 +126,11 @@ func ChangePassword(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if strings.Compare(req.Password, req.CPassword) != 0 {
+		utils.TrasaResponse(w, 200, "failed", "password mismatch", "ChangePassword")
+		return
+	}
+
 	err := updatePassword(uc.User.ID, uc.User.OrgID, req)
 	if err != nil {
 		logrus.Error(err)