Merge pull request #102 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: isgq-github01

.github/workflows/dev_cippjta72.yml

@@ -0,0 +1,32 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cippjta72
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+      
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cippjta72'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_1EBE9D73F9EC4528BA666FC934055536 }}
+          sku: 'flexconsumption'
+        

Config/AdditionalPermissions.json

@@ -60,5 +60,26 @@
         "type": "Scope"
       }
     ]
+  },
+  {
+    "resourceAppId": "00000003-0000-0000-c000-000000000000",
+    "resourceAccess": [
+      {
+        "id": "CopilotPolicySettings.ReadWrite",
+        "type": "Scope"
+      },
+      {
+        "id": "CopilotSettings-LimitedMode.ReadWrite",
+        "type": "Scope"
+      },
+      {
+        "id": "CopilotPackages.Read.All",
+        "type": "Scope"
+      },
+      {
+        "id": "CopilotPackages.ReadWrite.All",
+        "type": "Scope"
+      }
+    ]
   }
 ]

Config/CIPPDBCacheTypes.json

@@ -214,6 +214,11 @@
     "friendlyName": "Exchange Quarantine Policy",
     "description": "Exchange Online quarantine policy"
   },
+  {
+    "type": "ExoGlobalQuarantinePolicy",
+    "friendlyName": "Exchange Global Quarantine Policy",
+    "description": "Exchange Online tenant-wide Global Quarantine policy (end-user notification settings)"
+  },
   {
     "type": "ExoRemoteDomain",
     "friendlyName": "Exchange Remote Domain",
@@ -239,6 +244,16 @@
     "friendlyName": "Exchange Tenant Allow/Block List",
     "description": "Exchange Online tenant allow/block list"
   },
+  {
+    "type": "ExoInboundConnector",
+    "friendlyName": "Exchange Inbound Connectors",
+    "description": "Exchange Online inbound connectors (includes enhanced filtering settings)"
+  },
+  {
+    "type": "ExoProtectionAlert",
+    "friendlyName": "Exchange Protection Alerts",
+    "description": "Microsoft 365 protection alert policies (Security & Compliance endpoint)"
+  },
   {
     "type": "Mailboxes",
     "friendlyName": "Mailboxes",
@@ -363,5 +378,10 @@
     "type": "CopilotUserCountTrend",
     "friendlyName": "Copilot User Count Trend",
     "description": "Daily Copilot active user count trend (7-day period)"
+  },
+  {
+    "type": "ExoTransportConfig",
+    "friendlyName": "Exchange Transport Config",
+    "description": "Exchange Online transport configuration including SMTP authentication settings"
   }
 ]

Config/CIPPTimers.json

@@ -17,14 +17,6 @@
     "RunOnProcessor": true,
     "PreferredProcessor": "usertasks"
   },
-  {
-    "Id": "168decf3-7ddd-471e-ab46-8b40be0f18ae",
-    "Command": "Start-CIPPProcessorQueue",
-    "Description": "Timer to handle user initiated tasks",
-    "Cron": "0 */15 * * * *",
-    "Priority": 1,
-    "RunOnProcessor": true
-  },
   {
     "Id": "44a40668-ed71-403c-8c26-b32e320086ad",
     "Command": "Start-AuditLogOrchestrator",
@@ -245,6 +237,16 @@
     "TZOffset": true,
     "IsSystem": true
   },
+  {
+    "Id": "5e8a9b4c-2d6f-4a3e-b7c1-9d0e5f3a8b2c",
+    "Command": "Start-IntuneReportExportOrchestrator",
+    "Description": "Submit Intune report-export jobs ahead of nightly DB cache run",
+    "Cron": "0 0 2 * * *",
+    "Priority": 22,
+    "RunOnProcessor": true,
+    "TZOffset": true,
+    "IsSystem": true
+  },
   {
     "Id": "9a7f8e6d-5c4b-3a2d-1e0f-9b8c7d6e5f4a",
     "Command": "Start-CIPPDBCacheOrchestrator",
@@ -273,5 +275,14 @@
     "Priority": 30,
     "RunOnProcessor": false,
     "IsSystem": true
+  },
+  {
+    "Id": "7e2a9b4c-1d5f-4a8e-b3c6-0f9d2e7a4b1c",
+    "Command": "Start-UserSyncTimer",
+    "Description": "Sync partner tenant users and group-based roles into allowedUsers table",
+    "Cron": "0 */15 * * * *",
+    "Priority": 11,
+    "RunOnProcessor": false,
+    "IsSystem": true
   }
 ]

Config/ExcludeSkuList.JSON

@@ -59,6 +59,10 @@
     "GUID": "8c4ce438-32a7-4ac5-91a6-e22ae08d9c8b",
     "Product_Display_Name": "Rights Management Adhoc"
   },
+  {
+    "GUID": "093e8d14-a334-43d9-93e3-30589a8b47d0",
+    "Product_Display_Name": "Rights Management Service Basic Content Protection"
+  },
   {
     "GUID": "5b631642-bd26-49fe-bd20-1daaa972ef80",
     "Product_Display_Name": "Microsoft Power Apps for Developer"

Config/FeatureFlags.json

@@ -32,16 +32,29 @@
     "Endpoints": [
       "ExecCIPPUsers",
       "ListCIPPUsers",
-      "ExecSSOSetup",
       "ExecContainerManagement",
-      "ListContainerLogs"
+      "ListContainerLogs",
+      "ListWorkerHealth"
     ],
     "Pages": [
       "/cipp/advanced/super-admin/cipp-users",
-      "/cipp/advanced/super-admin/sso",
       "/cipp/advanced/super-admin/container",
-      "/cipp/advanced/container-logs"
+      "/cipp/advanced/container-logs",
+      "/cipp/advanced/worker-health"
     ],
     "Hidden": true
+  },
+  {
+    "Id": "MCPServer",
+    "Name": "MCP Server",
+    "Description": "Model Context Protocol (MCP) server endpoint that exposes CIPP's read-only API surface as tools for AI clients. Disabled by default; enable to allow MCP access.",
+    "Enabled": false,
+    "AllowUserToggle": true,
+    "Timers": [],
+    "Endpoints": [
+      "ExecMcp"
+    ],
+    "Pages": [],
+    "Hidden": false
   }
 ]