Skip to content
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

fix: do not escape HTML special chars for an invite's welcomeNote #21912

Merged
merged 2 commits into from
Jul 31, 2023

Conversation

akinwale
Copy link
Contributor

Details

This removes the escape operation performed on the welcomeNote.

Fixed Issues

$ #20081
PROPOSAL: #20081 (comment)

Tests

  1. Launch the app
  2. Navigate to Settings > Workspaces
  3. Select any Workspace or create a new one
  4. Select Members
  5. Click on Invite
  6. Select a user with a contact number (user who has contact number as primary contact) and click Next. The contact number should be able to receive SMS / text messages
  7. Use the default invite message, or write any message containing an apostrophe. Eg: "This is test's message".
  8. Click on Invite
  9. Verify that the text message received by the contact number contains the actual apostrophes in the invite message, and not escaped HTML sequences.
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android / native
    • Android / Chrome
    • iOS / native
    • iOS / Safari
    • MacOS / Chrome / Safari
    • MacOS / Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

20081-web

Mobile Web - Chrome

20081-android-chrome

Mobile Web - Safari

20081-ios-safari

Desktop

20081-desktop

iOS

20081-ios-native

Android

20081-android-native

@akinwale akinwale requested a review from a team as a code owner June 29, 2023 21:38
@melvin-bot melvin-bot bot requested review from 0xmiros and removed request for a team June 29, 2023 21:38
@melvin-bot
Copy link

melvin-bot bot commented Jun 29, 2023

@0xmiroslav Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@0xmiros
Copy link
Contributor

0xmiros commented Jun 29, 2023

We should wait until backend update is deployed to staging. And for regression test, we should invite both email and phone contacts and check both email and SMS.

@cristipaval
Copy link
Contributor

cristipaval commented Jun 30, 2023

@akinwale Did you manage to test this? I haven't changed the backend yet, and after the first glance, we might not need to do any changes there.

@0xmiroslav @akinwale Could you also please test this with the other characters that are supposed to be escaped in an HTML string? Let's test all of them for both email and SMS.

@akinwale
Copy link
Contributor Author

akinwale commented Jun 30, 2023

@akinwale Did you manage to test this? I haven't changed the backend yet, and after the first glance, we might not need to do any changes there.

@cristipaval Yes, I did with both an email and SMS recipient. I can include screenshots of the received messages if required.

@0xmiroslav @akinwale Could you also please test this with the other characters that are supposed to be escaped in an HTML string? Let's test all of them for both email and SMS.

Based on the documentation for the escape method, that means we'll test with these characters:
&, <, >, ", the backtick character (trying to escape it breaks formatting), and '.

@akinwale
Copy link
Contributor Author

akinwale commented Jun 30, 2023

@cristipaval @0xmiroslav

Ran the following tests.

Test 1

It appears that HTML tags are being stripped out by the backend for both emails and SMS (anything between the < and >characters inclusive) as can be observed from the message in the email and SMS screenshots attached. Also, for only the SMS, backticks (wrapping the number 10) were converted to single quotes / apostrophes.

Invite message
invite_message_1

SMS received (last message in thread)
screenshot

Email received
screenshot

Test 2

For the SMS message, backticks were converted to single quotes. All other characters appear to display fine here.

Invite message
invite_message_2

SMS received (last message in thread)
screenshot

Email received
screenshot

@cristipaval
Copy link
Contributor

Thanks a lot for your testing @akinwale.
I'll close this PR though, please see this for more info.

@cristipaval cristipaval self-requested a review July 11, 2023 10:30
@cristipaval cristipaval reopened this Jul 11, 2023
@cristipaval
Copy link
Contributor

I reopened this after some internal discussions. We want this solution. I'll add a HOLD on this PR because we need a Web-PR deployed before merging this one.

@cristipaval cristipaval changed the title fix: do not escape HTML special chars for an invite's welcomeNote [HOLD Web-E PR #38012] fix: do not escape HTML special chars for an invite's welcomeNote Jul 11, 2023
@cristipaval
Copy link
Contributor

FYI: We're close to get the Web-E PR merged.

@cristipaval cristipaval changed the title [HOLD Web-E PR #38012] fix: do not escape HTML special chars for an invite's welcomeNote fix: do not escape HTML special chars for an invite's welcomeNote Jul 27, 2023
@cristipaval
Copy link
Contributor

This is off hold. @akinwale Could you please merge latest main into this branch and make it ready for @0xmiroslav to test?

@akinwale
Copy link
Contributor Author

@cristipaval Done!

@akinwale
Copy link
Contributor Author

@0xmiroslav This is ready for review. Thanks.

@0xmiros
Copy link
Contributor

0xmiros commented Jul 28, 2023

Workspace invite message not received from SMS.
@akinwale did you test?

@akinwale
Copy link
Contributor Author

Workspace invite message not received from SMS. @akinwale did you test?

@0xmiroslav Yes, I did, and I received the SMS messages as expected, as well as the email.
Perhaps it could be due to mobile provider delivery delays or issues.

@cristipaval
Copy link
Contributor

Workspace invite message not received from SMS. @akinwale did you test?

Wait, I think we limited Twilio to some countries only in staging. @0xmiroslav Could you please try in dev?

@0xmiros
Copy link
Contributor

0xmiros commented Jul 28, 2023

Could you please try in dev?

You mean api point to production?

@cristipaval
Copy link
Contributor

Could you please try in dev?

You mean api point to production?

Sorry, I'm stupid... you don't have access to dev backend.
@0xmiroslav @akinwale Could you both tell me what country codes your phone numbers have?

@akinwale
Copy link
Contributor Author

Could you please try in dev?

You mean api point to production?

Sorry, I'm stupid... you don't have access to dev backend. @0xmiroslav @akinwale Could you both tell me what country codes your phone numbers have?

@cristipaval US country code for mine.

@cristipaval
Copy link
Contributor

That's why it works for you, @akinwale 👍

@cristipaval
Copy link
Contributor

I can do the sms screenshot for you, @0xmiroslav

@0xmiros
Copy link
Contributor

0xmiros commented Jul 28, 2023

I can do the sms screenshot for you, @0xmiroslav

Thanks

@0xmiros
Copy link
Contributor

0xmiros commented Jul 28, 2023

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • Android / native
    • Android / Chrome
    • iOS / native
    • iOS / Safari
    • MacOS / Chrome / Safari
    • MacOS / Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web test1 test2
Mobile Web - Chrome
Mobile Web - Safari
Desktop
iOS
Android

The SMS screenshot below is added by @cristipaval according to this comment.
IMG_DB58EC5789D8-1

Copy link
Contributor

@0xmiros 0xmiros left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cristipaval all yours

@cristipaval cristipaval merged commit 1eb16f3 into Expensify:main Jul 31, 2023
11 checks passed
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/cristipaval in version: 1.3.48-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@OSBotify
Copy link
Contributor

OSBotify commented Aug 1, 2023

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.48-5 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@OSBotify
Copy link
Contributor

OSBotify commented Aug 2, 2023

🚀 Deployed to staging by https://github.com/cristipaval in version: 1.3.49-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@OSBotify
Copy link
Contributor

OSBotify commented Aug 3, 2023

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.49-3 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@Pluto0104

This comment was marked as off-topic.

@pradeepmdk
Copy link
Contributor

@Pluto0104 I think this bug does not create a regression there. here they are fixing just remove the _.escape keyword.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants