Skip to content

Don't restrict accessing members for non-public UCRs#30613

Merged
bondydaa merged 14 commits intomainfrom
jasper-fixMembers
Dec 5, 2023
Merged

Don't restrict accessing members for non-public UCRs#30613
bondydaa merged 14 commits intomainfrom
jasper-fixMembers

Conversation

@jasperhuangg
Copy link
Copy Markdown
Contributor

@jasperhuangg jasperhuangg commented Oct 30, 2023 •
edited by github-actions bot
Loading

Details

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/329060

Tests/QA

Test accounts

  • Workspace admin
  • Workspace member
  • Non workspace member

Setup

  1. Create a workspace as the workspace admin.
  2. Invite the workspace member to the workspace.
  3. Create public/private/workspace visibility rooms as the workspace admin.
  4. Invite the workspace member and non-workspace member accounts in each of the rooms.

Steps

  1. As the workspace member account, verify you can see the "Members" tab after opening the report details. Verify clicking into it takes you to the room members page, and that you can see all the participants of the room. Repeat this for all room visibilities.
  2. As the non workspace member account, verify you can see the "Members" tab after opening the report details for the workspace and private rooms. Verify clicking into it takes you to the room members page, and that you can see all the participants of the room.
  3. As the non workspace member account, verify you see the "Invite" tab after opening the report details for the public room. Verify clicking into it takes you to the room invite page.

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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
      • 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 the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • 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

Android: Native Screenshot 2023-11-03 at 1 43 43 PM Screenshot 2023-11-03 at 1 43 51 PM
Android: mWeb Chrome Screenshot 2023-11-03 at 1 43 59 PM Screenshot 2023-11-03 at 1 44 07 PM
iOS: Native Screenshot 2023-11-03 at 1 44 46 PM Screenshot 2023-11-03 at 1 44 54 PM
iOS: mWeb Safari Screenshot 2023-11-03 at 1 44 24 PM Screenshot 2023-11-03 at 1 44 15 PM
MacOS: Chrome / Safari Screenshot 2023-11-03 at 1 45 58 PM Screenshot 2023-11-03 at 1 46 07 PM
MacOS: Desktop Screenshot 2023-11-03 at 1 46 40 PM Screenshot 2023-11-03 at 1 46 31 PM

@jasperhuangg jasperhuangg self-assigned this Oct 30, 2023
@jasperhuangg jasperhuangg changed the title Don't restrict accessing members for non-public UCRs [HOLD Auth#9083] Don't restrict accessing members for non-public UCRs Oct 30, 2023
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Oct 30, 2023

🧪🧪 Use the links below to test this build in android and iOS. Happy testing! 🧪🧪

android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/30613/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/30613/index.html
Android iOS
desktop 💻 web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/30613/NewExpensify.dmg https://30613.pr-testing.expensify.com
Desktop Web

@jasperhuangg jasperhuangg changed the title [HOLD Auth#9083] Don't restrict accessing members for non-public UCRs Don't restrict accessing members for non-public UCRs Nov 3, 2023
@Expensify Expensify deleted a comment from OSBotify Nov 3, 2023
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Nov 3, 2023

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/30613/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/30613/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/30613/NewExpensify.dmg https://30613.pr-testing.expensify.com
Desktop Web

@jasperhuangg jasperhuangg marked this pull request as ready for review November 3, 2023 20:47
@jasperhuangg jasperhuangg requested a review from a team as a code owner November 3, 2023 20:47
@melvin-bot melvin-bot bot requested review from mananjadhav and removed request for a team November 3, 2023 20:47
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Nov 3, 2023

@mananjadhav 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]

