Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev

Author: KelvinTegelaar

src/components/CippWizard/CippWizardOffboarding.jsx

@@ -300,6 +300,7 @@ export const CippWizardOffboarding = (props) => {
         onPreviousStep={onPreviousStep}
         onNextStep={onNextStep}
         formControl={formControl}
+        replacementBehaviour="removeNulls"
       />
     </Stack>
   );

src/components/CippWizard/CippWizardStepButtons.jsx

@@ -13,14 +13,24 @@ export const CippWizardStepButtons = (props) => {
     formControl,
     noNextButton = false,
     noSubmitButton = false,
+    replacementBehaviour,
     queryKeys,
     ...other
   } = props;
   const { isValid, isSubmitted, isSubmitting } = useFormState({ control: formControl.control });
   const sendForm = ApiPostCall({ relatedQueryKeys: queryKeys });
   const handleSubmit = () => {
     const values = formControl.getValues();
-    sendForm.mutate({ url: postUrl, data: values });
+    const newData = {};
+    Object.keys(values).forEach((key) => {
+      const value = values[key];
+      if (replacementBehaviour !== "removeNulls") {
+        newData[key] = value;
+      } else if (row[value] !== undefined) {
+        newData[key] = row[value];
+      }
+    });
+    sendForm.mutate({ url: postUrl, data: newData });
   };
 
   return (

src/data/alerts.json

@@ -22,12 +22,17 @@
   {
     "name": "InactiveLicensedUsers",
     "label": "Alert on licensed users that have not logged in for 90 days",
+    "requiresInput": true,
+    "inputType": "switch",
+    "inputLabel": "Exclude disabled users?",
+    "inputName": "InactiveLicensedUsersExcludeDisabled",
     "recommendedRunInterval": "1d"
   },
   {
     "name": "QuotaUsed",
     "label": "Alert on % mailbox quota used",
     "requiresInput": true,
+    "inputType": "textField",
     "inputLabel": "Enter quota percentage",
     "inputName": "QuotaUsedQuota",
     "recommendedRunInterval": "4h"
@@ -36,6 +41,7 @@
     "name": "SharePointQuota",
     "label": "Alert on % SharePoint quota used",
     "requiresInput": true,
+    "inputType": "textField",
     "inputLabel": "Enter quota percentage",
     "inputName": "SharePointQuotaQuota",
     "recommendedRunInterval": "4h"
@@ -85,6 +91,11 @@
     "label": "Alert on new Apple Business Manager terms",
     "recommendedRunInterval": "30d"
   },
+  {
+    "name": "AppCertificateExpiry ",
+    "label": "Alert on expiring application certificates",
+    "recommendedRunInterval": "1d"
+  },
   {
     "name": "ApnCertExpiry",
     "label": "Alert on expiring APN certificates",

src/data/standards.json

@@ -49,6 +49,36 @@
     "powershellEquivalent": "Enable-OrganizationCustomization",
     "recommendedBy": ["CIS"]
   },
+  {
+    "name": "standards.ProfilePhotos",
+    "cat": "Global Standards",
+    "tag": ["lowimpact"],
+    "helpText": "Controls whether users can set their own profile photos in Microsoft 365.",
+    "docsDescription": "Controls whether users can set their own profile photos in Microsoft 365. When disabled, only User and Global administrators can update profile photos for users.",
+    "addedComponent": [
+      {
+        "type": "select",
+        "multiple": false,
+        "label": "Select value",
+        "name": "standards.ProfilePhotos.state",
+        "options": [
+          {
+            "label": "Enabled",
+            "value": "enabled"
+          },
+          {
+            "label": "Disabled",
+            "value": "disabled"
+          }
+        ]
+      }
+    ],
+    "label": "Allow users to set profile photos",
+    "impact": "Low Impact",
+    "impactColour": "info",
+    "powershellEquivalent": "Set-OrganizationConfig -ProfilePhotoOptions EnablePhotos and Update-MgBetaAdminPeople",
+    "recommendedBy": []
+  },
   {
     "name": "standards.PhishProtection",
     "cat": "Global Standards",
@@ -1270,7 +1300,13 @@
     "tag": ["mediumimpact"],
     "helpText": "Sets emails sent as and on behalf of shared mailboxes to also be stored in the shared mailbox sent items folder",
     "docsDescription": "This makes sure that e-mails sent from shared mailboxes or delegate mailboxes, end up in the mailbox of the shared/delegate mailbox instead of the sender, allowing you to keep replies in the same mailbox as the original e-mail.",
-    "addedComponent": [],
+    "addedComponent": [
+      {
+        "type": "switch",
+        "label": "Include user mailboxes",
+        "name": "standards.DelegateSentItems.IncludeUserMailboxes"
+      }
+    ],
     "label": "Set mailbox Sent Items delegation (Sent items for shared mailboxes)",
     "impact": "Medium Impact",
     "impactColour": "warning",

src/layouts/config.js

@@ -377,6 +377,10 @@ export const nativeMenuItems = [
             title: "Shared Mailbox with Enabled Account",
             path: "/email/reports/SharedMailboxEnabledAccount",
           },
+          {
+            title: "Global Address List",
+            path: "/email/reports/global-address-list",
+          },
         ],
       },
     ],

src/pages/email/administration/mailboxes/index.js

