Skip to content

Commit 69de241

Browse files
committed
Don't trim password fields
1 parent a82f731 commit 69de241

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

frontend/src/citizen-frontend/login/WeakLoginFormPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { Navigate, useSearchParams } from 'react-router'
88
import { authWeakLogin } from 'citizen-frontend/auth/api'
99
import { wrapResult } from 'lib-common/api'
1010
import { string } from 'lib-common/form/fields'
11-
import { object, required, validated } from 'lib-common/form/form'
11+
import { object, required, validated, value } from 'lib-common/form/form'
1212
import { useForm, useFormFields } from 'lib-common/form/hooks'
1313
import { nonBlank } from 'lib-common/form/validators'
1414
import { parseUrlWithOrigin } from 'lib-common/utils/parse-url-with-origin'
@@ -67,7 +67,7 @@ export default React.memo(function WeakLoginFormPage() {
6767

6868
const weakLoginForm = object({
6969
username: validated(required(string()), nonBlank),
70-
password: validated(required(string()), nonBlank)
70+
password: validated(required(value<string>()), nonBlank)
7171
})
7272

7373
const authWeakLoginResult = wrapResult(authWeakLogin)

frontend/src/citizen-frontend/personal-details/LoginDetailsSection.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import styled from 'styled-components'
77

88
import ModalAccessibilityWrapper from 'citizen-frontend/ModalAccessibilityWrapper'
99
import { Failure } from 'lib-common/api'
10-
import { string } from 'lib-common/form/fields'
11-
import { object, required, validated } from 'lib-common/form/form'
10+
import { object, required, validated, value } from 'lib-common/form/form'
1211
import { useBoolean, useForm, useFormFields } from 'lib-common/form/hooks'
1312
import { EmailVerificationStatusResponse } from 'lib-common/generated/api-types/pis'
1413
import { PasswordConstraints } from 'lib-common/generated/api-types/shared'
@@ -233,12 +232,12 @@ const WeakCredentialsFormModal = React.memo(function WeakCredentialsFormModal({
233232
() =>
234233
validated(
235234
object({
236-
password: validated(required(string()), (password) =>
235+
password: validated(required(value<string>()), (password) =>
237236
isPasswordStructureValid(passwordConstraints, password)
238237
? undefined
239238
: 'passwordFormat'
240239
),
241-
confirmPassword: required(string())
240+
confirmPassword: required(value<string>())
242241
}),
243242
(form) =>
244243
form.password !== form.confirmPassword

0 commit comments

Comments
 (0)