Skip to content

Commit 845030f

Browse files
authored
Merge pull request #6429 from espoon-voltti/auth-small-fixes-part-4
Korjataan bugi jonka takia salasanassa ei voinut olla välilyöntejä alussa tai lopussa
2 parents e4407d0 + 1f4afca commit 845030f

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

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

+7-5
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,8 @@ export default React.memo(function WeakLoginFormPage() {
6767

6868
const weakLoginForm = object({
6969
username: validated(required(string()), nonBlank),
70-
password: validated(required(string()), nonBlank)
70+
// value<string> is used to avoid trimming
71+
password: validated(required(value<string>()), nonBlank)
7172
})
7273

7374
const authWeakLoginResult = wrapResult(authWeakLogin)
@@ -134,9 +135,10 @@ const WeakLoginForm = React.memo(function WeakLogin({
134135
type="submit"
135136
text={t.link}
136137
disabled={!form.isValid()}
137-
onClick={() =>
138-
authWeakLoginResult(form.state.username, form.state.password)
139-
}
138+
onClick={() => {
139+
const { username, password } = form.value()
140+
return authWeakLoginResult(username, password)
141+
}}
140142
onSuccess={() => window.location.replace(nextUrl ?? '/')}
141143
onFailure={(error) => {
142144
if (error.statusCode === 429) {

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

+4-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,13 @@ const WeakCredentialsFormModal = React.memo(function WeakCredentialsFormModal({
233232
() =>
234233
validated(
235234
object({
236-
password: validated(required(string()), (password) =>
235+
// value<string> is used to avoid trimming
236+
password: validated(required(value<string>()), (password) =>
237237
isPasswordStructureValid(passwordConstraints, password)
238238
? undefined
239239
: 'passwordFormat'
240240
),
241-
confirmPassword: required(string())
241+
confirmPassword: required(value<string>())
242242
}),
243243
(form) =>
244244
form.password !== form.confirmPassword

0 commit comments

Comments
 (0)