@jasperhuangg jasperhuangg changed the title Don't restrict accessing members for non-public UCRs [HOLD Auth#9124]Don't restrict accessing members for non-public UCRs Nov 3, 2023
@jasperhuangg jasperhuangg changed the title [HOLD Auth#9124]Don't restrict accessing members for non-public UCRs [HOLD Auth#9124] Don't restrict accessing members for non-public UCRs Nov 3, 2023
@mananjadhav
Copy link
Copy Markdown
Collaborator

mananjadhav commented Nov 8, 2023

@jasperhuangg Is this still on Hold?

@jasperhuangg jasperhuangg changed the title [HOLD Auth#9124] Don't restrict accessing members for non-public UCRs Don't restrict accessing members for non-public UCRs Nov 8, 2023
@jasperhuangg
Copy link
Copy Markdown
Contributor Author

jasperhuangg commented Nov 8, 2023

@mananjadhav Nope! The PR it was held on was actually just deployed yesterday, feel free to review!

@jasperhuangg
Copy link
Copy Markdown
Contributor Author

jasperhuangg commented Nov 17, 2023

@mananjadhav bump on this PR

@mananjadhav
Copy link
Copy Markdown
Collaborator

mananjadhav commented Nov 26, 2023

@jasperhuangg I haven't been able to prioritize this. Can you please reassign some other C+ here?

@jasperhuangg jasperhuangg removed the request for review from mananjadhav November 30, 2023 00:54
@allroundexperts
Copy link
Copy Markdown
Contributor

allroundexperts commented Nov 30, 2023

Taking this over!

@allroundexperts
Copy link
Copy Markdown
Contributor

allroundexperts commented Nov 30, 2023 •
edited
Loading

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: mWeb Chrome
    • iOS: Native
    • iOS: mWeb 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 the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • 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

Android: Native
Screen.Recording.2023-11-30.at.5.10.42.PM.mov
Android: mWeb Chrome
Screen.Recording.2023-11-30.at.5.08.15.PM.mov
Screen.Recording.2023-11-30.at.5.09.25.PM.mov
iOS: Native
Screen.Recording.2023-11-30.at.5.04.40.PM.mov
Screen.Recording.2023-11-30.at.5.05.43.PM.mov
iOS: mWeb Safari
Screen.Recording.2023-11-30.at.5.02.21.PM.mov
Screen.Recording.2023-11-30.at.5.03.26.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2023-11-30.at.4.53.25.PM.mov
Screen.Recording.2023-11-30.at.4.54.13.PM.mov
MacOS: Desktop
Screen.Recording.2023-11-30.at.4.59.37.PM.mov
Screen.Recording.2023-11-30.at.5.00.26.PM.mov

allroundexperts
allroundexperts reviewed Nov 30, 2023
View reviewed changes
Comment thread src/pages/RoomInvitePage.js
Copy link
Copy Markdown
Contributor

@allroundexperts allroundexperts Nov 30, 2023

Choose a reason for hiding this comment

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

Shouldn't we check here if the user is member of the room here atleast?

allroundexperts
allroundexperts reviewed Nov 30, 2023
View reviewed changes
Comment thread src/pages/RoomMembersPage.js
Copy link
Copy Markdown
Contributor

@allroundexperts allroundexperts Nov 30, 2023

Choose a reason for hiding this comment

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

Shouldn't we check here if the user is member of the room here as well?

Copy link
Copy Markdown
Contributor Author

@jasperhuangg jasperhuangg Nov 30, 2023

Choose a reason for hiding this comment

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

No this is handled already by withReportOrNotFound

allroundexperts
allroundexperts reviewed Nov 30, 2023
View reviewed changes
Comment thread src/pages/RoomMembersPage.js
>
<FullPageNotFoundView
shouldShow={_.isEmpty(props.report) || !isPolicyMember}
shouldShow={_.isEmpty(props.report) || (ReportUtils.isPublicRoom(props.report) && !isPolicyMember)}
Copy link
Copy Markdown
Contributor

@allroundexperts allroundexperts Nov 30, 2023

Choose a reason for hiding this comment

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

What happens if the user is accessing a deep link to a room in which he is neither a member nor part of the workspace?

Copy link
Copy Markdown
Contributor Author

@jasperhuangg jasperhuangg Nov 30, 2023

Choose a reason for hiding this comment

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

I believe this is handled by withReportOrNotFound

allroundexperts
allroundexperts approved these changes Nov 30, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@allroundexperts allroundexperts left a comment

Choose a reason for hiding this comment

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

Tests well!

@jasperhuangg jasperhuangg requested a review from a team November 30, 2023 20:14
@melvin-bot melvin-bot bot requested review from bondydaa and c3024 and removed request for a team November 30, 2023 20:14
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Nov 30, 2023

@bondydaa 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]

@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Nov 30, 2023

@c3024 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]

@melvin-bot melvin-bot bot mentioned this pull request Nov 30, 2023
Closed
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Nov 30, 2023

🎯 @allroundexperts, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #32300.

@jasperhuangg jasperhuangg removed the request for review from c3024 November 30, 2023 20:15
@jasperhuangg
Copy link
Copy Markdown
Contributor Author

jasperhuangg commented Nov 30, 2023

We already had a C+ assigned so unassigning the auto-assigned C+

@jasperhuangg
Copy link
Copy Markdown
Contributor Author

jasperhuangg commented Dec 4, 2023

friendly bump @bondydaa

@bondydaa bondydaa merged commit 0e3236a into main Dec 5, 2023
@bondydaa bondydaa deleted the jasper-fixMembers branch December 5, 2023 02:07
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Dec 5, 2023

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

@github-actions github-actions bot mentioned this pull request Dec 5, 2023
Closed
66 tasks
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Dec 5, 2023

🚀 Cherry-picked to staging by https://github.com/yuwenmemon in version: 1.4.7-4 🚀

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
Copy link
Copy Markdown
Contributor

OSBotify commented Dec 5, 2023

🚀 Deployed to staging by https://github.com/bondydaa in version: 1.4.8-0 🚀

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

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Dec 6, 2023

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.8-3 🚀

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

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Dec 6, 2023

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.8-3 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@bondydaa bondydaa bondydaa approved these changes

@allroundexperts allroundexperts allroundexperts approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jasperhuangg jasperhuangg

Labels

Ready To Build

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jasperhuangg @OSBotify @mananjadhav @allroundexperts @bondydaa