fix(ui): don't show "Password" user settings tab if current user lack…

…s perms to modify the password (#1063)
sct · Mar 2, 2021 · b146d11 · b146d11
1 parent bbc0b74
commit b146d11
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/components/UserProfile/UserSettings/UserPasswordChange/index.tsx b/src/components/UserProfile/UserSettings/UserPasswordChange/index.tsx
@@ -33,7 +33,7 @@ const messages = defineMessages({
   nopasswordsetDescription:
     'This user account currently does not have a password specifically for {applicationTitle}.\
     Configure a password below to enable this account to sign in as a "local user."',
-  nopermission: 'No Permission',
+  nopermission: 'Unauthorized',
   nopermissionDescription:
     "You do not have permission to modify this user's password.",
 });

diff --git a/src/components/UserProfile/UserSettings/index.tsx b/src/components/UserProfile/UserSettings/index.tsx
@@ -2,7 +2,8 @@ import Link from 'next/link';
 import { useRouter } from 'next/router';
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
-import { Permission, useUser } from '../../../hooks/useUser';
+import { useUser } from '../../../hooks/useUser';
+import { Permission, hasPermission } from '../../../../server/lib/permissions';
 import Error from '../../../pages/_error';
 import LoadingSpinner from '../../Common/LoadingSpinner';
 import PageTitle from '../../Common/PageTitle';
@@ -28,7 +29,7 @@ interface SettingsRoute {
 const UserSettings: React.FC = ({ children }) => {
   const router = useRouter();
   const settings = useSettings();
-  const { hasPermission } = useUser();
+  const { user: currentUser } = useUser();
   const { user, error } = useUser({ id: Number(router.query.userId) });
   const intl = useIntl();
 
@@ -77,8 +78,14 @@ const UserSettings: React.FC = ({ children }) => {
   }> = ({ children, route, regex, isMobile = false }) => {
     if (
       route === '/settings/password' &&
-      !settings.currentSettings.localLogin &&
-      !hasPermission(Permission.MANAGE_SETTINGS)
+      ((!settings.currentSettings.localLogin &&
+        !hasPermission(
+          Permission.MANAGE_SETTINGS,
+          currentUser?.permissions ?? 0
+        )) ||
+        (currentUser?.id !== 1 &&
+          currentUser?.id !== user?.id &&
+          hasPermission(Permission.ADMIN, user?.permissions ?? 0)))
     ) {
       return null;
     }
@@ -133,6 +140,7 @@ const UserSettings: React.FC = ({ children }) => {
                 route.requiredPermission
                   ? hasPermission(
                       route.requiredPermission,
+                      currentUser?.permissions ?? 0,
                       route.permissionType
                     )
                   : true
@@ -157,6 +165,7 @@ const UserSettings: React.FC = ({ children }) => {
                   route.requiredPermission
                     ? hasPermission(
                         route.requiredPermission,
+                        currentUser?.permissions ?? 0,
                         route.permissionType
                       )
                     : true

diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json
@@ -714,7 +714,7 @@
   "components.UserProfile.UserSettings.UserPasswordChange.newpassword": "New Password",
   "components.UserProfile.UserSettings.UserPasswordChange.nopasswordset": "No Password Set",
   "components.UserProfile.UserSettings.UserPasswordChange.nopasswordsetDescription": "This user account currently does not have a password specifically for {applicationTitle}. Configure a password below to enable this account to sign in as a \"local user.\"",
-  "components.UserProfile.UserSettings.UserPasswordChange.nopermission": "No Permission",
+  "components.UserProfile.UserSettings.UserPasswordChange.nopermission": "Unauthorized",
   "components.UserProfile.UserSettings.UserPasswordChange.nopermissionDescription": "You do not have permission to modify this user's password.",
   "components.UserProfile.UserSettings.UserPasswordChange.password": "Password",
   "components.UserProfile.UserSettings.UserPasswordChange.save": "Save Changes",