fix: #8290 #8129 dev portal fixes (#8294)

reapit · Jan 6, 2023 · edafe04 · edafe04
1 parent abc8301
commit edafe04
Show file tree

Hide file tree

Showing 8 changed files with 932 additions and 16 deletions.
diff --git a/.../developer-portal/src/components/apps/list/__tests__/__snapshots__/app-card.test.tsx.snap b/.../developer-portal/src/components/apps/list/__tests__/__snapshots__/app-card.test.tsx.snap
diff --git a/packages/developer-portal/src/components/apps/list/__tests__/app-card.test.tsx b/packages/developer-portal/src/components/apps/list/__tests__/app-card.test.tsx
@@ -2,14 +2,49 @@ import React, { MouseEvent } from 'react'
 import { render } from '../../../../tests/react-testing'
 import { AppCard, handleDeleteApp, handleOpenModal, handleRefreshApps } from '../app-card'
 import { mockAppDetailModel } from '../../../../tests/__stubs__/apps'
+import { useReapitConnect } from '@reapit/connect-session'
 
 jest.mock('../../state/use-app-state')
+jest.mock('@reapit/connect-session', () => ({
+  ReapitConnectBrowserSession: jest.fn(),
+  useReapitConnect: jest.fn(() => ({
+    connectSession: {
+      loginIdentity: {
+        groups: [],
+      },
+    },
+  })),
+}))
+
+const mockUseReapitConnect = useReapitConnect as jest.Mock
 
 describe('AppCard', () => {
-  it('should match a snapshot', () => {
+  it('should match a snapshot for a regular user', () => {
+    expect(render(<AppCard app={mockAppDetailModel} />)).toMatchSnapshot()
+  })
+
+  it('should match a snapshot for an admin', () => {
+    mockUseReapitConnect.mockReturnValueOnce({
+      connectSession: {
+        loginIdentity: {
+          groups: ['FoundationsDeveloperAdmin'],
+        },
+      },
+    })
     expect(render(<AppCard app={mockAppDetailModel} />)).toMatchSnapshot()
   })
 
+  it('should match a snapshot for an admin with delete protection', () => {
+    mockUseReapitConnect.mockReturnValueOnce({
+      connectSession: {
+        loginIdentity: {
+          groups: ['FoundationsDeveloperAdmin'],
+        },
+      },
+    })
+    expect(render(<AppCard app={{ ...mockAppDetailModel, deletionProtection: true }} />)).toMatchSnapshot()
+  })
+
   it('should handle refresh apps', () => {
     const appDeleted = true
     const refreshApps = jest.fn()

diff --git a/packages/developer-portal/src/components/apps/list/app-card.tsx b/packages/developer-portal/src/components/apps/list/app-card.tsx
@@ -12,6 +12,8 @@ import { useAppState } from '../state/use-app-state'
 import { cx } from '@linaria/core'
 import { cardCursor } from './__styles__'
 import { Link } from 'react-router-dom'
+import { selectIsDeveloperAdmin } from '../../../utils/auth'
+import { useReapitConnect } from '@reapit/connect-session'
 
 export const handleDeleteApp = (deleteApp: SendFunction<void, boolean>) => (event?: MouseEvent) => {
   event?.stopPropagation()
@@ -37,6 +39,8 @@ export const AppCard: FC<AppCardProps> = ({ app }) => {
   const history = useHistory()
   const { appsDataState } = useAppState()
   const { Modal, openModal, closeModal } = useModal()
+  const { connectSession } = useReapitConnect(reapitConnectBrowserSession)
+  const isDeveloperAdmin = selectIsDeveloperAdmin(connectSession)
 
   const { appsRefresh } = appsDataState
   const { id, name, isDirectApi, developer, iconUri, summary, deletionProtection } = app
@@ -77,7 +81,12 @@ export const AppCard: FC<AppCardProps> = ({ app }) => {
         mainCardImgUrl={iconUri ?? defaultAppIcon}
       />
       <Modal title={`Confirm ${name} Deletion`}>
-        {deletionProtection ? (
+        {!isDeveloperAdmin ? (
+          <BodyText>
+            Unfortunately, your user account does not have the correct permissions to delete this app. Only an Admin of
+            your developer organisation can delete apps.
+          </BodyText>
+        ) : deletionProtection ? (
           <BodyText>
             &lsquo;{name}&rsquo; has been set to&lsquo;delete protected&rsquo; to avoid accidental data loss. If you
             really want to delete the app, visit <Link to={`${Routes.APPS}/${id}/edit/app-listing`}>this page </Link>,
@@ -93,7 +102,12 @@ export const AppCard: FC<AppCardProps> = ({ app }) => {
           <Button fixedWidth intent="secondary" onClick={closeModal}>
             Cancel
           </Button>
-          <Button fixedWidth intent="danger" disabled={deletionProtection} onClick={handleDeleteApp(deleteApp)}>
+          <Button
+            fixedWidth
+            intent="danger"
+            disabled={deletionProtection || !isDeveloperAdmin}
+            onClick={handleDeleteApp(deleteApp)}
+          >
             Confirm
           </Button>
         </ButtonGroup>

diff --git a/...portal/src/components/settings/company/__tests__/__snapshots__/company-form.test.tsx.snap b/...portal/src/components/settings/company/__tests__/__snapshots__/company-form.test.tsx.snap
@@ -101,7 +101,7 @@ Object {
               <input
                 class="e1urjlvd-el-input"
                 id="test-static-id"
-                name="billingEmail"
+                name="notificationsEmail"
                 placeholder="An email address we can send notifications about your developer account to"
               />
               <label
@@ -1728,7 +1728,7 @@ Object {
             <input
               class="e1urjlvd-el-input"
               id="test-static-id"
-              name="billingEmail"
+              name="notificationsEmail"
               placeholder="An email address we can send notifications about your developer account to"
             />
             <label

diff --git a/packages/developer-portal/src/components/settings/company/__tests__/company-form.test.tsx b/packages/developer-portal/src/components/settings/company/__tests__/company-form.test.tsx
@@ -33,7 +33,7 @@ describe('handleUpdateDeveloper', () => {
       telephone: 'UPDATED_TEL',
       website: 'UPDATED_SITE',
       email: 'UPDATED_EMAIL',
-      billingEmail: 'UPDATED_BILLING',
+      notificationsEmail: 'UPDATED_NOTIFICATIONS_EMAIL',
       noTaxRegistration: false,
       taxNumber: 'UPDATED_TAX',
       noregistrationNumber: false,
@@ -56,7 +56,7 @@ describe('handleUpdateDeveloper', () => {
       companyName: formValues.company,
       telephone: formValues.telephone,
       website: formValues.website,
-      billingEmail: formValues.billingEmail,
+      notificationsEmail: formValues.notificationsEmail,
       noTaxRegistration: formValues.noTaxRegistration,
       taxNumber: formValues.taxNumber,
       registrationNumber: formValues.registrationNumber,

diff --git a/packages/developer-portal/src/components/settings/company/company-form.tsx b/packages/developer-portal/src/components/settings/company/company-form.tsx
@@ -21,7 +21,7 @@ export type DeveloperUpdateFormValues = {
   telephone: string
   website: string
   email: string
-  billingEmail: string
+  notificationsEmail: string
   noTaxRegistration: boolean
   taxNumber: string
   noregistrationNumber: boolean
@@ -49,7 +49,7 @@ export const handleUpdateDeveloper =
     company,
     telephone,
     website,
-    billingEmail,
+    notificationsEmail,
     noTaxRegistration,
     taxNumber,
     registrationNumber,
@@ -68,7 +68,7 @@ export const handleUpdateDeveloper =
       companyName: company,
       telephone,
       website,
-      billingEmail,
+      notificationsEmail,
       noTaxRegistration,
       taxNumber,
       registrationNumber,
@@ -106,7 +106,7 @@ export const CompanyForm: FC<CompanyFormProps> = ({ developer, refreshDeveloper
     telephone,
     website,
     email,
-    billingEmail,
+    notificationsEmail,
     noTaxRegistration,
     taxNumber,
     registrationNumber,
@@ -126,7 +126,7 @@ export const CompanyForm: FC<CompanyFormProps> = ({ developer, refreshDeveloper
       telephone: telephone ?? '',
       website: website ?? '',
       email: email ?? '',
-      billingEmail: billingEmail ?? '',
+      notificationsEmail: notificationsEmail ?? '',
       noTaxRegistration: noTaxRegistration ?? true,
       taxNumber: taxNumber ?? '',
       noregistrationNumber: registrationNumber ? false : true,
@@ -198,11 +198,11 @@ export const CompanyForm: FC<CompanyFormProps> = ({ developer, refreshDeveloper
         </InputWrap>
         <InputWrap>
           <InputGroup
-            {...register('billingEmail')}
+            {...register('notificationsEmail')}
             label="Notifications Email"
             placeholder="An email address we can send notifications about your developer account to"
-            errorMessage={errors?.billingEmail?.message}
-            icon={errors?.billingEmail?.message ? 'asteriskSystem' : null}
+            errorMessage={errors?.notificationsEmail?.message}
+            icon={errors?.notificationsEmail?.message ? 'asteriskSystem' : null}
             intent="danger"
           />
         </InputWrap>

diff --git a/packages/developer-portal/src/utils/__tests__/auth.test.ts b/packages/developer-portal/src/utils/__tests__/auth.test.ts
@@ -10,6 +10,8 @@ import {
   selectIsUserOrUserAdmin,
   selectLoggedUserEmail,
   selectLoginIdentity,
+  selectIsDeveloperAdmin,
+  COGNITO_GROUP_DEVELOPER_ADMIN,
 } from '../auth'
 import { selectIsCustomer } from '../auth'
 
@@ -118,3 +120,27 @@ describe('selectIsCustomer', () => {
     expect(selectIsCustomer(authWithoutUser)).toBe(false)
   })
 })
+
+describe('selectIsDeveloperAdmin', () => {
+  it('should return false if user', () => {
+    const authWithUser = {
+      ...mockConnectSession,
+      loginIdentity: {
+        ...mockConnectSession.loginIdentity,
+        groups: [],
+      },
+    }
+    expect(selectIsDeveloperAdmin(authWithUser)).toBe(false)
+  })
+
+  it('should return true if an admin', () => {
+    const authWithoutUser = {
+      ...mockConnectSession,
+      loginIdentity: {
+        ...mockConnectSession.loginIdentity,
+        groups: [COGNITO_GROUP_DEVELOPER_ADMIN],
+      },
+    }
+    expect(selectIsDeveloperAdmin(authWithoutUser)).toBe(true)
+  })
+})
diff --git a/packages/developer-portal/src/utils/auth.ts b/packages/developer-portal/src/utils/auth.ts
@@ -3,6 +3,7 @@ import { ReapitConnectSession, LoginIdentity } from '@reapit/connect-session'
 export const COGNITO_GROUP_ADMIN_USERS_LEGACY = 'ReapitUserAdmin'
 export const COGNITO_GROUP_ADMIN_USERS = 'MarketplaceAdmin'
 export const COGNITO_GROUP_USERS = 'ReapitUser'
+export const COGNITO_GROUP_DEVELOPER_ADMIN = 'FoundationsDeveloperAdmin'
 
 export const selectIsAdmin = (connectSession: ReapitConnectSession | null) => {
   return Boolean(connectSession?.loginIdentity?.adminId)
@@ -28,6 +29,12 @@ export const selectIsUserOrUserAdmin = (state: ReapitConnectSession | null): boo
   return selectIsUserAdmin(state) || selectIsCustomer(state)
 }
 
+export const selectIsDeveloperAdmin = (state: ReapitConnectSession | null): boolean => {
+  const loginIdentity = selectLoginIdentity(state)
+  if (!loginIdentity) return false
+  return loginIdentity.groups.includes(COGNITO_GROUP_DEVELOPER_ADMIN)
+}
+
 export const selectIsUserAdmin = (state: ReapitConnectSession | null): boolean => {
   const loginIdentity = selectLoginIdentity(state)
   if (!loginIdentity) return false