Fix getSmallSizeAvatar to block url is not from cloudfront #16441

hellohublot · 2023-03-23T11:06:32Z

Details

Return the origin image url in the getSmallSizeAvatar if the url is not from cloudfront

Fixed Issues

$ #16354
$ #16354 (comment)

Tests

Sign into a valid account
Go to Settings > Profile > Click on profile photo
Click on Remove photo
Click on the profile photo again > Click on Upload photo
Select a photo and verify no errors appear in the JS console
Close modal and verify profile photo is correctly updated on LHN

Verify that no errors appear in the JS console

Offline tests

QA Steps

Sign into a valid account
Go to Settings > Profile > Click on profile photo
Click on Remove photo
Click on the profile photo again > Click on Upload photo
Select a photo and verify no errors appear in the JS console
Close modal and verify profile photo is correctly updated on LHN

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

_web.mov

Mobile Web - Chrome

_mobile_chrome.mp4

Mobile Web - Safari

_mobile_safari.mp4

Desktop

_desktop.mov

iOS

_ios.mp4

Android

_android.mp4

MelvinBot · 2023-03-23T11:06:39Z

@yuwenmemon @s77rt One of you needs to 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]

src/CONST.js

src/libs/ReportUtils.js

github-actions · 2023-03-23T20:12:16Z

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

hellohublot · 2023-03-24T04:08:47Z

I don't know if I double-clicked the request-re-review button, and then accidentally removed the Expensify reviewer. Sorry.
@yuwenmemon @s77rt Could you please help me to review again, Thank you

src/CONST.js

src/libs/ReportUtils.js

s77rt

Code looks good, just a minor comment change

src/libs/ReportUtils.js

s77rt · 2023-03-24T12:28:55Z

For tests please change to:
Select a photo and verify no errors appear in the JS console
Close modal and verify profile photo is correctly updated on LHN

and remove this step: Open your JS console

s77rt · 2023-03-24T12:55:17Z

@hellohublot Please do not press request review, this will also unassign others

s77rt · 2023-03-24T13:15:51Z

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 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 correct English and 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 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

web.mp4

Mobile Web - Chrome

I'm not able to test on mWeb - Chrome. Not related to this PR probably something related to Simulator where the file picker on browser does not come up.

Mobile Web - Safari

mweb-safari.mp4

Desktop

desktop.mp4

iOS

ios.mp4

Android

android.mp4

s77rt · 2023-03-24T13:21:41Z

@vit can you please assign @yuwenmemon back

AndrewGable · 2023-03-24T15:41:05Z

@s77rt - I can review or @yuwenmemon can too, just want to make sure this is approved by you first?

s77rt

LGTM! 🚀

s77rt · 2023-03-24T16:08:09Z

@AndrewGable You can review too. I just approved the PR.

MelvinBot · 2023-03-24T16:11:00Z

Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

…loudfront Fix getSmallSizeAvatar to block url is not from cloudfront (cherry picked from commit 4350683)

…-16441 🍒 Cherry pick PR #16441 to staging 🍒

OSBotify · 2023-03-24T17:52:01Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.2.88-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2023-03-24T23:59:13Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.2.88-2 🚀

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

OSBotify · 2023-03-27T09:45:37Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.2.88-2 🚀

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

OSBotify · 2023-06-15T01:34:55Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2023-06-16T18:52:39Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

Fix getSmallSizeAvatar to block url not from cloudfront

1be081c

hellohublot requested a review from a team as a code owner March 23, 2023 11:06

melvin-bot bot requested review from s77rt and yuwenmemon and removed request for a team March 23, 2023 11:06

hellohublot added 2 commits March 23, 2023 19:12

Fix Lint

45030df

Fix Lint

ecc8597

s77rt suggested changes Mar 23, 2023

View reviewed changes

src/CONST.js Outdated Show resolved Hide resolved

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

AndrewGable added the CP Staging label Mar 23, 2023

Fix the regexp and clarify the comment

0a3d84d

hellohublot requested review from s77rt and removed request for yuwenmemon March 24, 2023 03:56

