Commit 7858a465fb2f764a5ee54766651bf0e874ab8143
1 parent
11797ea5a3
Exists in
master
and in
3 other branches
change api of change password and put validations on password fields
Showing
2 changed files
with
31 additions
and
11 deletions
Show diff stats
src/pages/Administrator/resetPassword.vue
| ... | ... | @@ -5,14 +5,14 @@ |
| 5 | 5 | <v-flex xs12 sm8 md8 lg5 offset-sm2 offset-lg3 class="mt-5"> |
| 6 | 6 | <v-toolbar class="card-styles mt-5" dark> |
| 7 | 7 | <v-spacer></v-spacer> |
| 8 | - <v-toolbar-title>Reset Password</v-toolbar-title> | |
| 8 | + <v-toolbar-title>Change Password</v-toolbar-title> | |
| 9 | 9 | <v-spacer></v-spacer> |
| 10 | 10 | </v-toolbar> |
| 11 | 11 | <v-card class="elevation-1 pa-3" id="form"> |
| 12 | 12 | <v-card-text> |
| 13 | 13 | <v-flex xs12 sm8 md8 lg8 offset-sm2> |
| 14 | 14 | <v-form class="mt-3" ref="form" v-model="valid" lazy-validation> |
| 15 | - <v-select | |
| 15 | + <!-- <v-select | |
| 16 | 16 | :rules="userRule" |
| 17 | 17 | label="Select User" |
| 18 | 18 | :items="getRoles" |
| ... | ... | @@ -28,8 +28,22 @@ |
| 28 | 28 | item-text="email" |
| 29 | 29 | item-value="email" |
| 30 | 30 | v-model="resetPassword.email" |
| 31 | - ></v-select> | |
| 31 | + ></v-select> --> | |
| 32 | + <v-text-field | |
| 33 | + :append-icon="e1 ? 'visibility_off' : 'visibility'" | |
| 34 | + :append-icon-cb="() => (e1 = !e1)" | |
| 35 | + :type="e1 ? 'password' : 'text'" | |
| 36 | + :rules="oldPasswordRule" | |
| 37 | + v-model="resetPassword.oldPassword" | |
| 38 | + :error-messages="errors.collect('resetPassword.oldPassword')" | |
| 39 | + v-validate="'required'" | |
| 40 | + data-vv-name="resetPassword.oldPassword" | |
| 41 | + label="Old Password" | |
| 42 | + ></v-text-field> | |
| 32 | 43 | <v-text-field |
| 44 | + :append-icon="e1 ? 'visibility_off' : 'visibility'" | |
| 45 | + :append-icon-cb="() => (e1 = !e1)" | |
| 46 | + :type="e1 ? 'password' : 'text'" | |
| 33 | 47 | :rules="newPasswordRule" |
| 34 | 48 | v-model="resetPassword.newPassword" |
| 35 | 49 | :error-messages="errors.collect('resetPassword.newPassword')" |
| ... | ... | @@ -38,13 +52,16 @@ |
| 38 | 52 | label="New Password" |
| 39 | 53 | ></v-text-field> |
| 40 | 54 | <v-text-field |
| 55 | + :append-icon="e1 ? 'visibility_off' : 'visibility'" | |
| 56 | + :append-icon-cb="() => (e1 = !e1)" | |
| 57 | + :type="e1 ? 'password' : 'text'" | |
| 41 | 58 | v-model="resetPassword.confirmPassword" |
| 42 | 59 | :rules="rePasswordRule" |
| 43 | 60 | :error-messages="errors.collect('password2')" |
| 44 | 61 | v-validate="{ required: false, is: resetPassword.newPassword }" |
| 45 | 62 | data-vv-name="password2" |
| 46 | 63 | data-vv-as="password" |
| 47 | - label="Re-Password" | |
| 64 | + label="Renter New Password" | |
| 48 | 65 | ></v-text-field> |
| 49 | 66 | </v-form> |
| 50 | 67 | </v-flex> |
| ... | ... | @@ -52,13 +69,13 @@ |
| 52 | 69 | <v-card-actions> |
| 53 | 70 | <v-flex text-xs-center> |
| 54 | 71 | <v-btn |
| 55 | - class="add-button" | |
| 56 | - round | |
| 72 | + style="background-color: #71d9ea; color: #0c0754;" | |
| 57 | 73 | dark |
| 74 | + flat | |
| 58 | 75 | large |
| 59 | 76 | :loading="loading" |
| 60 | 77 | @click="reset" |
| 61 | - >Reset Password</v-btn> | |
| 78 | + >Change Password</v-btn> | |
| 62 | 79 | </v-flex> |
| 63 | 80 | </v-card-actions> |
| 64 | 81 | <v-snackbar |
| ... | ... | @@ -88,6 +105,7 @@ export default { |
| 88 | 105 | timeout: 4000, |
| 89 | 106 | text: "", |
| 90 | 107 | color: "", |
| 108 | + e1: true, | |
| 91 | 109 | password2: "", |
| 92 | 110 | resetPassword: {}, |
| 93 | 111 | getUsersName: [], |
| ... | ... | @@ -96,8 +114,10 @@ export default { |
| 96 | 114 | loading: false, |
| 97 | 115 | text: "Password Changed", |
| 98 | 116 | newPassword: "", |
| 117 | + oldPassword: "", | |
| 99 | 118 | userRule: [v => !!v || "User is required"], |
| 100 | 119 | userNameRule: [v => !!v || "User Name is required"], |
| 120 | + oldPasswordRule: [v => !!v || "Old Password is required"], | |
| 101 | 121 | newPasswordRule: [v => !!v || "New Password is required"], |
| 102 | 122 | rePasswordRule: [v => !!v || "Re-Password is required"] |
| 103 | 123 | }; |
| ... | ... | @@ -110,12 +130,12 @@ export default { |
| 110 | 130 | reset() { |
| 111 | 131 | if ( |
| 112 | 132 | this.$refs.form.validate() && |
| 113 | - this.resetPassword.confirmPassword === this.resetPassword.newPassword | |
| 133 | + this.resetPassword.oldPassword === this.resetPassword.oldPassword | |
| 114 | 134 | ) { |
| 115 | 135 | this.loading = true; |
| 116 | - this.resetPassword.roleName = this.resetPassword.name; | |
| 136 | + this.resetPassword.newPassword = this.resetPassword.newPassword; | |
| 117 | 137 | http() |
| 118 | - .put("/resetPasswordOfUsers", this.resetPassword, { | |
| 138 | + .put("/change-password", this.resetPassword, { | |
| 119 | 139 | headers: { Authorization: "Bearer " + this.token } |
| 120 | 140 | }) |
| 121 | 141 | .then(response => { | ... | ... |
src/router/paths.js