[MPDX-9771] - MPD leader impersonation (frontend)

__tests__/fixtures/session.ts

@@ -9,6 +9,7 @@ export const session: Session = {
     userID: 'user-1',
     admin: false,
     developer: false,
+    coach: false,
     impersonating: false,
   },
 };

pages/accountLists/[accountListId]/contacts/[[...contactId]].page.tsx

@@ -1,7 +1,7 @@
 import Head from 'next/head';
 import React, { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import {
   ContactsContext,
   ContactsType,
@@ -66,4 +66,4 @@ const ContactsPage: React.FC = () => (
 
 export default ContactsPage;
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;

pages/accountLists/[accountListId]/contacts/flows/setup.page.tsx

@@ -7,7 +7,7 @@ import { useSnackbar } from 'notistack';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import { colorMap } from 'src/components/Contacts/ContactFlow/ContactFlow';
 import { ContactFlowSetupColumn } from 'src/components/Contacts/ContactFlow/ContactFlowSetup/Column/ContactFlowSetupColumn';
 import { UnusedStatusesColumn } from 'src/components/Contacts/ContactFlow/ContactFlowSetup/Column/UnusedStatusesColumn';
@@ -227,6 +227,6 @@ const ContactFlowSetupPage: React.FC = () => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default ContactFlowSetupPage;

pages/accountLists/[accountListId]/settings/admin.page.test.tsx

@@ -3,6 +3,7 @@ import { render, waitFor } from '@testing-library/react';
 import { SnackbarProvider } from 'notistack';
 import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
+import { mockSession } from '__tests__/util/mockSession';
 import { AdminAccordion } from 'src/components/Shared/Forms/Accordions/AccordionEnum';
 import theme from 'src/theme';
 import Admin from './admin.page';
@@ -36,6 +37,8 @@ const Components: React.FC<ComponentsProps> = ({ selectedTab }) => (
 
 describe('Admin', () => {
   it('should keep impersonate user accordion close', async () => {
+    mockSession({ admin: true });
+
     const { getAllByText } = render(<Components />);
     await waitFor(() => {
       expect(getAllByText('Impersonate User')).toHaveLength(3);
@@ -44,6 +47,8 @@ describe('Admin', () => {
   });
 
   it('should open impersonate user accordion', async () => {
+    mockSession({ admin: true });
+
     const { getAllByText } = render(
       <Components selectedTab={AdminAccordion.ResetAccount} />,
     );
@@ -52,4 +57,13 @@ describe('Admin', () => {
       expect(getAllByText('Reset Account').length).toEqual(3);
     });
   });
+
+  it('should hide the reset account accordion from MPD supervisor admins who are not admins', async () => {
+    mockSession({ admin: false, coach: true });
+
+    const { findAllByText, queryByText } = render(<Components />);
+
+    expect(await findAllByText('Impersonate User')).toHaveLength(3);
+    expect(queryByText('Reset Account')).not.toBeInTheDocument();
+  });
 });

pages/accountLists/[accountListId]/settings/admin.page.tsx

@@ -1,18 +1,20 @@
 import { useRouter } from 'next/router';
 import React, { ReactElement, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { enforceAdmin } from 'pages/api/utils/pagePropsHelpers';
+import { enforceAdminOrCoach } from 'pages/api/utils/pagePropsHelpers';
 import { ImpersonateUserAccordion } from 'src/components/Settings/Admin/ImpersonateUser/ImpersonateUserAccordion';
 import { ResetAccountAccordion } from 'src/components/Settings/Admin/ResetAccount/ResetAccountAccordion';
 import { AdminAccordion } from 'src/components/Shared/Forms/Accordions/AccordionEnum';
 import { AccordionGroup } from 'src/components/Shared/Forms/Accordions/AccordionGroup';
+import { useRequiredSession } from 'src/hooks/useRequiredSession';
 import { SettingsWrapper } from './Wrapper';
 
 export const suggestedArticles = 'HS_SETTINGS_SERVICES_SUGGESTIONS';
 
 const Admin = (): ReactElement => {
   const { t } = useTranslation();
   const { query } = useRouter();
+  const user = useRequiredSession();
   const [expandedAccordion, setExpandedAccordion] =
     useState<AdminAccordion | null>(
       typeof query.selectedTab === 'string'
@@ -32,15 +34,17 @@ const Admin = (): ReactElement => {
           expandedAccordion={expandedAccordion}
         />
 
-        <ResetAccountAccordion
-          handleAccordionChange={setExpandedAccordion}
-          expandedAccordion={expandedAccordion}
-        />
+        {user.admin && (
+          <ResetAccountAccordion
+            handleAccordionChange={setExpandedAccordion}
+            expandedAccordion={expandedAccordion}
+          />
+        )}
       </AccordionGroup>
     </SettingsWrapper>
   );
 };
 
-export const getServerSideProps = enforceAdmin;
+export const getServerSideProps = enforceAdminOrCoach;
 
 export default Admin;

pages/accountLists/[accountListId]/tasks/[[...contactId]].page.tsx

@@ -7,7 +7,7 @@ import { Box, Button, ButtonGroup } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { DateTime } from 'luxon';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import { DynamicContactsRightPanel } from 'src/components/Contacts/ContactsRightPanel/DynamicContactsRightPanel';
 import { InfiniteList } from 'src/components/InfiniteList/InfiniteList';
 import { navBarHeight } from 'src/components/Layouts/Primary/Primary';
@@ -382,6 +382,6 @@ const TasksPage: React.FC = () => (
   </UrlFiltersProvider>
 );
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default TasksPage;

pages/accountLists/[accountListId]/tools.page.test.tsx

@@ -4,8 +4,9 @@ import { render, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import theme from 'src/theme';
-import ToolsPage from './tools.page';
+import ToolsPage, { getServerSideProps } from './tools.page';
 
 const accountListId = 'account-list-1';
 
@@ -34,6 +35,10 @@ const MocksProviders: React.FC<MocksProvidersProps> = ({ children, setup }) => (
 );
 
 describe('Tools Page', () => {
+  it('blocks restricted impersonation in getServerSideProps', () => {
+    expect(getServerSideProps).toBe(blockRestrictedImpersonation);
+  });
+
   it('should render page', async () => {
     const { findByText } = render(
       <MocksProviders>

pages/accountLists/[accountListId]/tools.page.tsx

@@ -2,7 +2,7 @@ import { useRouter } from 'next/router';
 import React, { ReactElement } from 'react';
 import { Button } from '@mui/material';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import { SetupBanner } from 'src/components/Settings/preferences/SetupBanner';
 import { StickyBox } from 'src/components/Shared/Header/styledComponents';
 import ToolsHome from 'src/components/Tool/Home/ToolsHome';
@@ -43,6 +43,6 @@ const ToolsPage = (): ReactElement => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default ToolsPage;

pages/accountLists/[accountListId]/tools/appeals/appeal/[[...appealId]].page.tsx

@@ -1,7 +1,7 @@
 import Head from 'next/head';
 import React, { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import AppealsDetailsPage from 'src/components/Tool/Appeal/AppealDetails/AppealsDetailsPage';
 import { getAppName } from 'src/lib/getAppName';
 import { AppealsWrapper } from '../AppealsWrapper';
@@ -29,4 +29,4 @@ const AppealsPage: React.FC = () => (
 
 export default AppealsPage;
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;

pages/accountLists/[accountListId]/tools/appeals/index.page.tsx

@@ -1,6 +1,6 @@
 import React, { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import AppealsInitialPage from 'src/components/Tool/Appeal/InitialPage/AppealsInitialPage';
 import { ToolsWrapper } from '../ToolsWrapper';
 
@@ -16,4 +16,4 @@ const AppealsPage = (): ReactElement => {
 
 export default AppealsPage;
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;

pages/accountLists/[accountListId]/tools/fix/commitmentInfo/[[...contactId]].page.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import FixCommitmentInfo from 'src/components/Tool/FixCommitmentInfo/FixCommitmentInfo';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { ToolsWrapper } from '../../ToolsWrapper';
@@ -19,6 +19,6 @@ const FixCommitmentInfoPage: React.FC = () => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default FixCommitmentInfoPage;

pages/accountLists/[accountListId]/tools/fix/emailAddresses/[[...contactId]].page.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import { FixEmailAddresses } from 'src/components/Tool/FixEmailAddresses/FixEmailAddresses';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { ToolsWrapper } from '../../ToolsWrapper';
@@ -19,6 +19,6 @@ const FixEmailAddressesPage: React.FC = () => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default FixEmailAddressesPage;

pages/accountLists/[accountListId]/tools/fix/mailingAddresses/[[...contactId]].page.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import FixMailingAddresses from 'src/components/Tool/FixMailingAddresses/FixMailingAddresses';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { ToolsWrapper } from '../../ToolsWrapper';
@@ -19,6 +19,6 @@ const FixMailingAddressesPage: React.FC = () => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default FixMailingAddressesPage;

pages/accountLists/[accountListId]/tools/fix/phoneNumbers/[[...contactId]].page.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import FixPhoneNumbers from 'src/components/Tool/FixPhoneNumbers/FixPhoneNumbers';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { ToolsWrapper } from '../../ToolsWrapper';
@@ -19,6 +19,6 @@ const FixPhoneNumbersPage: React.FC = () => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default FixPhoneNumbersPage;

pages/accountLists/[accountListId]/tools/fix/sendNewsletter/[[...contactId]].page.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import FixSendNewsletter from 'src/components/Tool/FixSendNewsletter/FixSendNewsletter';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { ToolsWrapper } from '../../ToolsWrapper';
@@ -19,6 +19,6 @@ const FixSendNewsletterPage: React.FC = () => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default FixSendNewsletterPage;

pages/accountLists/[accountListId]/tools/import/csv.page.tsx

@@ -1,7 +1,7 @@
 import { useRouter } from 'next/router';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import {
   CsvImportProvider,
   CsvImportViewStepEnum,
@@ -73,6 +73,6 @@ const CsvHome: React.FC = () => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default CsvHome;

pages/accountLists/[accountListId]/tools/import/google.page.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import Loading from 'src/components/Loading';
 import GoogleImport from 'src/components/Tool/GoogleImport/GoogleImport';
 import { useAccountListId } from 'src/hooks/useAccountListId';
@@ -24,6 +24,6 @@ const GoogleImportPage: React.FC = () => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default GoogleImportPage;

pages/accountLists/[accountListId]/tools/import/tnt.page.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import Loading from 'src/components/Loading';
 import TntConnect from 'src/components/Tool/TntConnect/TntConnect';
 import { useAccountListId } from 'src/hooks/useAccountListId';
@@ -24,6 +24,6 @@ const TntConnectPage: React.FC = () => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default TntConnectPage;

pages/accountLists/[accountListId]/tools/merge/contacts/[[...contactId]].page.tsx

@@ -1,7 +1,7 @@
 import { useRouter } from 'next/router';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import MergeContacts from 'src/components/Tool/MergeContacts/MergeContacts';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { ToolsWrapper } from '../../ToolsWrapper';
@@ -26,6 +26,6 @@ const MergeContactsPage: React.FC = () => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default MergeContactsPage;

pages/accountLists/[accountListId]/tools/merge/people/[[...contactId]].page.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
+import { blockRestrictedImpersonation } from 'pages/api/utils/pagePropsHelpers';
 import MergePeople from 'src/components/Tool/MergePeople/MergePeople';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { ToolsWrapper } from '../../ToolsWrapper';
@@ -16,6 +16,6 @@ const MergePeoplePage: React.FC = () => {
   );
 };
 
-export const getServerSideProps = ensureSessionAndAccountList;
+export const getServerSideProps = blockRestrictedImpersonation;
 
 export default MergePeoplePage;