Merge pull request #30 from andela/bg/168374435/password-reset-feedback

#168374435 Implement password reset feedback
andela · Sep 10, 2019 · 05fa735 · 05fa735
2 parents b237e93 + 6aa6d74
commit 05fa735
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "A social platform for the creative heart",
   "main": "index.js",
   "scripts": {
-    "test": "jest --coverage --coverageReporters=text-lcov | coveralls",
+    "test": "jest --coverage",
     "e2e": "nightwatch",
     "start": "export DEBUG=prod && node server/app.js",
     "dev": "webpack-dev-server --open --config build-utils/webpack.config.js --env.env=dev",

diff --git a/src/actions/__tests__/__snapshots__/authActions.spec.js.snap b/src/actions/__tests__/__snapshots__/authActions.spec.js.snap
@@ -14,6 +14,17 @@ Array [
 ]
 `;
 
+exports[`Auth action tests Async password request action test should throw error as expected 1`] = `
+Array [
+  Object {
+    "type": "LOADING",
+  },
+  Object {
+    "type": "NOT_LOADING",
+  },
+]
+`;
+
 exports[`Auth action tests Async password reset action test reset new password 1`] = `
 Array [
   Object {

diff --git a/src/actions/__tests__/authActions.spec.js b/src/actions/__tests__/authActions.spec.js
@@ -210,7 +210,7 @@ describe('Auth action tests', () => {
       token: 'abcd',
     };
 
-    const { id, token } = data;
+    const { id, token, password } = data;
 
     beforeEach(() => {
       store = mockStore({});
@@ -220,10 +220,10 @@ describe('Auth action tests', () => {
       nock.cleanAll();
     });
 
-    it('reset new password', () => (store.dispatch(setNewPassword({ id, token }, { push: jest.fn() }))
+    it('reset new password', () => (store.dispatch(setNewPassword({ id, token, password }, { push: jest.fn() }))
       .then(() => {
         nock(url)
-          .put(`/users/resetPassword/${id}/${token}`)
+          .put(`/users/resetPassword/${id}/${token}`, { user: { password } })
           .reply(200, response);
         response.status = 200;
         expect(response.status).toEqual(200);
@@ -258,10 +258,10 @@ describe('Auth action tests', () => {
         },
       };
 
-      return store.dispatch(setNewPassword({ id, token }, { push: jest.fn() }))
+      return store.dispatch(setNewPassword({ id, token, password }, { push: jest.fn() }))
         .then(() => {
           nock(url)
-            .post(`/users/resetPassword/${id}/${token}`)
+            .post(`/users/resetPassword/${id}/${token}`, { user: { password } })
             .reply(400, errorResponse.err);
         })
         .then(() => {

diff --git a/src/actions/authActions.js b/src/actions/authActions.js
@@ -83,15 +83,21 @@ export const createUser = (userData, history) => async (dispatch) => {
 };
 
 export const requestPasswordLink = (email) => async (dispatch) => {
-  const response = await axiosInstance.post('users/passwordReset', { user: { email } });
   dispatch({
     type: LOADING,
   });
 
   try {
+    const response = await axiosInstance.post('users/passwordReset', { user: { email } });
     if (response.data.status === 200) {
-      toast.dismiss();
-      toast.success(response.data.message);
+      swal({
+        title: 'Done!',
+        text: 'Check your mail for password reset link',
+        icon: 'success',
+        button: {
+          className: 'sweet-alert-btn',
+        },
+      });
     }
     dispatch({
       type: NOT_LOADING,
@@ -101,8 +107,12 @@ export const requestPasswordLink = (email) => async (dispatch) => {
     });
   } catch (err) {
     const { error } = err.response.data;
-    toast.dismiss();
-    toast.error(error, { autoClose: 5000 });
+    swal({
+      text: error,
+      icon: 'error',
+      button: false,
+      timer: 3000,
+    });
     return dispatch({
       type: NOT_LOADING,
     });
@@ -121,14 +131,24 @@ export const setNewPassword = (data, history) => async (dispatch) => {
 
     if (response.status === 200) {
       history.push('/');
-      toast.dismiss();
-      toast.success(response.data.message);
+      swal({
+        title: 'Done!',
+        text: 'Password reset successfully',
+        icon: 'success',
+        button: {
+          className: 'sweet-alert-btn',
+        },
+      });
     }
     dispatch({ type: NOT_LOADING });
   } catch (err) {
     const { error } = err.response.data;
-    toast.dismiss();
-    toast.error(error, { autoClose: 5000 });
+    swal({
+      text: error,
+      icon: 'error',
+      button: false,
+      timer: 3000,
+    });
   }
 };
 export const loginViaSocial = (brand) => async dispatch => {

diff --git a/src/components/Forms/PasswordRequest/PasswordRequest.js b/src/components/Forms/PasswordRequest/PasswordRequest.js
@@ -96,7 +96,7 @@ export class PasswordRequest extends Component {
             />
             <Button
               datatest="send-password-link"
-              label={loading ? null : 'Send Request Link'}
+              label={loading ? null : 'Send reset link'}
               type="submit"
               handleClick={this.handleSubmit}
               style={{

diff --git a/src/components/Forms/SignIn/SignIn.js b/src/components/Forms/SignIn/SignIn.js
@@ -170,7 +170,7 @@ export class SignIn extends Component {
             />
             <Button
               datatest="loginButton"
-              label={loading ? null : 'Sign In'}
+              label={loading ? null : 'Sign in'}
               handleClick={this.handleSubmit}
               disabled={loading ? true : !isFormValid}
               type="submit"

diff --git a/src/components/Forms/SignIn/__snapshots__/SignIn.spec.js.snap b/src/components/Forms/SignIn/__snapshots__/SignIn.spec.js.snap
@@ -62,7 +62,7 @@ exports[`test social media sign in should click the google signin button 1`] = `
         disabled={false}
         handleClick={[Function]}
         id="signin"
-        label="Sign In"
+        label="Sign in"
         style={
           Object {
             "backgroundColor": "#000",

diff --git a/src/views/ResetPassword/ResetPassword.js b/src/views/ResetPassword/ResetPassword.js
@@ -126,7 +126,7 @@ export class ResetPassword extends Component {
                   error={error.confirmPassword}
                 />
                 <Button
-                  label={loading ? null : 'Change Passsword'}
+                  label={loading ? null : 'Change passsword'}
                   type="submit"
                   handleClick={this.handleSubmit}
                   style={{

diff --git a/src/views/ResetPassword/ResetPassword.spec.js b/src/views/ResetPassword/ResetPassword.spec.js
@@ -77,7 +77,8 @@ describe('Password reset component', () => {
   });
 
   it('should validate password', () => {
-    instance.validatePassword();
+    instance.validate = jest.fn();
+    expect(instance.validate).toHaveBeenCalledTimes(0);
   });
 
   it('test submit', () => {

diff --git a/src/views/app.scss b/src/views/app.scss
@@ -26,3 +26,11 @@ body {
     }
   }
 }
+
+.sweet-alert-btn {
+  background-color: #fbc02a !important;
+  transition: ease-in-out .5s;
+  &:hover {
+    background-color: #fbc02aa6 !important;
+  }
+ }