-
Notifications
You must be signed in to change notification settings - Fork 295
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(clerk-js,shared,types): Remove invalid email addresses from input for Organization Invitation #1869
Merged
chanioxaris
merged 1 commit into
main
from
haris/org-257-improve-behavior-of-orgprofile-invite-members-screen
Oct 16, 2023
+80
−6
Merged
feat(clerk-js,shared,types): Remove invalid email addresses from input for Organization Invitation #1869
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
--- | ||
'@clerk/clerk-js': patch | ||
'@clerk/shared': patch | ||
'@clerk/types': patch | ||
--- | ||
|
||
In invite members screen of the <OrganizationProfile /> component, consume any invalid email addresses as they are returned in the API error and remove them from the input automatically. |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -133,6 +133,65 @@ describe('InviteMembersPage', () => { | |
).toBeInTheDocument(), | ||
); | ||
}); | ||
|
||
it('removes duplicate emails from input after error', async () => { | ||
const { wrapper, fixtures } = await createFixtures(f => { | ||
f.withOrganizations(); | ||
f.withUser({ | ||
email_addresses: ['[email protected]'], | ||
organization_memberships: [{ name: 'Org1', role: 'admin' }], | ||
}); | ||
}); | ||
|
||
fixtures.clerk.organization?.inviteMembers.mockRejectedValueOnce( | ||
new ClerkAPIResponseError('Error', { | ||
data: [ | ||
{ | ||
code: 'duplicate_record', | ||
long_message: | ||
'There are already pending invitations for the following email addresses: [email protected]', | ||
message: 'duplicate invitation', | ||
meta: { email_addresses: ['[email protected]'] }, | ||
}, | ||
], | ||
status: 400, | ||
}), | ||
); | ||
const { getByRole, userEvent, getByTestId } = render(<InviteMembersPage />, { wrapper }); | ||
await userEvent.type(getByTestId('tag-input'), '[email protected]'); | ||
await userEvent.click(getByRole('button', { name: 'Send invitations' })); | ||
|
||
expect(getByTestId('tag-input')).not.toHaveValue(); | ||
}); | ||
|
||
it('removes blocked/not allowed emails from input after error', async () => { | ||
const { wrapper, fixtures } = await createFixtures(f => { | ||
f.withOrganizations(); | ||
f.withUser({ | ||
email_addresses: ['[email protected]'], | ||
organization_memberships: [{ name: 'Org1', role: 'admin' }], | ||
}); | ||
}); | ||
|
||
fixtures.clerk.organization?.inviteMembers.mockRejectedValueOnce( | ||
new ClerkAPIResponseError('Error', { | ||
data: [ | ||
{ | ||
code: 'not_allowed_access', | ||
long_message: '[email protected] is not allowed to access this application.', | ||
message: 'Access not allowed.', | ||
meta: { identifiers: ['[email protected]'] }, | ||
}, | ||
], | ||
status: 403, | ||
}), | ||
); | ||
const { getByRole, userEvent, getByTestId } = render(<InviteMembersPage />, { wrapper }); | ||
await userEvent.type(getByTestId('tag-input'), '[email protected]'); | ||
await userEvent.click(getByRole('button', { name: 'Send invitations' })); | ||
|
||
expect(getByTestId('tag-input')).not.toHaveValue(); | ||
}); | ||
}); | ||
|
||
describe('Navigation', () => { | ||
|
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chanioxaris Did we introduced that to FAPI ? I don't think we support any other identifier than emails, so is this even useful ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Allowlist & Blocklist are working for every identifier type (email_address, phone_number, web3_wallet). So in such an api error we can't limit them to only email addresses or reuse the existing meta parameter
emailAddresses
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chanioxaris Shall we update the copy here ? (Happy to do it as part of another PR)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the case of Organization Invitations, only email addresses can be provided. Although the API error is used in general for the Allowlist/Blocklist feature