Skip to content
This repository was archived by the owner on Mar 21, 2021. It is now read-only.

Use sameAs function in confirm password #640

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use sameAs function in confirm password #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...emplates/vue/src/main/webapp/app/account/change-password/change-password.component.ts.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { maxLength, minLength, required } from 'vuelidate/lib/validators';
import { maxLength, minLength, required, sameAs } from 'vuelidate/lib/validators';
import axios from 'axios';
import { mapGetters } from 'vuex';
import Component from 'vue-class-component';
Expand All @@ -15,9 +15,10 @@ const validations = {
maxLength: maxLength(254)
},
confirmPassword: {
required,
minLength: minLength(4),
maxLength: maxLength(254)
// prettier-ignore
sameAsPassword: sameAs(vm => {
return vm.newPassword;
})
}
}
};
Expand Down
14 changes: 3 additions & 11 deletions .../client/templates/vue/src/main/webapp/app/account/change-password/change-password.vue.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,9 @@
v-bind:placeholder="$t('global.form[\'confirmpassword.placeholder\']')"
v-model="$v.resetPassword.confirmPassword.$model" minlength=4 maxlength=50 required>
<div v-if="$v.resetPassword.confirmPassword.$anyDirty && $v.resetPassword.confirmPassword.$invalid">
<small class="form-text text-danger"
v-if="!$v.resetPassword.confirmPassword.required" v-text="$t('global.messages.validate.confirmpassword.required')">
Your confirmation password is required.
</small>
<small class="form-text text-danger"
v-if="!$v.resetPassword.confirmPassword.minLength" v-text="$t('global.messages.validate.confirmpassword.minlength')">
Your confirmation password is required to be at least 4 characters.
</small>
<small class="form-text text-danger"
v-if="!$v.resetPassword.confirmPassword.maxLength" v-text="$t('global.messages.validate.confirmpassword.maxlength')">
Your confirmation password cannot be longer than 50 characters.
<small class="form-text text-danger" v-if="!$v.resetAccount.confirmPassword.sameAsPassword"
v-text="$t('global.messages.error.dontmatch')">
The password and its confirmation do not match!
</small>
</div>
</div>
Expand Down
9 changes: 5 additions & 4 deletions .../src/main/webapp/app/account/reset-password/finish/reset-password-finish.component.ts.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import axios from 'axios';
import { maxLength, minLength, required } from 'vuelidate/lib/validators';
import { maxLength, minLength, required, sameAs } from 'vuelidate/lib/validators';
import { Inject, Vue, Component } from 'vue-property-decorator';
import LoginService from '@/account/login.service';

Expand All @@ -11,9 +11,10 @@ const validations = {
maxLength: maxLength(254)
},
confirmPassword: {
required,
minLength: minLength(4),
maxLength: maxLength(254)
// prettier-ignore
sameAsPassword: sameAs(vm => {
return vm.newPassword;
})
}
}
};
Expand Down
14 changes: 3 additions & 11 deletions ...lates/vue/src/main/webapp/app/account/reset-password/finish/reset-password-finish.vue.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,9 @@
v-bind:placeholder="$t('global.form[\'confirmpassword.placeholder\']')"
v-model="$v.resetAccount.confirmPassword.$model" minlength=4 maxlength=50 required>
<div v-if="$v.resetAccount.confirmPassword.$anyDirty && $v.resetAccount.confirmPassword.$invalid">
<small class="form-text text-danger"
v-if="!$v.resetAccount.confirmPassword.required" v-text="$t('global.messages.validate.confirmpassword.required')">
Your confirmation password is required.
</small>
<small class="form-text text-danger"
v-if="!$v.resetAccount.confirmPassword.minLength" v-text="$t('global.messages.validate.confirmpassword.minlength')">
Your confirmation password is required to be at least 4 characters.
</small>
<small class="form-text text-danger"
v-if="!$v.resetAccount.confirmPassword.maxLength" v-text="$t('global.messages.validate.confirmpassword.maxlength')">
Your confirmation password cannot be longer than 50 characters.
<small class="form-text text-danger" v-if="!$v.resetAccount.confirmPassword.sameAsPassword"
v-text="$t('global.messages.error.dontmatch')">
The password and its confirmation do not match!
</small>
</div>
</div>
Expand Down