Resolves #4773: Reset password and invitation expiry #4796
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cielf
requested changes
Nov 21, 2024
| @@ -21,7 +21,7 @@ en: | |||
| hello: "Hello %{email}" | |||
| someone_invited_you: "Someone has invited you to %{url}, you can accept it through the link below." | |||
| accept: "Accept invitation" | |||
| accept_until: "This invitation will be due in %{due_date}." | |||
| accept_until: "This invitation will be due in %{due_date} GMT." | |||
| ignore: "If you don't want to accept the invitation, please ignore this email.<br />\nYour account won't be created until you access the link above and set your password." | |||
There was a problem hiding this comment.
Per the conversation in the issue, this should be "This invitation will expire at [Date and Time] GMT or if a new password reset is triggered. "
There was a problem hiding this comment.
I'm sorry, let me know if the message is correct now 🙏
| @@ -373,9 +373,6 @@ | |||
| <% if @resource.invitation_due_at %> | |||
| <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %></p> | |||
| <% end %> | |||
| <p>For security reasons these invitations expire. This invitation will expire in 8 hours or if a new password reset is triggered.</p> | |||
| <p>If your invitation has an expired message, go <%= link_to "here", new_user_password_url %> and enter your email address to reset your password.</p> | |||
| <p>Feel free to ignore this email if you are not interested or if you feel it was sent by mistake.</p> | |||
| </td> | |||
There was a problem hiding this comment.
We still need to show the text about what to do if your invitation has expired.
|
I made the changes needed, let me know if you want me to squash my commits into one or if anything else is missing 🙌 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #4773
Description
Please let me know if it is better to squash the commits into 1 or two commits.
Also, let me know if would be good to add a test with time helpers to test that in fact the invitation/password reset instruction does expire within the time frame. I didn't add them because I thought it is an expensive test to run everytime and also I thought this is something we may not change again so Idk if its worth to include it, but please let me know if it is.
Type of change
How Has This Been Tested?
User invite
Logged in as:
Go to My organization -> Users -> "Invite user to this organization"
Password reset
Sent password reset instructions in the Log In screen with org admin email: org_admin1@example.com
Screenshots
User invitation:
User password reset: