From c436205e3db339062111b5910546e154be3732cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonyi=20Gerg=C5=91?= <28359278+gergosimonyi@users.noreply.github.com> Date: Wed, 18 Dec 2024 00:31:07 +0100 Subject: [PATCH] website/docs: miscellaneous fixes (#12351) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * website/docs: miscellaneous fixes * restore trailing space in signature delimiter Co-authored-by: Marc 'risson' Schmitt Signed-off-by: Simonyi Gergő <28359278+gergosimonyi@users.noreply.github.com> * add link to Brands Co-authored-by: Tana M Berry Signed-off-by: Simonyi Gergő <28359278+gergosimonyi@users.noreply.github.com> * fix inaccuracies Signed-off-by: Jens Langhammer --------- Signed-off-by: Simonyi Gergő <28359278+gergosimonyi@users.noreply.github.com> Signed-off-by: Jens Langhammer Co-authored-by: Marc 'risson' Schmitt Co-authored-by: Tana M Berry Co-authored-by: Jens Langhammer --- .../email/templates/email/password_reset.html | 2 +- .../email/templates/email/password_reset.txt | 2 +- web/src/admin/users/UserListPage.ts | 2 +- .../user/user_basic_operations.md | 18 +++++++++++++----- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/authentik/stages/email/templates/email/password_reset.html b/authentik/stages/email/templates/email/password_reset.html index 855f48c25e..15a96991fb 100644 --- a/authentik/stages/email/templates/email/password_reset.html +++ b/authentik/stages/email/templates/email/password_reset.html @@ -37,7 +37,7 @@ {% blocktrans with expires=expires|naturaltime %} - If you did not request a password change, please ignore this Email. The link above is valid for {{ expires }}. + If you did not request a password change, please ignore this email. The link above is valid for {{ expires }}. {% endblocktrans %} diff --git a/authentik/stages/email/templates/email/password_reset.txt b/authentik/stages/email/templates/email/password_reset.txt index 7c4aa89b11..51f659ddbf 100644 --- a/authentik/stages/email/templates/email/password_reset.txt +++ b/authentik/stages/email/templates/email/password_reset.txt @@ -5,7 +5,7 @@ You recently requested to change your password for your authentik account. Use t {% endblocktrans %} {{ url }} {% blocktrans with expires=expires|naturaltime %} -If you did not request a password change, please ignore this Email. The link above is valid for {{ expires }}. +If you did not request a password change, please ignore this email. The link above is valid for {{ expires }}. {% endblocktrans %} -- diff --git a/web/src/admin/users/UserListPage.ts b/web/src/admin/users/UserListPage.ts index 215b8882bc..7db5aae60a 100644 --- a/web/src/admin/users/UserListPage.ts +++ b/web/src/admin/users/UserListPage.ts @@ -377,7 +377,7 @@ export class UserListPage extends WithBrandConfig(WithCapabilitiesConfig(TablePa ` : html`

${msg( - "To let a user directly reset a their password, configure a recovery flow on the currently active brand.", + "To let a user directly reset their password, configure a recovery flow on the currently active brand.", )}

`} diff --git a/website/docs/users-sources/user/user_basic_operations.md b/website/docs/users-sources/user/user_basic_operations.md index 882fc56959..3381ff8fa3 100644 --- a/website/docs/users-sources/user/user_basic_operations.md +++ b/website/docs/users-sources/user/user_basic_operations.md @@ -74,21 +74,29 @@ For more information, review ["Permissions"](../access-control/permissions.md). If a user has lost their credentials, there are several options. -### Email them a recovery link +### Generate a recovery link + +:::info +This option is only available if a default recovery flow was configured for the currently active brand. +::: 1. In the Admin interface, navigate to **Directory > Users** to display all users. 2. Either click the name of the user to display the full User details page, or click the chevron (the › symbol) beside their name to expand the options. -3. To generate a recovery link, which you can then copy and paste into an email, click **View recovery link**. +3. To generate a recovery link, which you can then copy and paste into an email, click **Create recovery link**. A pop-up will appear on your browser with the link for you to copy and to send to the user. -### Automate email to a user +### Email them a recovery link -You can use our automated email to send a link with the URL for the user to reset their password. This option will only work if you have properly [configured a SMTP server during the installation](../../install-config/install/docker-compose.mdx#email-configuration-optional-but-recommended) and set an email address for the user. +:::info +This option is only available if a default recovery flow was configured for the currently active brand and if the configured flow has an [Email Stage](../../add-secure-apps/flows-stages/stages/email/index.mdx) bound to it. +::: + +You can send a link with the URL for the user to reset their password via Email. This option will only work if you have properly [configured a SMTP server during the installation](../../install-config/install/docker-compose.mdx#email-configuration-optional-but-recommended) and set an email address for the user. 1. In the Admin interface, navigate to **Directory > Users** to display all users. 2. Either click the name of the user to display the full User details page, or click the chevron beside their name to expand the toptions. -3. To send the automated email to the user, click **Email recovery link**. +3. To send the email to the user, click **Email recovery link**. If the user does not receive the email, check if the mail server parameters [are properly configured](../../troubleshooting/emails.md).