Merge branch 'KelvinTegelaar:main' into main

.github/workflows/dev_deploy.yml

@@ -4,14 +4,10 @@ on:
   push:
     branches:
       - dev
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-    branches:
-      - dev
 
 jobs:
   build_and_deploy_job:
-    if: github.event.repository.fork == false && github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    if: github.event.repository.fork == false && github.event_name == 'push'
     runs-on: ubuntu-latest
     name: Build and Deploy Job
     steps:

.vscode/extensions.json

@@ -5,6 +5,7 @@
     "eg2.vscode-npm-script",
     "christian-kohler.npm-intellisense",
     "esbenp.prettier-vscode",
-    "stylelint.vscode-stylelint"
+    "stylelint.vscode-stylelint",
+    "editorconfig.editorconfig"
   ]
 }

.vscode/launch.json

@@ -27,6 +27,13 @@
       "request": "launch",
       "name": "Launch Chrome Debugger",
       "url": "http://localhost:4280"
+    },
+    {
+      "type": "PowerShell",
+      "name": "Launch in Windows Terminal",
+      "request": "launch",
+      "cwd": "${cwd}",
+      "script": ". '${cwd}\\Tools\\Start-CippDevEmulators.ps1'"
     }
   ],
   "compounds": [

README.md

@@ -1,22 +1,13 @@
 ![CyberDrain Light](github_assets/img/CIPP.png#gh-dark-mode-only)
 ![CyberDrain Dark](github_assets/img/CIPP-Light.png#gh-light-mode-only)
 
-<center><h1>Sponsored by</h1></center>
-<p align="center">
-
-![OIT](github_assets/img/oitpsonsor_light.png)&nbsp;&nbsp;&nbsp;&nbsp;
-![Immybot](github_assets/img/Immybot.png)&nbsp;&nbsp;&nbsp;&nbsp;
-![NinjaOne](github_assets/img/NinjaOne-Light.png#gh-dark-mode-only)
-![NinjaOne](github_assets/img/NinjaOne-Dark.png#gh-light-mode-only)&nbsp;&nbsp;&nbsp;&nbsp;
-![Huntress](github_assets/img/Huntress.png)
-![HaloPSA](github_assets/img/halopsa-red-grey.svg)
-
-</p>
-
 # What is this?
 
-The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners. The current Microsoft partner landscape makes it fairly hard to manage multi tenant situations, with loads of manual work. Microsoft Lighthouse might resolve this in the future but development of this is lagging far behind development of the current market for Microsoft Partners.
+The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners. The current Microsoft partner landscape makes it fairly hard to manage multi tenant situations, with loads of manual work. Microsoft Lighthouse might resolve this in the future but development of this is lagging far behind development of the current market for Microsoft Partners.  
+This project is a way to help you with administration, with user management, and deploying your own preferred standards. It's not a replacement for security tools, or a way to cut costs on specific subscriptions. The tool should assist you in removing the gripes with standard partner management and save you several hours per engineer per month.  
+For more information, we recommend checking out our website [here](https://cipp.app)  
+For detailed documentation about features of CIPP, please check out our [documentation.](https://docs.cipp.app)
 
-This project is a way to help you with administration, with user management, and deploying your own preferred standards. It's not a replacement for security tools, or a way to cut costs on specific subscriptions. The tool should assist you in removing the gripes with standard partner management and save you several hours per engineer per month.
+# Our sponsors
 
-for more information, we recommend checking out our website [here](https://cipp.app)
+You can find our sponsors [here.](https://docs.cipp.app/#our-sponsors)

Tools/Start-CippDevEmulators.ps1

@@ -0,0 +1,4 @@
+Write-Host "Starting CIPP Dev Emulators"
+$Path = (Get-Item $PSScriptRoot).Parent.Parent.FullName
+wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c azurite`; new-tab --title 'FunctionApp' -d $Path\CIPP-API pwsh -c func start`; new-tab --title 'CIPP Frontend' -d $Path\CIPP pwsh -c npm run start`; new-tab --title 'SWA' -d $Path\CIPP pwsh -c npm run start-swa
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "5.7.1",
+  "version": "6.0.2",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {

public/MFAStates.json

@@ -0,0 +1,14 @@
+[
+  {
+    "value": "disabled",
+    "label": "Disabled"
+  },
+  {
+    "value": "enabled",
+    "label": "Enabled"
+  },
+  {
+    "value": "enforced",
+    "label": "Enforced"
+  }
+]

public/version_latest.txt

@@ -1 +1 @@
-5.7.1
+6.0.2

src/_nav.jsx

@@ -19,6 +19,7 @@ import {
   faUserShield,
   faEnvelope,
   faToolbox,
+  faDownload,
 } from '@fortawesome/free-solid-svg-icons'
 
 const _nav = [
@@ -45,6 +46,11 @@ const _nav = [
         name: 'Users',
         to: '/identity/administration/users',
       },
+      {
+        component: CNavItem,
+        name: 'Risky Users',
+        to: '/identity/administration/risky-users',
+      },
       {
         component: CNavItem,
         name: 'Groups',
@@ -75,6 +81,11 @@ const _nav = [
         name: 'Roles',
         to: '/identity/administration/roles',
       },
+      {
+        component: CNavItem,
+        name: 'JIT Admin',
+        to: '/identity/administration/jit-admin',
+      },
       {
         component: CNavItem,
         name: 'Offboarding Wizard',
@@ -109,6 +120,11 @@ const _nav = [
         name: 'AAD Connect Report',
         to: '/identity/reports/azure-ad-connect-report',
       },
+      {
+        component: CNavItem,
+        name: 'Risk Detections',
+        to: '/identity/reports/risk-detections',
+      },
     ],
   },
   {
@@ -147,6 +163,11 @@ const _nav = [
         name: 'App Consent Requests',
         to: '/tenant/administration/app-consent-requests',
       },
+      {
+        component: CNavItem,
+        name: 'Authentication Methods',
+        to: '/tenant/administration/authentication-methods',
+      },
       {
         component: CNavItem,
         name: 'Tenant Onboarding',
@@ -164,6 +185,25 @@ const _nav = [
       },
     ],
   },
+  {
+    component: CNavGroup,
+    name: 'Configuration Backup',
+    section: 'Tenant Administration',
+    to: '/cipp/gdap',
+    icon: <FontAwesomeIcon icon={faDownload} className="nav-icon" />,
+    items: [
+      {
+        component: CNavItem,
+        name: 'Backup Wizard',
+        to: '/tenant/backup/backup-wizard',
+      },
+      {
+        component: CNavItem,
+        name: 'Restore Wizard',
+        to: '/tenant/backup/restore-wizard',
+      },
+    ],
+  },
   {
     component: CNavGroup,
     name: 'Tools',
@@ -593,6 +633,11 @@ const _nav = [
         name: 'Mailboxes',
         to: '/email/administration/mailboxes',
       },
+      {
+        component: CNavItem,
+        name: 'Deleted Mailboxes',
+        to: '/email/administration/deleted-mailboxes',
+      },
       {
         component: CNavItem,
         name: 'Mailbox Rules',
@@ -771,6 +816,16 @@ const _nav = [
         name: 'Application Settings',
         to: '/cipp/settings',
       },
+      {
+        component: CNavItem,
+        name: 'Extensions Settings',
+        to: '/cipp/extensions',
+      },
+      {
+        component: CNavItem,
+        name: 'Extension Sync',
+        to: '/cipp/extension-sync',
+      },
       {
         component: CNavItem,
         name: 'User Settings',

src/components/buttons/TableModalButton.jsx

@@ -50,4 +50,5 @@ TableModalButton.propTypes = {
   title: PropTypes.string,
   className: PropTypes.string,
   countOnly: PropTypes.bool,
+  icon: PropTypes.string,
 }

src/components/contentcards/CippButtonCard.jsx

@@ -9,9 +9,10 @@ export default function CippButtonCard({
   CardButton,
   children,
   isFetching,
+  className = 'h-100',
 }) {
   return (
-    <CCard className="h-100 mb-3">
+    <CCard className={`${className} mb-3`}>
       <CCardHeader>
         <CCardTitle>
           {titleType === 'big' ? <h3 className="underline mb-3">{title}</h3> : title}
@@ -32,4 +33,5 @@ CippButtonCard.propTypes = {
   CardButton: PropTypes.element.isRequired,
   children: PropTypes.element.isRequired,
   isFetching: PropTypes.bool.isRequired,
+  className: PropTypes.string,
 }