fix: Can't re-send shop manager invite to existing non-activated user #5178
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
Signed-off-by: Loan Laux <loan@outgrow.io>
Signed-off-by: Loan Laux <loan@outgrow.io>
…en and send new invite Signed-off-by: Loan Laux <loan@outgrow.io>
aldeed
requested changes
Jun 9, 2019
There was a problem hiding this comment.
Just one comment in two places, but otherwise I think this can be merged. Thanks @loan-laux !
imports/plugins/core/accounts/client/components/adminInviteForm.js
Outdated
Show resolved
Hide resolved
imports/plugins/core/accounts/server/methods/inviteShopMember.js
Outdated
Show resolved
Hide resolved
|
Ping @loan-laux |
|
Sorry @aldeed, I was on vacation and just came back today. I'll implement the requested changes today. |
Signed-off-by: Loan Laux <loan@outgrow.io>
loan-laux
force-pushed
the
outgrow-fix-admin-invite-flow
branch
from
798c5e5
to
71697cb
Compare
|
@aldeed Let me know if this fix is what you had in mind. |
aldeed
approved these changes
Jun 28, 2019
willopez
requested changes
Jun 28, 2019
imports/plugins/core/accounts/server/methods/inviteShopMember.js
Outdated
Show resolved
Hide resolved
Signed-off-by: Loan Laux <loan@outgrow.io>
Signed-off-by: Loan Laux <loan@outgrow.io>
…action into outgrow-fix-admin-invite-flow
|
Good catch @willopez, thanks! |
|
integration tests failing due to this known issue: #5246. I have verified all tests pass locally. |
|
@loan-laux thank you for your contribution 👍 |
Merged
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 #5176
Impact: major
Type: bugfix
Issue
After sending a shop manager invite to a non-registered e-mail, a new user is created for them with a token to be used to set their password. An e-mail invite is then sent with a URL containing this token.
However, if you want to re-send an invitation to this same person, the
accounts/inviteShopMemberwill see an existing account for this e-mail, not checking whether it was activated or not. This means that no new "set password" token will be sent, and the user will be promoted to shop manager (which it already was), as if it was an already active account.Solution
In the
accounts/inviteShopMemberlogic, if an account already exists for the e-mail address but isn't activated yet, generate a new token and send a new invite.Also, add some confirmation dialogs in case an e-mail already exists, whether it's activated or not.
Breaking changes
None.
Testing
Accountspage of the operator, invite an e-mail address that's already registered and activated.