feat(account invitation): accomplish sign up before accepting the invitation #30
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
ka8725
requested changes
Aug 25, 2023
| @@ -16,6 +23,6 @@ def update | |||
| private | |||
|
|
|||
| helper_method memoize def received_invitation | |||
| AccountInvitation.unaccepted.for(current_user).find_by!(token: ps.fetch(:token)) | |||
| AccountInvitation.unaccepted.for(current_user).find_by!(token: ps[:token]) | |||
There was a problem hiding this comment.
what was the problem with the previous implementation? revert it?
There was a problem hiding this comment.
... ok, I've seen the main idea of thefetch for us: errors. Ok
| redirect_to new_user_session_url(email: AccountInvitation.find_by!(token: ps.fetch(:token)).email) | ||
| session[:after_authentication_url] = request.fullpath | ||
|
|
||
| invitee_email = AccountInvitation.find_by!(token: ps[:token]).email |
There was a problem hiding this comment.
Suggested change
| invitee_email = AccountInvitation.find_by!(token: ps[:token]).email | |
| invitee_email = AccountInvitation.find_by!(token: ps.fetch(:token)).email |
If the ps.fetch(:token) bothers you, create a private method token_param or something and use it in all places.
Comment on lines
11
to
15
| if user.present? | ||
| redirect_to new_user_session_url(email: invitee_email) | ||
| else | ||
| redirect_to new_user_registration_url(email: invitee_email) | ||
| end |
There was a problem hiding this comment.
Suggested change
| if user.present? | |
| redirect_to new_user_session_url(email: invitee_email) | |
| else | |
| redirect_to new_user_registration_url(email: invitee_email) | |
| end | |
| redirect_url = user ? new_user_session_url(email: invitee_email) : new_user_registration_url(email: invitee_email) | |
| redirect_to redirect_url |
it's a bit more DRY
ka8725
reviewed
Aug 26, 2023
| @@ -4,8 +4,13 @@ class AcceptAccountInvitationsController < ApplicationController | |||
| def show | |||
| return if user_signed_in? | |||
|
|
|||
| session[:after_sign_in_url] = request.fullpath | |||
| redirect_to new_user_session_url(email: AccountInvitation.find_by!(token: ps.fetch(:token)).email) | |||
| session[:after_authentication_url] = request.fullpath | |||
There was a problem hiding this comment.
Why changed the key :after_sign_in_url to :after_authentication_url? :after_authentication_url is longer, harder to write and spell.
ka8725
approved these changes
Aug 27, 2023
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.
No description provided.