Skip to content

Commit 70cdf3c

Browse files
committed
Change username auth's login to have the same signature as the rest of the functions
1 parent eb55821 commit 70cdf3c

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

examples/waspello/src/auth/LoginPage.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const LoginPage = (props) => {
2222
setErrorMessage('')
2323

2424
try {
25-
await login(usernameFieldVal, passwordFieldVal)
25+
await login({ username: usernameFieldVal, password: passwordFieldVal })
2626

2727
setUsernameFieldVal('')
2828
setPasswordFieldVal('')

examples/waspello/src/auth/SignupPage.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const SignupPage = (props) => {
2424

2525
try {
2626
await signup({ username: usernameFieldVal, password: passwordFieldVal })
27-
await login(usernameFieldVal, passwordFieldVal)
27+
await login({ username: usernameFieldVal, password: passwordFieldVal })
2828

2929
setUsernameFieldVal('')
3030
setPasswordFieldVal('')

waspc/data/Generator/templates/sdk/wasp/auth/forms/internal/usernameAndPassword/useUsernameAndPassword.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function useUsernameAndPassword({
1616
if (!isLogin) {
1717
await signup(data)
1818
}
19-
await login(data.username, data.password)
19+
await login(data)
2020

2121
onSuccess()
2222
} catch (err: unknown) {

waspc/data/Generator/templates/sdk/wasp/auth/login.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
import { api, handleApiError } from 'wasp/client/api'
33
import { initSession } from './helpers/user'
44

5-
export default async function login(username: string, password: string): Promise<void> {
5+
export default async function login(userFields: { username: string, password: string }): Promise<void> {
66
try {
7-
const args = { username, password }
8-
const response = await api.post('{= loginPath =}', args)
7+
const response = await api.post('{= loginPath =}', userFields)
98

109
await initSession(response.data.sessionId)
1110
} catch (error) {

web/docs/auth/username-and-pass/create-your-own-ui.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export function Signup() {
3838
setError(null)
3939
try {
4040
await signup({ username, password })
41-
await login(username, password)
41+
await login({ username, password })
4242
navigate('/')
4343
} catch (error) {
4444
setError(error)
@@ -88,7 +88,7 @@ export function Signup() {
8888
setError(null)
8989
try {
9090
await signup({ username, password })
91-
await login(username, password)
91+
await login({ username, password })
9292
navigate('/')
9393
} catch (error: unknown) {
9494
setError(error as Error)
@@ -142,7 +142,7 @@ export function Login() {
142142
event.preventDefault()
143143
setError(null)
144144
try {
145-
await login(username, password)
145+
await login({ username, password })
146146
navigate('/')
147147
} catch (error) {
148148
setError(error)
@@ -191,7 +191,7 @@ export function Login() {
191191
event.preventDefault()
192192
setError(null)
193193
try {
194-
await login(username, password)
194+
await login({ username, password })
195195
navigate('/')
196196
} catch (error: unknown) {
197197
setError(error as Error)
@@ -232,15 +232,15 @@ You can import the following functions from `wasp/client/auth`:
232232

233233
An action for logging in the user.
234234

235-
It takes two arguments:
235+
It takes one argument:
236236

237-
- `username: string` <Required />
237+
- `userFields: object` <Required />
238238

239-
Username of the user logging in.
239+
It has the following fields:
240240

241-
- `password: string` <Required />
241+
- `username: string` <Required />
242242

243-
Password of the user logging in.
243+
- `password: string` <Required />
244244

245245
:::note
246246
When using the exposed `login()` function, make sure to implement your redirect on success login logic (e.g. redirecting to home).

0 commit comments

Comments
 (0)