Bug 5901 fix resend invitation from create invite #7790
Merged
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
… not confirmed their invite - Added a boolean for shouldCreate or shouldUpdate essentially - Checks for a user in the database by looking at memberships with the same user email that aren't confirmed - Still throws duplicate error if *confirmed* user with same email exists and this endpoint is attempted to be hit
…ttps://github.com/ZachHandley/appwrite into bug-5901-fix-resend-invitation-from-create-invite # Conflicts: # app/controllers/api/teams.php
Fixed code formatting, I believe I resolved the merge conflicts
2 tasks
stnguyen90
requested changes
Mar 20, 2024
|
@stnguyen90 swapped it, sorry for the delay |
stnguyen90
requested changes
Apr 4, 2024
stnguyen90
requested changes
Apr 8, 2024
stnguyen90
requested changes
Apr 23, 2024
stnguyen90
merged commit 9054bda
into
appwrite:fix-5901-fix-resend-team-invite
15 of 21 checks passed
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.
I merged heads to resolve the merge conflicts and check something in my code to make sure I didn't see a bug, and that closed my pull request, so anyways this one says it can merge automatically @stnguyen90 sorry about the closed one
What does this PR do?
Adds a new call into the
createMembershipendpoint that checks the database for an unconfirmed membership with the same userEmail. If they don't exist, it creates a membership like normal, which will throw a duplicate error like normal if the users email exists.If they do exist, it will set the
$membershipto the found membership, and set the attributeinvitedtoDateTime::now(), then updates the user and it continues onward like normal then sends the email, many success!Test Plan
The only possible problem this could have was in the
$dbForProject->updateDocument(with the $collectionId or something being included like in the client SDK's was my thought) but I have looked at the other code in theteams.phpfile and they seem to be doing things the same way, so it shouldn't conflict at all.Related PRs and Issues
Checklist