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.

Sign up for GitHub

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

Jump to bottom

fix: security tab visibility #31996

Merged
merged 14 commits into from
Apr 17, 2024
Merged

fix: security tab visibility #31996

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
65db630
fix-security-tab-visibility
abhinavkrin Mar 14, 2024
262aae2
added changeset
abhinavkrin Mar 14, 2024
9afabd6
minor changes
abhinavkrin Mar 14, 2024
5bccdcb
added ui test
abhinavkrin Mar 15, 2024
a9a48fc
Update afraid-poets-sparkle.md
abhinavkrin Mar 16, 2024
8bee552
improved tests
abhinavkrin Mar 18, 2024
1c3e874
Update apps/meteor/client/views/account/security/AccountSecurityPage.tsx
abhinavkrin Mar 19, 2024
6c9650e
minor fixes
abhinavkrin Mar 19, 2024
8d6ced7
improved tests
abhinavkrin Mar 19, 2024
a31b8c2
Update apps/meteor/tests/e2e/utils/test.ts
abhinavkrin Mar 26, 2024
698ad8c
modified tests
abhinavkrin Mar 26, 2024
ac43d97
Merge branch 'develop' into fix/security-tab-visibility
abhinavkrin Mar 26, 2024
88e8acc
minor change
abhinavkrin Mar 27, 2024
0345ad8
Merge branch 'develop' into fix/security-tab-visibility
kodiakhq[bot] Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/afraid-poets-sparkle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixing Security tab visibility to allow password changes when 2FA/E2E is disabled.
abhinavkrin marked this conversation as resolved.
Show resolved Hide resolved
19 changes: 11 additions & 8 deletions apps/meteor/client/views/account/security/AccountSecurityPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ const AccountSecurityPage = (): ReactElement => {
const twoFactorTOTP = useSetting('Accounts_TwoFactorAuthentication_By_TOTP_Enabled');
const twoFactorByEmailEnabled = useSetting('Accounts_TwoFactorAuthentication_By_Email_Enabled');
const e2eEnabled = useSetting('E2E_Enable');
const allowPasswordChange = useSetting('Accounts_AllowPasswordChange');

const passwordFormId = useUniqueId();

if (!twoFactorEnabled && !e2eEnabled) {
if (!twoFactorEnabled && !e2eEnabled && !allowPasswordChange) {
abhinavkrin marked this conversation as resolved.
Show resolved Hide resolved
return <NotAuthorizedPage />;
}

Expand All @@ -42,13 +43,15 @@ const AccountSecurityPage = (): ReactElement => {
<PageHeader title={t('Security')} />
<PageScrollableContentWithShadow>
<Box maxWidth='x600' w='full' alignSelf='center' color='default'>
<FormProvider {...methods}>
<Accordion>
<Accordion.Item title={t('Password')} defaultExpanded>
<ChangePassword id={passwordFormId} />
</Accordion.Item>
</Accordion>
</FormProvider>
{allowPasswordChange && (
<FormProvider {...methods}>
<Accordion>
<Accordion.Item title={t('Password')} defaultExpanded>
<ChangePassword id={passwordFormId} />
</Accordion.Item>
</Accordion>
</FormProvider>
)}
<Accordion>
{(twoFactorTOTP || twoFactorByEmailEnabled) && twoFactorEnabled && (
<Accordion.Item title={t('Two Factor Authentication')}>
Expand Down
4 changes: 3 additions & 1 deletion apps/meteor/client/views/account/security/AccountSecurityRoute.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import AccountSecurityPage from './AccountSecurityPage';
const AccountSecurityRoute = (): ReactElement => {
const isTwoFactorEnabled = useSetting('Accounts_TwoFactorAuthentication_Enabled');
const isE2EEnabled = useSetting('E2E_Enable');
const canViewSecurity = isTwoFactorEnabled || isE2EEnabled;
const allowPasswordChange = useSetting('Accounts_AllowPasswordChange');

const canViewSecurity = isTwoFactorEnabled || isE2EEnabled || allowPasswordChange;

if (!canViewSecurity) {
return <NotAuthorizedPage />;
Expand Down
5 changes: 4 additions & 1 deletion apps/meteor/client/views/account/sidebarItems.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ export const {
href: '/account/security',
i18nLabel: 'Security',
icon: 'lock',
permissionGranted: (): boolean => settings.get('Accounts_TwoFactorAuthentication_Enabled') || settings.get('E2E_Enable'),
permissionGranted: (): boolean =>
settings.get('Accounts_TwoFactorAuthentication_Enabled') ||
settings.get('E2E_Enable') ||
settings.get('Accounts_AllowPasswordChange'),
},
{
href: '/account/integrations',
Expand Down
Loading