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: security tab visibility #31996

Merged
merged 14 commits into from
Apr 17, 2024
Merged

fix: security tab visibility #31996

merged 14 commits into from
Apr 17, 2024

Conversation

abhinavkrin
Copy link
Member

@abhinavkrin abhinavkrin commented Mar 14, 2024

Proposed changes (including videos or screenshots)

This change fixes the visibility of the Security tab in user settings, ensuring that users can change their passwords even when 2FA or E2E is disabled. Previously, the option to change the password was hidden unless one of these features was enabled, which could lead to user confusion. This fix ensures that the Security tab is always visible, but it only displays relevant settings based on the user's configuration.

Screencast.from.2024-03-14.20-49-43.mp4

Issue(s)

This PR addresses the issue where users were unable to find the password change option due to the conditional visibility of the Security tab based on 2FA or E2E settings.

Steps to test or reproduce

  1. Disable 2FA and E2E in the workspace settings.
  2. Go to My Account -> Security tab.
  3. Verify that the password change option is visible and functional.

Further comments

SUP-458

Signed-off-by: Abhinav Kumar <[email protected]>
Signed-off-by: Abhinav Kumar <[email protected]>
Signed-off-by: Abhinav Kumar <[email protected]>
Copy link

changeset-bot bot commented Mar 14, 2024

🦋 Changeset detected

Latest commit: 0345ad8

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link

codecov bot commented Mar 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.12%. Comparing base (b586c38) to head (0345ad8).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #31996      +/-   ##
===========================================
+ Coverage    55.06%   55.12%   +0.05%     
===========================================
  Files         2309     2307       -2     
  Lines        50977    50923      -54     
  Branches     10430    10424       -6     
===========================================
  Hits         28070    28070              
+ Misses       20386    20351      -35     
+ Partials      2521     2502      -19     
Flag Coverage Δ
e2e 54.22% <100.00%> (+<0.01%) ⬆️
unit 75.30% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@abhinavkrin abhinavkrin changed the title Fix/security tab visibility fix: security tab visibility Mar 14, 2024
@abhinavkrin abhinavkrin marked this pull request as ready for review March 14, 2024 17:38
@abhinavkrin abhinavkrin requested a review from a team as a code owner March 14, 2024 17:38
tiagoevanp
tiagoevanp previously approved these changes Mar 14, 2024
Copy link
Member

@MarcosSpessatto MarcosSpessatto left a comment

Choose a reason for hiding this comment

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

Can we add a test to ensure the behavior?

Signed-off-by: Abhinav Kumar <[email protected]>
Co-authored-by: Debdut Chakraborty <[email protected]>
Signed-off-by: Abhinav Kumar <[email protected]>
@dougfabris
Copy link
Member

dougfabris commented Mar 19, 2024

@abhinavkrin only accepting my suggestion will break the code, pay attention 🚨
you have to remove the entire conditional rendering and check if it still necessary to have all those useSetting on the file

Signed-off-by: Abhinav Kumar <[email protected]>
Signed-off-by: Abhinav Kumar <[email protected]>
dougfabris
dougfabris previously approved these changes Mar 21, 2024
Copy link
Member

@dougfabris dougfabris left a comment

Choose a reason for hiding this comment

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

All good at frontend perspective

apps/meteor/tests/e2e/access-security-page.spec.ts Outdated Show resolved Hide resolved
apps/meteor/tests/e2e/access-security-page.spec.ts Outdated Show resolved Hide resolved
apps/meteor/tests/e2e/access-security-page.spec.ts Outdated Show resolved Hide resolved
apps/meteor/tests/e2e/access-security-page.spec.ts Outdated Show resolved Hide resolved
apps/meteor/tests/e2e/utils/test.ts Outdated Show resolved Hide resolved
apps/meteor/tests/e2e/utils/test.ts Outdated Show resolved Hide resolved
apps/meteor/tests/e2e/utils/test.ts Outdated Show resolved Hide resolved
Co-authored-by: Marcos Spessatto Defendi <[email protected]>
jessicaschelly
jessicaschelly previously approved these changes Mar 27, 2024
Signed-off-by: Abhinav Kumar <[email protected]>
@jessicaschelly jessicaschelly added stat: QA assured Means it has been tested and approved by a company insider and removed stat: needs QA labels Apr 5, 2024
Copy link
Contributor

dionisio-bot bot commented Apr 5, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

Copy link
Contributor

dionisio-bot bot commented Apr 5, 2024

Looks like this PR is not ready to merge, because of the following issues:

  • This PR is missing the required milestone or project
    Please fix the issues and try again
    If you have any trouble, please check the PR guidelines

@scuciatto scuciatto added this to the 6.8 milestone Apr 11, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Apr 11, 2024
@kodiakhq kodiakhq bot merged commit 7f3b17b into develop Apr 17, 2024
43 checks passed
@kodiakhq kodiakhq bot deleted the fix/security-tab-visibility branch April 17, 2024 04:26
ggazzo pushed a commit that referenced this pull request Apr 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants