Skip to content

Commit facdebe

Browse files
committed
Clarify activation/set-password/redirection behavior
See #734 + craftcms/cms#17522!
1 parent c13b1eb commit facdebe

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

docs/5.x/reference/controller-actions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ For <badge vertical="baseline" type="verb">POST</badge> requests:
311311

312312
State | `text/html` | `application/json`
313313
----- | ----------- | ------------------
314-
<check-mark label="Success" /> | [Standard behavior][success-after-post]; redirection depends on the <config5:autoLoginAfterAccountActivation> and <config5:setPasswordSuccessPath> config settings, and whether the user has access to the control panel. | [Standard behavior][success-after-post]; additional `csrfTokenName` key will be available in the response object.
315-
<x-mark label="Failure" /> | [Standard behavior][failure-during-post]; `errors` , `code`, `id`, and `newUser` variables will be passed to the resulting template. | [Standard behavior][failure-during-post].
314+
<check-mark label="Success" /> | [Standard behavior][success-after-post]; redirection depends on the user’s [status](../system/user-management.md#statuses), the <config5:autoLoginAfterAccountActivation> and <config5:setPasswordSuccessPath> config settings, and whether the user has access to the control panel. | [Standard behavior][success-after-post]; additional `csrfTokenName` key will be available in the response object.
315+
<x-mark label="Failure" /> | [Standard behavior][failure-during-post]; `errors`, `code`, `id`, and `newUser` variables will be passed to the resulting template. | [Standard behavior][failure-during-post].
316316

317317
</span>
318318

docs/5.x/system/user-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ Fine-grained control over registration and sign-in workflows are possible with t
519519
- <config5:verifyEmailSuccessPath> — Similar to `setPasswordSuccessPath`, but for redirection after a user verifies their email address (either upon creating an account, or changing its email address).
520520
- <config5:useEmailAsUsername> — Simplifies record-keeping and authentication by eliminating discrete usernames.
521521
- Security and timing…
522-
- <config5:autoLoginAfterAccountActivation> — Control whether users are immediately logged in after setting a password. (Default: `false`)
522+
- <config5:autoLoginAfterAccountActivation> — Control whether users are immediately logged in after completing registration (typically when a [pending](#statuses) user clicking an email confirmation link or setting a password). (Default: `false`)
523523
- <config5:purgePendingUsersDuration> — How long Craft waits before deleting pending, non-activated users. (Default: `0`, or _disabled_)
524524
- <config5:purgeStaleUserSessionDuration> — How long Craft waits before dropping stale sessions from the `sessions` database table. This may (Default: 90 days)
525525
- <config5:invalidUserTokenPath> — Where users are redirected if the token or code in an activation or verification link is invalid or has expired.

0 commit comments

Comments
 (0)