Prevent removal of admin and default members from workspace chats #43065

brunovjk · 2024-06-04T19:47:58Z

Details

This PR addresses an issue where workspace admins and default-added-users were inadvertently selectable for removal from workspace chats. To fix this, the PR implements controls based on user roles, as documented in workspace rooms and workspace chats.

Fixed Issues

$ #35391
PROPOSAL: N/A

Pre-condition:

1. We need 4 accounts for this test:

Workspace Creator
Workspace Admin
Workspace Member
No-workspace member (invited)

2. Login in the app as "Workspace Creator"
3. Create a workspace
4. Go to the automatically created "Workspace Chat"
5. Go to the "Report Details"
6. Go to "Members" page > Click "Invite"
7. Invite all the other 3 accounts (admin, member, and invited) to the "Workspace Chat"
8. Still on the "Members" page, change the admin role to Administrator
8. Click on the "Global Fab" > "Start Chat" > Select "#Room" tab
9. Create a "workspace-room"
10. Invite all the other 3 accounts (admin, member, and invited) to the "workspace-room"

Tests:

1. Logged as the "Workspace Creator":

i. Go to the "Workspace Chat" > Report Details page
ii. Verify that the "Leave" button doesn't show, as you are a "workspace admin".
iii. Go to "Members" page
iv. Verify that you cannot select/remove admin and default added members
v. Verify that you can "Invite" and "Remove" (admin cannot be removed) members
vi. Go to the "workspace-room" > Report Details page
vii. Go to "Members" page
viii. Verify that you can "Invite" and "Remove" (you cannot remove yourself here) members

2. Logged as the "Workspace Admin":

i. Go to the "Workspace Chat" > Report Details page
ii. Verify that the "Leave" button doesn't show, as you are a "workspace admin".
iii. Go to "Members" page
iv. Verify that you cannot select/remove admin and default added members
v. Verify that you can "Invite" and "Remove" (admin cannot be removed) members
vi. Go to the "workspace-room" > Report Details page
vii. Go to "Members" page
viii. Verify that you can "Invite" and "Remove" (you cannot remove yourself here) members

3. Logged as the "Workspace Member":

i. Go to the "Workspace Chat" > Report Details page
ii. Verify that the "Invite" button does not show.
iii. Go to "Members" page
iv. Verify that you cannot "Invite" and "Remove" members.
vii. Logged as the "Workspace Member" > Go to the "workspace-room" > Report Details page
viii. Verify that the "Invite" button does not show.
x. Go to "Members" page
xi. Verify that you can "Invite" and "Remove" (you cannot remove yourself here) members.

4. Logged as the "Workspace Chat Invited":

i. Go to the "Workspace Chat" > Report Details page
ii. Verify that the "Invite" button does not show.
iii. Go to "Members" page
iv. Verify that you cannot "Invite" and "Remove" members.
vii. Logged as the "Workspace Room Invited" > Go to the "workspace-room" > Report Details page
viii. Verify that the "Invite" button does show and you can invite members to the chat.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as Tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android.-.Native.mov

Android: mWeb Chrome

Android.-.mWeb.mov

iOS: Native

MacOS.-.iOS.Native.mov

iOS: mWeb Safari

MacOS.-.iOS.mWeb.mov

MacOS: Chrome / Safari

MacOS.-.Chorme.mov

MacOS: Desktop

MacOS.-.Desktop.mov

melvin-bot · 2024-06-08T20:50:56Z

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

mananjadhav · 2024-06-09T04:55:41Z

@brunovjk can you fix the lint issues? I can then review the code.

brunovjk · 2024-06-09T21:18:56Z

@brunovjk can you fix the lint issues? I can then review the code.

All good here @mananjadhav :D

mananjadhav · 2024-06-10T16:42:24Z

Thanks @brunovjk for fixing this. I am currently testing it now.

mananjadhav · 2024-06-11T23:14:26Z

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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

android-prevent-admin-removal.mov

Android: mWeb Chrome

