From 7858a465fb2f764a5ee54766651bf0e874ab8143 Mon Sep 17 00:00:00 2001
From: shikha <shikha.mishra@viithiisys.com>
Date: Tue, 18 Feb 2020 12:34:20 +0530
Subject: [PATCH] change api of change password and put validations on password
 fields

---
 src/pages/Administrator/resetPassword.vue | 40 +++++++++++++++++++++++--------
 src/router/paths.js                       |  2 +-
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/pages/Administrator/resetPassword.vue b/src/pages/Administrator/resetPassword.vue
index a32c654..fd95099 100644
--- a/src/pages/Administrator/resetPassword.vue
+++ b/src/pages/Administrator/resetPassword.vue
@@ -5,14 +5,14 @@
         <v-flex xs12 sm8 md8 lg5 offset-sm2 offset-lg3 class="mt-5">
           <v-toolbar class="card-styles mt-5" dark>
             <v-spacer></v-spacer>
-            <v-toolbar-title>Reset Password</v-toolbar-title>
+            <v-toolbar-title>Change Password</v-toolbar-title>
             <v-spacer></v-spacer>
           </v-toolbar>
           <v-card class="elevation-1 pa-3" id="form">
             <v-card-text>
               <v-flex xs12 sm8 md8 lg8 offset-sm2>
                 <v-form class="mt-3" ref="form" v-model="valid" lazy-validation>
-                  <v-select
+                  <!-- <v-select
                     :rules="userRule"
                     label="Select User"
                     :items="getRoles"
@@ -28,8 +28,22 @@
                     item-text="email"
                     item-value="email"
                     v-model="resetPassword.email"
-                  ></v-select>
+                  ></v-select> -->
+                  <v-text-field
+                    :append-icon="e1 ? 'visibility_off' : 'visibility'"
+                    :append-icon-cb="() => (e1 = !e1)"
+                    :type="e1 ? 'password' : 'text'"
+                    :rules="oldPasswordRule"
+                    v-model="resetPassword.oldPassword"
+                    :error-messages="errors.collect('resetPassword.oldPassword')"
+                    v-validate="'required'"
+                    data-vv-name="resetPassword.oldPassword"
+                    label="Old Password"
+                  ></v-text-field>
                   <v-text-field
+                    :append-icon="e1 ? 'visibility_off' : 'visibility'"
+                    :append-icon-cb="() => (e1 = !e1)"
+                    :type="e1 ? 'password' : 'text'"
                     :rules="newPasswordRule"
                     v-model="resetPassword.newPassword"
                     :error-messages="errors.collect('resetPassword.newPassword')"
@@ -38,13 +52,16 @@
                     label="New Password"
                   ></v-text-field>
                   <v-text-field
+                    :append-icon="e1 ? 'visibility_off' : 'visibility'"
+                    :append-icon-cb="() => (e1 = !e1)"
+                    :type="e1 ? 'password' : 'text'"
                     v-model="resetPassword.confirmPassword"
                     :rules="rePasswordRule"
                     :error-messages="errors.collect('password2')"
                     v-validate="{ required: false, is: resetPassword.newPassword }"
                     data-vv-name="password2"
                     data-vv-as="password"
-                    label="Re-Password"
+                    label="Renter New Password"
                   ></v-text-field>
                 </v-form>
               </v-flex>
@@ -52,13 +69,13 @@
             <v-card-actions>
               <v-flex text-xs-center>
                 <v-btn
-                  class="add-button"
-                  round
+                  style="background-color: #71d9ea; color: #0c0754;"
                   dark
+                  flat
                   large
                   :loading="loading"
                   @click="reset"
-                >Reset Password</v-btn>
+                >Change Password</v-btn>
               </v-flex>
             </v-card-actions>
             <v-snackbar
@@ -88,6 +105,7 @@ export default {
       timeout: 4000,
       text: "",
       color: "",
+      e1: true,
       password2: "",
       resetPassword: {},
       getUsersName: [],
@@ -96,8 +114,10 @@ export default {
       loading: false,
       text: "Password Changed",
       newPassword: "",
+      oldPassword: "",
       userRule: [v => !!v || "User is required"],
       userNameRule: [v => !!v || "User Name is required"],
+      oldPasswordRule: [v => !!v || "Old Password is required"],
       newPasswordRule: [v => !!v || "New Password is required"],
       rePasswordRule: [v => !!v || "Re-Password is required"]
     };
@@ -110,12 +130,12 @@ export default {
     reset() {
       if (
         this.$refs.form.validate() &&
-        this.resetPassword.confirmPassword === this.resetPassword.newPassword
+        this.resetPassword.oldPassword === this.resetPassword.oldPassword
       ) {
         this.loading = true;
-        this.resetPassword.roleName = this.resetPassword.name;
+        this.resetPassword.newPassword = this.resetPassword.newPassword;
         http()
-          .put("/resetPasswordOfUsers", this.resetPassword, {
+          .put("/change-password", this.resetPassword, {
             headers: { Authorization: "Bearer " + this.token }
           })
           .then(response => {
diff --git a/src/router/paths.js b/src/router/paths.js
index f47f44d..478ff9f 100644
--- a/src/router/paths.js
+++ b/src/router/paths.js
@@ -600,7 +600,7 @@ export default [{
     {
         path: '/resetPassword',
         meta: {},
-        name: 'Reset Password',
+        name: 'Change Password',
         props: (route) => ({ type: route.query.type }),
         component: () =>
             import (
-- 
2.0.0