@@ -47,7 +47,7 @@ const Page = () => {
     },
     {
       label: "Hide from Global Address List",
-      type: "GET",
+      type: "POST",
       url: "/api/ExecHideFromGAL",
       data: {
         ID: "UPN",
@@ -58,7 +58,7 @@ const Page = () => {
     },
     {
       label: "Unhide from Global Address List",
-      type: "GET",
+      type: "POST",
       url: "/api/ExecHideFromGAL",
       data: {
         ID: "UPN",

src/pages/email/reports/global-address-list/index.js

@@ -0,0 +1,81 @@
+import { Layout as DashboardLayout } from "/src/layouts/index.js";
+import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
+
+const Page = () => {
+  const actions = [
+    {
+      label: "Unhide from Global Address List",
+      type: "POST",
+      url: "/api/ExecHideFromGAL",
+      data: {
+        HideFromGAL: false,
+        ID: "PrimarySmtpAddress",
+      },
+      confirmText: "Are you sure you want to show this mailbox in the Global Address List?",
+    },
+    {
+      label: "Hide from Global Address List",
+      type: "POST",
+      url: "/api/ExecHideFromGAL",
+      data: {
+        HideFromGAL: true,
+        ID: "PrimarySmtpAddress",
+      },
+      confirmText: "Are you sure you want to hide this mailbox from the Global Address List?",
+    },
+  ];
+
+  const offCanvas = {
+    extendedInfoFields: [
+      "HiddenFromAddressListsEnabled",
+      "ExternalDirectoryObjectId",
+      "DisplayName",
+      "PrimarySmtpAddress",
+      "RecipientType",
+      "RecipientTypeDetails",
+      "IsDirSynced",
+      "SKUAssigned",
+      "EmailAddresses",
+    ],
+    actions: actions,
+  };
+
+  const filters = [
+    {
+      filterName: "Hidden from GAL",
+      value: [{ id: "HiddenFromAddressListsEnabled", value: "Yes" }],
+      type: "column",
+    },
+    {
+      filterName: "Shown in GAL",
+      value: [{ id: "HiddenFromAddressListsEnabled", value: "No" }],
+      type: "column",
+    },
+    {
+      filterName: "Cloud only mailboxes",
+      value: [{ id: "IsDirSynced", value: "No" }],
+      type: "column",
+    },
+  ];
+
+  return (
+    <CippTablePage
+      title="Global Address List"
+      apiUrl="/api/ListGlobalAddressList"
+      actions={actions}
+      offCanvas={offCanvas}
+      filters={filters}
+      simpleColumns={[
+        "HiddenFromAddressListsEnabled",
+        "DisplayName",
+        "PrimarySmtpAddress",
+        "RecipientTypeDetails",
+        "IsDirSynced",
+      ]}
+    />
+  );
+};
+
+Page.getLayout = (page) => <DashboardLayout>{page}</DashboardLayout>;
+
+export default Page;

src/pages/tenant/administration/alert-configuration/alert.jsx

@@ -206,12 +206,21 @@ const AlertWizard = () => {
   };
 
   const handleScriptSubmit = (values) => {
+    const getInputParams = () => {
+      if (values.command.value.requiresInput) {
+        return {
+          [values.command.value.inputName]: values[values.command.value.inputName],
+        };
+      }
+      return {};
+    };
+
     const postObject = {
       RowKey: router.query.clone ? undefined : router.query.id ? router.query.id : undefined,
       tenantFilter: values.tenantFilter?.value,
       Name: `${values.tenantFilter.value}: ${values.command.label}`,
       Command: { value: `Get-CIPPAlert${values.command.value.name}` },
-      Parameters: {},
+      Parameters: getInputParams(),
       ScheduledTime: Math.floor(new Date().getTime() / 1000) + 60,
       Recurrence: values.recurrence,
       PostExecution: values.postExecution,
@@ -512,7 +521,7 @@ const AlertWizard = () => {
                             <Grid item xs={12} md={12}>
                               {commandValue?.value?.requiresInput && (
                                 <CippFormComponent
-                                  type="textField"
+                                  type={commandValue.value?.inputType}
                                   name={commandValue.value?.inputName}
                                   formControl={formControl}
                                   label={commandValue.value?.inputLabel}

src/pages/tenant/administration/app-consent-requests/index.js

@@ -52,6 +52,7 @@ const Page = () => {
 
   return (
     <CippTablePage
+      // FIXME: This tableFilter does nothing. It does not change the table data at all, like the code makes it seem like it should. -Bobby
       tableFilter={
         <Accordion expanded={expanded} onChange={() => setExpanded(!expanded)}>
           <AccordionSummary expandIcon={<ExpandMoreIcon />}>
@@ -95,7 +96,7 @@ const Page = () => {
         // Filter for showing only pending requests
         {
           filterName: "Pending requests",
-          value: [{ id: "requestStatus", value: "Pending" }],
+          value: [{ id: "requestStatus", value: "InProgress" }],
           type: "column",
         },
       ]}

src/pages/tenant/gdap-management/onboarding/start.js

@@ -205,8 +205,8 @@ const Page = () => {
       });
 
       var missingDefaults = [];
-      relationshipRoles.forEach((role) => {
-        if (!cippDefaults?.find((defaultRole) => defaultRole.value === role.roleDefinitionId)) {
+      cippDefaults.forEach((defaultRole) => {
+        if (!relationshipRoles?.find((role) => defaultRole.value === role.roleDefinitionId)) {
           missingDefaults.push(role);
         }
       });