mweb-chrome-prevent-admin-removal.mov

iOS: Native

ios-prevent-admin-removal.mov

iOS: mWeb Safari

mweb-safari-prevent-admin-removal.mov

MacOS: Chrome / Safari

web-prevent-admin-removal.mov

MacOS: Desktop

desktop-prevent-admin-removal.mov

src/pages/ReportDetailsPage.tsx

brunovjk · 2024-06-13T18:59:54Z

Resolve conflicts.
Re-tested all the flows described in README here, and everything looks good to me.

Note: We still have a type error that is being resolved here, will "merge main" when fixed.

brunovjk · 2024-06-14T15:59:43Z

All yours @jasperhuangg :D

OSBotify · 2024-06-14T16:41:53Z

✋ 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 · 2024-06-14T23:16:39Z

🚀 Deployed to staging by https://github.com/jasperhuangg in version: 1.4.84-0 🚀

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

kbecciv · 2024-06-17T17:14:54Z

This PR is failing because of issue #35391

The issue is reproducible in: Web

Screen.Recording.2024-06-16.at.6.50.53.in.the.evening.mp4

brunovjk · 2024-06-17T17:36:38Z

This PR is failing because of issue #35391

The issue is reproducible in: Web

Screen.Recording.2024-06-16.at.6.50.53.in.the.evening.mp4

I'm sorry, but the test steps were wrong. I fixed it now:

Logged as the "Workspace Member":
...
... Go to the "workspace-room"

xi. Verify that you cannot "Invite" and "Remove" (you cannot remove yourself here) members.

xi. Verify that you can "Invite" and "Remove" (you cannot remove yourself here) members.

reference: https://github.com/Expensify/App?tab=readme-ov-file#workspace-rooms

cc: @kbecciv

OSBotify · 2024-06-17T23:48:52Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.4.84-3 🚀

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

kbecciv · 2024-06-18T11:53:20Z

PR is Pass according to the new step #43065 (comment)

Screen.Recording.2024-06-18.at.8.22.37.in.the.morning.mp4

jayeshmangwani · 2024-07-17T19:08:50Z

src/pages/RoomMembersPage.tsx

@@ -182,12 +184,14 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
                return;
            }
            const pendingChatMember = report?.pendingChatMembers?.findLast((member) => member.accountID === accountID.toString());
+            const isAdmin = !!(policy && policy.employeeList && details.login && policy.employeeList[details.login]?.role === CONST.POLICY.ROLE.ADMIN);
+            const isDisabled = (isPolicyExpenseChat && isAdmin) || accountID === session?.accountID || pendingChatMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;


Regarding this issue #42928, when determining if the option should be disabled, we should have also checked the workspace chat's ownerAccountID and disable it when account id matches the ownerAccountID.

We fixed this by adding a check details.accountID === report.ownerAccountID;

Fix: Prevent removal of default members from workspace chats

85c80d0

brunovjk force-pushed the fix/35391 branch from 94f874d to 85c80d0 Compare June 8, 2024 20:24

remove spaces

c507c78

brunovjk marked this pull request as ready for review June 8, 2024 20:50

brunovjk requested a review from a team as a code owner June 8, 2024 20:50

melvin-bot bot removed the request for review from a team June 8, 2024 20:50

melvin-bot bot requested a review from mananjadhav June 8, 2024 20:50

Add JSDoc comment for environment in UserMetaData

bb82316

brunovjk mentioned this pull request Jun 9, 2024

[HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] Investigate workflow job failing on main: lint / Run ESLint #43326

Closed

brunovjk and others added 2 commits June 9, 2024 18:04

Revert 'Add JSDoc comment for environment in UserMetaData'

ed4d1df

Merge branch 'Expensify:main' into fix/35391

09fa837

brunovjk mentioned this pull request Jun 10, 2024

[$250] MEDIUM: Allow arbitrary users to be added/removed to/from workspace chat via @mention or members list #35391

Closed

Merge branch 'Expensify:main' into fix/35391