s77rt suggested changes Mar 24, 2023

View reviewed changes

src/CONST.js Outdated Show resolved Hide resolved

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

Replace RegExp and avatarURL

b9516f0

hellohublot requested a review from s77rt March 24, 2023 05:27

s77rt suggested changes Mar 24, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

Replace the comment avatarURL

f182f7c

hellohublot requested a review from s77rt March 24, 2023 12:48

AndrewGable requested a review from yuwenmemon March 24, 2023 15:39

s77rt approved these changes Mar 24, 2023

View reviewed changes

AndrewGable approved these changes Mar 24, 2023

View reviewed changes

AndrewGable merged commit 4350683 into Expensify:main Mar 24, 2023

OSBotify pushed a commit that referenced this pull request Mar 24, 2023

Merge pull request #16441 from hellohublot/16354_getSmallSizeAvatar_c…

bc77d3c

…loudfront Fix getSmallSizeAvatar to block url is not from cloudfront (cherry picked from commit 4350683)

OSBotify mentioned this pull request Mar 24, 2023

🍒 Cherry pick PR #16441 to staging 🍒 #16482

Merged

OSBotify added a commit that referenced this pull request Mar 24, 2023

Merge pull request #16482 from Expensify/OSBotify-cherry-pick-staging…

e67e03b

…-16441 🍒 Cherry pick PR #16441 to staging 🍒

OSBotify mentioned this pull request Mar 24, 2023

Deploy Checklist: New Expensify 2023-03-21 #16345

Closed

28 tasks

MelvinBot mentioned this pull request Mar 24, 2023

[PAID] [$1000] Setting - Console error appears and avatar is broken when uploading a photo to the profile #16354

Closed

6 tasks

OSBotify mentioned this pull request Mar 24, 2023

Deploy Checklist: New Expensify 2023-03-24 #16489

Closed

44 tasks

OSBotify mentioned this pull request May 2, 2023

Deploy Checklist: New Expensify 2023-05-02 #18315

Closed

OSBotify mentioned this pull request Jun 15, 2023

Deploy Checklist: New Expensify 2023-06-14 #20782

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix getSmallSizeAvatar to block url is not from cloudfront #16441

Fix getSmallSizeAvatar to block url is not from cloudfront #16441

hellohublot commented Mar 23, 2023 •

edited

Loading

MelvinBot commented Mar 23, 2023

github-actions bot commented Mar 23, 2023

hellohublot commented Mar 24, 2023

s77rt left a comment

s77rt commented Mar 24, 2023 •

edited

Loading

s77rt commented Mar 24, 2023

s77rt commented Mar 24, 2023

s77rt commented Mar 24, 2023

AndrewGable commented Mar 24, 2023

s77rt left a comment

s77rt commented Mar 24, 2023

MelvinBot commented Mar 24, 2023

OSBotify commented Mar 24, 2023

OSBotify commented Mar 24, 2023

OSBotify commented Mar 27, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

Fix getSmallSizeAvatar to block url is not from cloudfront #16441

Fix getSmallSizeAvatar to block url is not from cloudfront #16441

Conversation

hellohublot commented Mar 23, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

MelvinBot commented Mar 23, 2023

github-actions bot commented Mar 23, 2023

hellohublot commented Mar 24, 2023

s77rt left a comment

Choose a reason for hiding this comment

s77rt commented Mar 24, 2023 • edited Loading

s77rt commented Mar 24, 2023

s77rt commented Mar 24, 2023

Reviewer Checklist

Screenshots/Videos

s77rt commented Mar 24, 2023

AndrewGable commented Mar 24, 2023

s77rt left a comment

Choose a reason for hiding this comment

s77rt commented Mar 24, 2023

MelvinBot commented Mar 24, 2023

OSBotify commented Mar 24, 2023

OSBotify commented Mar 24, 2023

OSBotify commented Mar 27, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

hellohublot commented Mar 23, 2023 •

edited

Loading

s77rt commented Mar 24, 2023 •

edited

Loading