diff --git a/package.json b/package.json
index 90e9039d45db..cbc6313f941d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cipp",
- "version": "10.7.3",
+ "version": "10.7.4",
"author": "CIPP Contributors",
"homepage": "https://cipp.app/",
"bugs": {
diff --git a/public/manifest.json b/public/manifest.json
index 42f5d73ea6af..3650aa895891 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,6 +1,6 @@
{
"short_name": "CIPP",
- "name": "CIPP - CyberDrian Improved Partner Portal",
+ "name": "CIPP - CyberDrain Improved Partner Portal",
"icons": [
{
"src": "favicon.ico",
diff --git a/public/version.json b/public/version.json
index 35bb06742a8a..04aa3b874be4 100644
--- a/public/version.json
+++ b/public/version.json
@@ -1,3 +1,3 @@
{
- "version": "10.7.3"
+ "version": "10.7.4"
}
\ No newline at end of file
diff --git a/src/data/M365Licenses.json b/src/data/M365Licenses.json
index cb6847be1d57..a5075fa9e6ef 100644
--- a/src/data/M365Licenses.json
+++ b/src/data/M365Licenses.json
@@ -14919,6 +14919,14 @@
"Service_Plan_Id": "94065c59-bc8e-4e8b-89e5-5138d471eaff",
"Service_Plans_Included_Friendly_Names": "Microsoft Search"
},
+ {
+ "Product_Display_Name": "Microsoft 365 E3",
+ "String_Id": "SPE_E3",
+ "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965",
+ "Service_Plan_Name": "ATP_ENTERPRISE",
+ "Service_Plan_Id": "f20fedf3-f3c3-43c3-8267-2bfdd51c0939",
+ "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Office 365 (Plan 1)"
+ },
{
"Product_Display_Name": "Microsoft 365 E3 - Unattended License",
"String_Id": "SPE_E3_RPA1",
@@ -17183,6 +17191,14 @@
"Service_Plan_Id": "bea4c11e-220a-4e6d-8eb8-8ea15d019f90",
"Service_Plans_Included_Friendly_Names": "Microsoft Microsoft Entra Rights"
},
+ {
+ "Product_Display_Name": "Microsoft 365 E3_USGOV_DOD",
+ "String_Id": "SPE_E3_USGOV_DOD",
+ "GUID": "d61d61cc-f992-433f-a577-5bd016037eeb",
+ "Service_Plan_Name": "ATP_ENTERPRISE",
+ "Service_Plan_Id": "f20fedf3-f3c3-43c3-8267-2bfdd51c0939",
+ "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Office 365 (Plan 1)"
+ },
{
"Product_Display_Name": "Microsoft 365 E3_USGOV_GCCHIGH",
"String_Id": "SPE_E3_USGOV_GCCHIGH",
@@ -17295,6 +17311,14 @@
"Service_Plan_Id": "932ad362-64a8-4783-9106-97849a1a30b9",
"Service_Plans_Included_Friendly_Names": "Cloud App Security Discovery"
},
+ {
+ "Product_Display_Name": "Microsoft 365 E3_USGOV_GCCHIGH",
+ "String_Id": "SPE_E3_USGOV_GCCHIGH",
+ "GUID": "ca9d1dd9-dfe9-4fef-b97c-9bc1ea3c3658",
+ "Service_Plan_Name": "ATP_ENTERPRISE",
+ "Service_Plan_Id": "f20fedf3-f3c3-43c3-8267-2bfdd51c0939",
+ "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Office 365 (Plan 1)"
+ },
{
"Product_Display_Name": "Microsoft 365 E5",
"String_Id": "SPE_E5",
@@ -23407,6 +23431,22 @@
"Service_Plan_Id": "3efbd4ed-8958-4824-8389-1321f8730af8",
"Service_Plans_Included_Friendly_Names": "Avatars for Teams (additional)"
},
+ {
+ "Product_Display_Name": "Microsoft 365 E5 Suite features",
+ "String_Id": "M365_E5_SUITE_COMPONENTS",
+ "GUID": "99cc8282-2f74-4954-83b7-c6a9a1999067",
+ "Service_Plan_Name": "CLOUD_PKI",
+ "Service_Plan_Id": "795aec3a-93a2-45be-92c4-47b9a76340ca",
+ "Service_Plans_Included_Friendly_Names": "Microsoft Cloud PKI"
+ },
+ {
+ "Product_Display_Name": "Microsoft 365 E5 Suite features",
+ "String_Id": "M365_E5_SUITE_COMPONENTS",
+ "GUID": "99cc8282-2f74-4954-83b7-c6a9a1999067",
+ "Service_Plan_Name": "3_PARTY_APP_PATCH",
+ "Service_Plan_Id": "3afa0b92-83ef-41c1-8d64-586ab882a951",
+ "Service_Plans_Included_Friendly_Names": "Intune Enterprise Application Management"
+ },
{
"Product_Display_Name": "Microsoft 365 E5 with Calling Minutes",
"String_Id": "SPE_E5_CALLINGMINUTES",
@@ -28287,6 +28327,14 @@
"Service_Plan_Id": "c537f360-6a00-4ace-a7f5-9128d0ac1e4b",
"Service_Plans_Included_Friendly_Names": "Power Automate for Office 365 for Government"
},
+ {
+ "Product_Display_Name": "Microsoft 365 G3 GCC",
+ "String_Id": "M365_G3_GOV",
+ "GUID": "e823ca47-49c4-46b3-b38d-ca11d5abe3d2",
+ "Service_Plan_Name": "ATP_ENTERPRISE",
+ "Service_Plan_Id": "f20fedf3-f3c3-43c3-8267-2bfdd51c0939",
+ "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Office 365 (Plan 1)"
+ },
{
"Product_Display_Name": "Microsoft 365 GCC G5",
"String_Id": "M365_G5_GCC",
@@ -36063,6 +36111,14 @@
"Service_Plan_Id": "e95bec33-7c88-4a70-8e19-b10bd9d0c014",
"Service_Plans_Included_Friendly_Names": "Office for the Web"
},
+ {
+ "Product_Display_Name": "Office 365 E1 (no Teams)",
+ "String_Id": "Office_365_E1_(no_Teams)",
+ "GUID": "f8ced641-8e17-4dc5-b014-f5a2d53f6ac8",
+ "Service_Plan_Name": "MDOLITE_ENTERPRISE",
+ "Service_Plan_Id": "c6675fa4-68fe-415f-aec1-a44520f0c3a3",
+ "Service_Plans_Included_Friendly_Names": "Microsoft 365 built-in email and collaboration security"
+ },
{
"Product_Display_Name": "Office 365 E1 EEA (no Teams)",
"String_Id": "Office_365_w/o_Teams_Bundle_E1",
@@ -36831,6 +36887,14 @@
"Service_Plan_Id": "041fe683-03e4-45b6-b1af-c0cdc516daee",
"Service_Plans_Included_Friendly_Names": "Power Virtual Agents for Office 365"
},
+ {
+ "Product_Display_Name": "Office 365 E3",
+ "String_Id": "ENTERPRISEPACK",
+ "GUID": "6fd2c87f-b296-42f0-b197-1e91e994b900",
+ "Service_Plan_Name": "ATP_ENTERPRISE",
+ "Service_Plan_Id": "f20fedf3-f3c3-43c3-8267-2bfdd51c0939",
+ "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Office 365 (Plan 1)"
+ },
{
"Product_Display_Name": "Office 365 E3 (no Teams)",
"String_Id": "Office_365_E3_(no_Teams)",
@@ -37551,6 +37615,14 @@
"Service_Plan_Id": "43de0ff5-c92c-492b-9116-175376d08c38",
"Service_Plans_Included_Friendly_Names": "Office 365 ProPlus"
},
+ {
+ "Product_Display_Name": "Office 365 E3_USGOV_DOD",
+ "String_Id": "ENTERPRISEPACK_USGOV_DOD",
+ "GUID": "b107e5a3-3e60-4c0d-a184-a7e4395eb44c",
+ "Service_Plan_Name": "ATP_ENTERPRISE",
+ "Service_Plan_Id": "f20fedf3-f3c3-43c3-8267-2bfdd51c0939",
+ "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Office 365 (Plan 1)"
+ },
{
"Product_Display_Name": "Office 365 E3_USGOV_GCCHIGH",
"String_Id": "ENTERPRISEPACK_USGOV_GCCHIGH",
@@ -37623,6 +37695,14 @@
"Service_Plan_Id": "9953b155-8aef-4c56-92f3-72b0487fce41",
"Service_Plans_Included_Friendly_Names": "Microsoft Teams for GCCHigh (AR)"
},
+ {
+ "Product_Display_Name": "Office 365 E3_USGOV_GCCHIGH",
+ "String_Id": "ENTERPRISEPACK_USGOV_GCCHIGH",
+ "GUID": "aea38a85-9bd5-4981-aa00-616b411205bf",
+ "Service_Plan_Name": "ATP_ENTERPRISE",
+ "Service_Plan_Id": "f20fedf3-f3c3-43c3-8267-2bfdd51c0939",
+ "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Office 365 (Plan 1)"
+ },
{
"Product_Display_Name": "Office 365 E4",
"String_Id": "ENTERPRISEWITHSCAL",
@@ -40471,6 +40551,14 @@
"Service_Plan_Id": "6e5b7995-bd4f-4cbd-9d19-0e32010c72f0",
"Service_Plans_Included_Friendly_Names": "Insights by MyAnalytics for Government"
},
+ {
+ "Product_Display_Name": "Office 365 G3 GCC",
+ "String_Id": "ENTERPRISEPACK_GOV",
+ "GUID": "535a3a29-c5f0-42fe-8215-d3b9e1f38c4a",
+ "Service_Plan_Name": "ATP_ENTERPRISE",
+ "Service_Plan_Id": "f20fedf3-f3c3-43c3-8267-2bfdd51c0939",
+ "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Office 365 (Plan 1)"
+ },
{
"Product_Display_Name": "Office 365 G3 without Microsoft 365 Apps GCC",
"String_Id": "ENTERPRISEPACKWITHOUTPROPLUS_GOV",
diff --git a/src/pages/cipp/settings/partner-webhooks.js b/src/pages/cipp/settings/partner-webhooks.js
index f6771b76c49a..38d681883a1e 100644
--- a/src/pages/cipp/settings/partner-webhooks.js
+++ b/src/pages/cipp/settings/partner-webhooks.js
@@ -4,6 +4,7 @@ import tabOptions from "./tabOptions";
import CippFormPage from "../../../components/CippFormPages/CippFormPage";
import { useForm } from "react-hook-form";
import {
+ Alert,
Box,
Button,
Card,
@@ -42,6 +43,15 @@ const Page = () => {
queryKey: "listSubscription",
});
+ const subscription = listSubscription?.data?.Results;
+ const expectedWebhookUrl = subscription?.expectedWebhookUrl;
+ // Compared case-insensitively to match the backend, which uses PowerShell's -ne
+ const webhookUrlIsStale =
+ !!expectedWebhookUrl &&
+ !!subscription?.webhookUrl &&
+ subscription.webhookUrl !== "None" &&
+ subscription.webhookUrl.toLowerCase() !== expectedWebhookUrl.toLowerCase();
+
const listEventTypes = ApiGetCall({
url: "/api/ExecPartnerWebhook",
data: { Action: "ListEventTypes" },
@@ -165,7 +175,18 @@ const Page = () => {
},
{
label: "Webhook URL",
- value: ,
+ value: (
+
+
+ {webhookUrlIsStale && (
+
+ This subscription points at a different URL than the one you are using now.
+ Save the settings below to re-register it against{" "}
+ {expectedWebhookUrl}.
+
+ )}
+
+ ),
sx: { pl: 0 },
},
{