8ce66ba

mananjadhav approved these changes Jun 12, 2024

View reviewed changes

melvin-bot bot requested a review from jasperhuangg June 12, 2024 17:32

jasperhuangg requested changes Jun 12, 2024

View reviewed changes

src/pages/ReportDetailsPage.tsx Show resolved Hide resolved

bernhardoj mentioned this pull request Jun 13, 2024

[ON HOLD for #43065] Workspace - Workspace member can remove the owner #43592

Closed

6 tasks

brunovjk and others added 4 commits June 13, 2024 14:07

Merge branch 'main' into fix/35391

e292768

Merge branch 'main' into fix/35391

5de2997

fix type

cee0b02

revert 'fix type'

1088ae9

Merge branch 'Expensify:main' into fix/35391

609f4ee

brunovjk requested a review from jasperhuangg June 13, 2024 20:09

Merge branch 'Expensify:main' into fix/35391

be3872b

jasperhuangg approved these changes Jun 14, 2024

View reviewed changes

jasperhuangg merged commit bdb9789 into Expensify:main Jun 14, 2024
15 checks passed

github-actions bot mentioned this pull request Jun 14, 2024

Deploy Checklist: New Expensify 2024-06-14 #43793

Closed

53 tasks

AndrewGable mentioned this pull request Jun 17, 2024

[HOLD for payment 2024-06-28] [HOLD for payment 2024-06-24] Workspace - Workspace chat reappears in LHN after leaving the chat and relogin #43828

Closed

6 tasks

bernhardoj mentioned this pull request Jun 25, 2024

[HOLD for payment 2024-07-22] [HOLD for payment 2024-07-17] [$250] Workspace chat - Unable to remove member from workspace chat #42928

Closed

6 tasks

jayeshmangwani reviewed Jul 17, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prevent removal of admin and default members from workspace chats #43065

Prevent removal of admin and default members from workspace chats #43065

brunovjk commented Jun 4, 2024 •

edited by jasperhuangg

Loading

melvin-bot bot commented Jun 8, 2024

mananjadhav commented Jun 9, 2024

brunovjk commented Jun 9, 2024 •

edited

Loading

mananjadhav commented Jun 10, 2024

mananjadhav commented Jun 11, 2024 •

edited

Loading

brunovjk commented Jun 13, 2024 •

edited

Loading

brunovjk commented Jun 14, 2024

OSBotify commented Jun 14, 2024

OSBotify commented Jun 14, 2024

kbecciv commented Jun 17, 2024

brunovjk commented Jun 17, 2024 •

edited

Loading

OSBotify commented Jun 17, 2024

kbecciv commented Jun 18, 2024

jayeshmangwani Jul 17, 2024

Prevent removal of admin and default members from workspace chats #43065

Prevent removal of admin and default members from workspace chats #43065

Conversation

brunovjk commented Jun 4, 2024 • edited by jasperhuangg Loading

Details

Fixed Issues

Pre-condition:

Tests:

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 8, 2024

mananjadhav commented Jun 9, 2024

brunovjk commented Jun 9, 2024 • edited Loading

mananjadhav commented Jun 10, 2024

mananjadhav commented Jun 11, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

brunovjk commented Jun 13, 2024 • edited Loading

brunovjk commented Jun 14, 2024

OSBotify commented Jun 14, 2024

OSBotify commented Jun 14, 2024

kbecciv commented Jun 17, 2024

brunovjk commented Jun 17, 2024 • edited Loading

OSBotify commented Jun 17, 2024

kbecciv commented Jun 18, 2024

jayeshmangwani Jul 17, 2024

Choose a reason for hiding this comment

brunovjk commented Jun 4, 2024 •

edited by jasperhuangg

Loading

brunovjk commented Jun 9, 2024 •

edited

Loading

mananjadhav commented Jun 11, 2024 •

edited

Loading

brunovjk commented Jun 13, 2024 •

edited

Loading

brunovjk commented Jun 17, 2024 •

edited

Loading