Merge pull request #49 from KelvinTegelaar/dev

kris6673 · web-flow · commit 7f732ffbfaf7 · 2024-06-26T17:01:10.000+02:00
[pull] dev from KelvinTegelaar:dev
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "5.8.5",
+  "version": "5.9.3",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {
diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-5.8.5
+5.9.3
diff --git a/src/_nav.jsx b/src/_nav.jsx
@@ -45,6 +45,11 @@ const _nav = [
         name: 'Users',
         to: '/identity/administration/users',
       },
+      {
+        component: CNavItem,
+        name: 'Risky Users',
+        to: '/identity/administration/risky-users',
+      },
       {
         component: CNavItem,
         name: 'Groups',
@@ -114,6 +119,11 @@ const _nav = [
         name: 'AAD Connect Report',
         to: '/identity/reports/azure-ad-connect-report',
       },
+      {
+        component: CNavItem,
+        name: 'Risk Detections',
+        to: '/identity/reports/risk-detections',
+      },
     ],
   },
   {
diff --git a/src/components/forms/RFFComponents.jsx b/src/components/forms/RFFComponents.jsx
@@ -470,19 +470,25 @@ RFFCFormSelect.propTypes = {
 export function Condition({ when, is, children, like, regex }) {
   return (
     <>
-      {is && (
+      {is !== undefined && (
         <Field name={when} subscription={{ value: true }}>
-          {({ input: { value } }) => (value === is ? children : null)}
+          {({ input: { value } }) => {
+            return value === is ? children : null
+          }}
         </Field>
       )}
-      {like && (
+      {like !== undefined && (
         <Field name={when} subscription={{ value: true }}>
-          {({ input: { value } }) => (value.includes(like) ? children : null)}
+          {({ input: { value } }) => {
+            return value.includes(like) ? children : null
+          }}
         </Field>
       )}
-      {regex && (
+      {regex !== undefined && (
         <Field name={when} subscription={{ value: true }}>
-          {({ input: { value } }) => (value.match(regex) ? children : null)}
+          {({ input: { value } }) => {
+            return value.match(regex) ? children : null
+          }}
         </Field>
       )}
     </>
diff --git a/src/components/layout/AppHeader.jsx b/src/components/layout/AppHeader.jsx
@@ -101,13 +101,19 @@ const AppHeader = () => {
   //check if the value of this key is false. If so, set the setupCompleted state to false
   //if none is found, set the setupCompleted state to true
   useEffect(() => {
-    if (dashboard && dashboard.length >= 1) {
-      const setupCompleted = dashboard.find((alert) => alert.setupCompleted === false)
+    if (dashboard && Array.isArray(dashboard) && dashboard.length >= 1) {
+      console.log('Finding if setup is completed.')
+      const setupCompleted = dashboard.find((alert) => alert && alert.setupCompleted === false)
       if (setupCompleted) {
+        console.log("Setup isn't completed yet, we found a match with false.")
         dispatch(setSetupCompleted({ setupCompleted: false }))
       } else {
+        console.log('Setup is completed.')
         dispatch(setSetupCompleted({ setupCompleted: true }))
       }
+    } else {
+      console.log('Setup is completed.')
+      dispatch(setSetupCompleted({ setupCompleted: true }))
     }
   }, [dashboard, dispatch])
 
diff --git a/src/components/tables/CippTable.jsx b/src/components/tables/CippTable.jsx
@@ -637,6 +637,7 @@ export default function CippTable({
 
       // Define the flatten function
       const flatten = (obj, prefix = '') => {
+        if (obj === null) return {}
         return Object.keys(obj).reduce((output, key) => {
           const newKey = prefix ? `${prefix}.${key}` : key
           const value = obj[key] === null ? '' : obj[key]
@@ -645,9 +646,13 @@ export default function CippTable({
             Object.assign(output, flatten(value, newKey))
           } else {
             if (Array.isArray(value)) {
-              value.map((item, idx) => {
-                Object.assign(output, flatten(item, `${newKey}[${idx}]`))
-              })
+              if (typeof value[0] === 'object') {
+                value.map((item, idx) => {
+                  Object.assign(output, flatten(item, `${newKey}[${idx}]`))
+                })
+              } else {
+                output[newKey] = value
+              }
             } else {
               output[newKey] = value
             }
@@ -683,8 +688,7 @@ export default function CippTable({
         })
         return Array.isArray(exportData) && exportData.length > 0
           ? exportData.map((obj) => {
-              const flattenedObj = flatten(obj)
-              return applyFormatter(flattenedObj)
+              return flatten(applyFormatter(obj))
             })
           : []
       }
@@ -695,8 +699,7 @@ export default function CippTable({
       // Adjusted dataFlat processing to include formatting
       let dataFlat = Array.isArray(data)
         ? data.map((item) => {
-            const flattenedItem = flatten(item)
-            return applyFormatter(flattenedItem)
+            return flatten(applyFormatter(item))
           })
         : []
       if (!disablePDFExport) {
diff --git a/src/importsMap.jsx b/src/importsMap.jsx
@@ -15,6 +15,7 @@ import React from 'react'
   "/identity/administration/jit-admin": React.lazy(() => import('./views/identity/administration/DeployJITAdmin')), 
   "/identity/administration/ViewBec": React.lazy(() => import('./views/identity/administration/ViewBEC')), 
   "/identity/administration/users": React.lazy(() => import('./views/identity/administration/Users')), 
+  "/identity/administration/risky-users": React.lazy(() => import('./views/identity/administration/RiskyUsers')), 
   "/identity/administration/devices": React.lazy(() => import('./views/identity/administration/Devices')), 
   "/identity/administration/groups/add": React.lazy(() => import('./views/identity/administration/AddGroup')), 
   "/identity/administration/group-templates": React.lazy(() => import('./views/identity/administration/GroupTemplates')), 
@@ -32,6 +33,7 @@ import React from 'react'
   "/identity/reports/inactive-users-report": React.lazy(() => import('./views/identity/reports/InactiveUsers')), 
   "/identity/reports/Signin-report": React.lazy(() => import('./views/identity/reports/SignIns')), 
   "/identity/reports/azure-ad-connect-report": React.lazy(() => import('./views/identity/reports/AzureADConnectReport')), 
+  "/identity/reports/risk-detections": React.lazy(() => import('./views/identity/reports/RiskDetections')), 
   "/tenant/administration/tenants": React.lazy(() => import('./views/tenant/administration/Tenants')), 
   "/tenant/administration/tenants/edit": React.lazy(() => import('./views/tenant/administration/EditTenant')), 
   "/tenant/administration/partner-relationships": React.lazy(() => import('./views/tenant/administration/PartnerRelationships')), 
diff --git a/src/routes.json b/src/routes.json
@@ -99,6 +99,12 @@
     "component": "views/identity/administration/Users",
     "allowedRoles": ["admin", "editor", "readonly"]
   },
+  {
+    "path": "/identity/administration/risky-users",
+    "name": "Risky Users",
+    "component": "views/identity/administration/RiskyUsers",
+    "allowedRoles": ["admin", "editor", "readonly"]
+  },
   {
     "path": "/identity/administration/devices",
     "name": "Devices",
@@ -206,6 +212,12 @@
     "component": "views/identity/reports/AzureADConnectReport",
     "allowedRoles": ["admin", "editor", "readonly"]
   },
+  {
+    "path": "/identity/reports/risk-detections",
+    "name": "Risk Detections",
+    "component": "views/identity/reports/RiskDetections",
+    "allowedRoles": ["admin", "editor", "readonly"]
+  },
   {
     "path": "/tenant",
     "name": "Tenant",
diff --git a/src/views/identity/administration/RiskyUsers.jsx b/src/views/identity/administration/RiskyUsers.jsx
@@ -0,0 +1,103 @@
+import { useSelector } from 'react-redux'
+import { CippPageList } from 'src/components/layout'
+
+const columns = [
+  {
+    name: 'Risk Last Updated Date',
+    selector: (row) => row['riskLastUpdatedDateTime'],
+    sortable: true,
+    exportSelector: 'riskLastUpdatedDateTime',
+  },
+  {
+    name: 'User Principal Name',
+    selector: (row) => row['userPrincipalName'],
+    sortable: true,
+    exportSelector: 'userPrincipalName',
+  },
+  {
+    name: 'Risk Level',
+    selector: (row) => row['riskLevel'],
+    sortable: true,
+    exportSelector: 'riskLevel',
+  },
+  {
+    name: 'Risk State',
+    selector: (row) => row['riskState'],
+    sortable: true,
+    exportSelector: 'riskState',
+  },
+  {
+    name: 'Risk Detail',
+    selector: (row) => row['riskDetail'],
+    sortable: true,
+    exportSelector: 'riskDetail',
+  },
+  {
+    name: 'isProcessing',
+    selector: (row) => row['isProcessing'],
+    sortable: true,
+    exportSelector: 'isProcessing',
+  },
+  {
+    name: 'isDeleted',
+    selector: (row) => row['isDeleted'],
+    sortable: true,
+    exportSelector: 'isDeleted',
+  },
+]
+
+const RiskyUsers = () => {
+  const tenant = useSelector((state) => state.app.currentTenant)
+
+  return (
+    <>
+      <CippPageList
+        title="Risky Users"
+        capabilities={{ allTenants: true, helpContext: 'https://google.com' }}
+        datatable={{
+          filterlist: [
+            {
+              filterName: 'State: none',
+              filter: 'Complex: riskState eq none',
+            },
+            {
+              filterName: 'State: atRisk',
+              filter: 'Complex: riskState eq atRisk',
+            },
+            {
+              filterName: 'State: confirmedCompromised',
+              filter: 'Complex: riskState eq confirmedCompromised',
+            },
+            {
+              filterName: 'State: confirmedSafe',
+              filter: 'Complex: riskState eq confirmedSafe',
+            },
+            {
+              filterName: 'State: dismissed',
+              filter: 'Complex: riskState eq dismissed',
+            },
+            {
+              filterName: 'State: remediated',
+              filter: 'Complex: riskState eq remediated',
+            },
+            {
+              filterName: 'State: unknownFutureValue',
+              filter: 'Complex: riskState eq unknownFutureValue',
+            },
+          ],
+          columns: columns,
+          path: `api/ListGraphRequest`,
+          reportName: `${tenant?.defaultDomainName}-ListRiskyUsers`,
+          params: {
+            TenantFilter: tenant?.defaultDomainName,
+            Endpoint: `identityProtection/riskyUsers`,
+            $count: true,
+            $orderby: 'riskLastUpdatedDateTime',
+          },
+        }}
+      />
+    </>
+  )
+}
+
+export default RiskyUsers
diff --git a/src/views/identity/reports/RiskDetections.jsx b/src/views/identity/reports/RiskDetections.jsx
diff --git a/src/views/identity/reports/SignIns.jsx b/src/views/identity/reports/SignIns.jsx
diff --git a/src/views/tenant/administration/GDAPInviteWizard.jsx b/src/views/tenant/administration/GDAPInviteWizard.jsx
diff --git a/version_latest.txt b/version_latest.txt

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cipp",`
`3`		`- "version": "5.8.5",`
	`3`	`+ "version": "5.9.3",`
`4`	`4`	`"description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",`
`5`	`5`	`"homepage": "https://cipp.app/",`
`6`	`6`	`"bugs": {`