Skip to content

Commit e26938a

Browse files
committed
EPMRPP-100064 || Exclude spaces from password validation
1 parent 5f258b0 commit e26938a

File tree

7 files changed

+13
-16
lines changed

7 files changed

+13
-16
lines changed

app/src/common/utils/validation/validate.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ export const login = composeValidators([isNotEmpty, regex(/^[0-9a-zA-Z-_.]{1,128
3535
export const oldPassword = composeValidators([isNotEmpty, regex(/^(.){4,256}$/)]);
3636
export const password = composeValidators([
3737
isNotEmpty,
38-
minLength(8),
39-
regex(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).+$/),
38+
regex(/^(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[^\w\d\s:])([^\s]){8,256}$/),
4039
]);
4140
export const userName = composeValidators([
4241
isNotEmpty,

app/src/pages/admin/allUsersPage/usersToolbar/actionPanel/actionPanel.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export class ActionPanel extends Component {
121121
email: values.email,
122122
fullName: values.fullName,
123123
login: values.login,
124-
password: values.password.trim(),
124+
password: values.password,
125125
projectRole: values.projectRole,
126126
},
127127
})

app/src/pages/inside/profilePage/modals/changePasswordModal/changePasswordModal.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ const messages = defineMessages({
7272
@reduxForm({
7373
form: 'changePasswordForm',
7474
validate: ({ oldPassword, newPassword, confirmPassword }) => ({
75-
oldPassword: commonValidators.oldPassword(oldPassword.trim()),
76-
newPassword: commonValidators.password(newPassword.trim()),
77-
confirmPassword: newPassword.trim() !== confirmPassword.trim() && 'profileConfirmPassword',
75+
oldPassword: commonValidators.oldPassword(oldPassword),
76+
newPassword: commonValidators.password(newPassword),
77+
confirmPassword: newPassword !== confirmPassword && 'profileConfirmPassword',
7878
}),
7979
})
8080
@track()

app/src/pages/inside/profilePage/personalInfoBlock/personalInfoBlock.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export class PersonalInfoBlock extends Component {
165165
changePasswordHandler = (data) => {
166166
fetch(URLS.userChangePassword(), {
167167
method: 'post',
168-
data: { oldPassword: data.oldPassword.trim(), newPassword: data.newPassword.trim() },
168+
data: { oldPassword: data.oldPassword, newPassword: data.newPassword },
169169
})
170170
.then(() => {
171171
this.props.showNotification({

app/src/pages/outside/loginPage/pageBlocks/changePasswordBlock/changePasswordForm/changePasswordForm.jsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,8 @@ const hints = defineMessages({
7474
@reduxForm({
7575
form: 'changePassword',
7676
validate: ({ password, passwordRepeat }) => ({
77-
password: commonValidators.password(password.trim()),
78-
passwordRepeat:
79-
(!passwordRepeat || passwordRepeat.trim() !== password.trim()) && 'confirmPasswordHint',
77+
password: commonValidators.password(password),
78+
passwordRepeat: (!passwordRepeat || passwordRepeat !== password) && 'confirmPasswordHint',
8079
}),
8180
})
8281
@injectIntl
@@ -102,7 +101,7 @@ export class ChangePasswordForm extends PureComponent {
102101
fetch(URLS.userPasswordReset(), {
103102
method: 'post',
104103
data: {
105-
password: password.trim(),
104+
password,
106105
uuid,
107106
},
108107
})

app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ const messages = defineMessages({
6262
@reduxForm({
6363
form: 'registration',
6464
validate: ({ login, name, password, confirmPassword }) => ({
65-
password: commonValidators.password(password.trim()),
66-
confirmPassword:
67-
(!confirmPassword || confirmPassword.trim() !== password.trim()) && 'confirmPasswordHint',
65+
password: commonValidators.password(password),
66+
confirmPassword: (!confirmPassword || confirmPassword !== password) && 'confirmPasswordHint',
6867
login: commonValidators.login(login),
6968
name: commonValidators.userName(name),
7069
}),

app/src/pages/outside/registrationPage/registrationPageContainer.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ export class RegistrationPageContainer extends Component {
8989
const data = {
9090
fullName: name,
9191
login,
92-
password: password.trim(),
92+
password,
9393
email,
9494
};
9595
return fetch(URLS.userRegistration(), { method: 'post', data, params: { uuid } })
96-
.then(() => this.props.loginAction({ login, password: password.trim() }))
96+
.then(() => this.props.loginAction({ login, password }))
9797
.catch(({ message }) => {
9898
this.props.showNotification({
9999
type: NOTIFICATION_TYPES.ERROR,

0 commit comments

Comments
 (0)