Merge branch 'dev' into dev

Signed-off-by: Jr7468 <[email protected]>

Author: Jr7468

src/components/CippIntegrations/CippApiClientManagement.jsx

@@ -78,12 +78,12 @@ const CippApiClientManagement = () => {
           multiple: false,
           creatable: false,
           label: "Select Role",
-          placeholder: "Choose a role from the Custom Role list.",
+          placeholder: "Choose a role from the CIPP Role list.",
           api: {
             url: "/api/ListCustomRole",
             queryKey: "CustomRoleList",
-            labelField: "RowKey",
-            valueField: "RowKey",
+            labelField: "RoleName",
+            valueField: "RoleName",
             showRefresh: true,
           },
         },
@@ -316,11 +316,11 @@ const CippApiClientManagement = () => {
             api: {
               url: "/api/ListCustomRole",
               queryKey: "CustomRoleList",
-              labelField: "RowKey",
-              valueField: "RowKey",
+              labelField: "RoleName",
+              valueField: "RoleName",
               showRefresh: true,
             },
-            placeholder: "Choose a role from the Custom Role list.",
+            placeholder: "Choose a role from the CIPP Role list.",
           },
           {
             type: "autoComplete",
@@ -380,12 +380,12 @@ const CippApiClientManagement = () => {
             multiple: false,
             creatable: false,
             label: "Select Role",
-            placeholder: "Choose a role from the Custom Role list.",
+            placeholder: "Choose a role from the CIPP Role list.",
             api: {
               url: "/api/ListCustomRole",
               queryKey: "CustomRoleList",
-              labelField: "RowKey",
-              valueField: "RowKey",
+              labelField: "RoleName",
+              valueField: "RoleName",
               showRefresh: true,
             },
           },

src/data/Extensions.json

@@ -81,12 +81,12 @@
       {
         "type": "autoComplete",
         "name": "Sherweb.AllowedCustomRoles",
-        "label": "Select custom roles that are allowed to purchase licenses",
+        "label": "Select CIPP roles that are allowed to purchase licenses",
         "api": {
           "url": "/api/ListCustomRole",
           "queryKey": "CustomRoles",
-          "labelField": "RowKey",
-          "valueField": "RowKey"
+          "labelField": "RoleName",
+          "valueField": "RoleName"
         },
         "multiple": true,
         "condition": {

src/data/M365Licenses.json

@@ -153,6 +153,10 @@
     "name": "HuntressRogueApps",
     "label": "Alert on Huntress Rogue Apps detected",
     "recommendedRunInterval": "4h",
-    "description": "Huntress has provided a repository of known rogue apps that are commonly used in BEC, data exfiltration and other Microsoft 365 attacks. This alert will notify you if any of these apps are detected in the selected tenant(s). For more information, see <a href='https://huntresslabs.github.io/rogueapps/' target='_blank'>https://huntresslabs.github.io/rogueapps/</a>."
+    "description": "Huntress has provided a repository of known rogue apps that are commonly used in BEC, data exfiltration and other Microsoft 365 attacks. This alert will notify you if any of these apps are detected in the selected tenant(s). For more information, see <a href='https://huntresslabs.github.io/rogueapps/' target='_blank'>https://huntresslabs.github.io/rogueapps/</a>.",
+    "requiresInput": true,
+    "inputType": "switch",
+    "inputLabel": "Ignore Disabled Apps?",
+    "inputName": "IgnoreDisabledApps"
   }
 ]

src/data/alerts.json

@@ -1651,6 +1651,38 @@
     "powershellEquivalent": "Set-OrganizationConfig -BookingsEnabled",
     "recommendedBy": []
   },
+  {
+    "name": "standards.EXODirectSend",
+    "cat": "Exchange Standards",
+    "tag": [],
+    "helpText": "Sets the state of Direct Send in Exchange Online. Direct Send allows applications to send emails directly to Exchange Online mailboxes as the tenants domains, without requiring authentication.",
+    "docsDescription": "Controls whether applications can use Direct Send to send emails directly to Exchange Online mailboxes as the tenants domains, without requiring authentication. A detailed explanation from Microsoft can be found [here.](https://learn.microsoft.com/en-us/exchange/mail-flow-best-practices/how-to-set-up-a-multifunction-device-or-application-to-send-email-using-microsoft-365-or-office-365)",
+    "addedComponent": [
+      {
+        "type": "autoComplete",
+        "multiple": false,
+        "creatable": false,
+        "label": "Select value",
+        "name": "standards.EXODirectSend.state",
+        "options": [
+          {
+            "label": "Enabled",
+            "value": "enabled"
+          },
+          {
+            "label": "Disabled",
+            "value": "disabled"
+          }
+        ]
+      }
+    ],
+    "label": "Set Direct Send state",
+    "impact": "Medium Impact",
+    "impactColour": "warning",
+    "addedDate": "2025-05-28",
+    "powershellEquivalent": "Set-OrganizationConfig -RejectDirectSend $true/$false",
+    "recommendedBy": []
+  },
   {
     "name": "standards.DisableOutlookAddins",
     "cat": "Exchange Standards",
@@ -4099,6 +4131,7 @@
   {
     "name": "standards.ExchangeConnectorTemplate",
     "label": "Exchange Connector Template",
+    "cat": "Templates",
     "disabledFeatures": {
       "report": true,
       "warn": true,

src/data/standards.json

@@ -35,6 +35,11 @@ import { useRouter } from "next/router";
 import { persistQueryClient } from "@tanstack/react-query-persist-client";
 import { createSyncStoragePersister } from "@tanstack/query-sync-storage-persister";
 
+const ReactQueryDevtoolsProduction = React.lazy(() =>
+  import("@tanstack/react-query-devtools/build/modern/production.js").then((d) => ({
+    default: d.ReactQueryDevtools,
+  }))
+);
 TimeAgo.addDefaultLocale(en);
 
 const queryClient = new QueryClient();
@@ -132,12 +137,6 @@ const App = (props) => {
     },
   ];
 
-  const ReactQueryDevtoolsProduction = React.lazy(() =>
-    import("@tanstack/react-query-devtools/build/modern/production.js").then((d) => ({
-      default: d.ReactQueryDevtools,
-    }))
-  );
-
   return (
     <CacheProvider value={emotionCache}>
       <Head>

src/pages/_app.js

@@ -30,7 +30,7 @@ const Page = () => {
   const GlobalQuarantinePolicy = ApiGetCall({
     url: "/api/ListQuarantinePolicy",
     data: { tenantFilter: currentTenant, type: "GlobalQuarantinePolicy" },
-    queryKey: "GlobalQuarantinePolicy",
+    queryKey: `GlobalQuarantinePolicy-${currentTenant}`,
   });
 
   // Get the policy data regardless of array or object
@@ -304,7 +304,7 @@ const Page = () => {
   const infoBarData = [
     {
       icon: <AccessTime />,
-      data: globalQuarantineData?.EndUserSpamNotificationFrequency,
+      data: globalQuarantineData?.EndUserSpamNotificationFrequency ?? "n/a",
       name: "Notification Frequency",
     },
     {
@@ -390,7 +390,7 @@ const Page = () => {
             Name: "Name",
             Identity: "Guid",
           },
-          relatedQueryKeys: ["GlobalQuarantinePolicy"],
+          relatedQueryKeys: [`GlobalQuarantinePolicy-${currentTenant}`],
           confirmText:
             "Are you sure you want to update Global Quarantine settings?",
         }}

src/pages/email/spamfilter/list-quarantine-policies/index.js

@@ -68,9 +68,9 @@ const AutopilotProfileForm = () => {
             type="autoComplete"
             label="Language"
             name="languages"
-            options={languageList.map(({ language, tag }) => ({
+            options={languageList.map(({ language, tag, "Geographic area": geographicArea }) => ({
               value: tag,
-              label: language,
+              label: `${language} - ${geographicArea}`, // Format as "language - geographic area" for display
             }))}
             formControl={formControl}
             multiple={false}

src/pages/endpoint/autopilot/list-profiles/add.jsx

@@ -4,7 +4,7 @@ import { useRouter } from "next/router";
 import { ApiGetCall } from "/src/api/ApiCall";
 import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton";
 import CalendarIcon from "@heroicons/react/24/outline/CalendarIcon";
-import { Check, Error, Mail, Fingerprint, Launch, Delete, Star } from "@mui/icons-material";
+import { Check, Error, Mail, Fingerprint, Launch, Delete, Star, Close } from "@mui/icons-material";
 import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout";
 import tabOptions from "./tabOptions";
 import { CippTimeAgo } from "../../../../../components/CippComponents/CippTimeAgo";
@@ -16,7 +16,7 @@ import { CippExchangeInfoCard } from "../../../../../components/CippCards/CippEx
 import { useEffect, useState } from "react";
 import CippExchangeSettingsForm from "../../../../../components/CippFormPages/CippExchangeSettingsForm";
 import { useForm } from "react-hook-form";
-import { Alert, Button, Collapse, CircularProgress, Typography } from "@mui/material";
+import { Alert, Button, Collapse, CircularProgress, Typography, TextField, Dialog, DialogTitle, DialogContent, DialogActions, IconButton } from "@mui/material";
 import { CippApiResults } from "../../../../../components/CippComponents/CippApiResults";
 import { Block, PlayArrow } from "@mui/icons-material";
 import { CippPropertyListCard } from "../../../../../components/CippCards/CippPropertyListCard";
@@ -31,6 +31,10 @@ const Page = () => {
   const [waiting, setWaiting] = useState(false);
   const [showDetails, setShowDetails] = useState(false);
   const [actionData, setActionData] = useState({ ready: false });
+  const [showAddAliasDialog, setShowAddAliasDialog] = useState(false);
+  const [newAliases, setNewAliases] = useState('');
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [submitResult, setSubmitResult] = useState(null);
   const createDialog = useDialog();
   const router = useRouter();
   const { userId } = router.query;
@@ -321,14 +325,53 @@ const Page = () => {
       relatedQueryKeys: `ListUsers-${userId}`,
     },
   ];
+  
+  const handleAddAliases = () => {
+    const aliases = newAliases
+      .split('\n')
+      .map(alias => alias.trim())
+      .filter(alias => alias);
+    if (aliases.length > 0) {
+      setIsSubmitting(true);
+      setSubmitResult(null);
+      fetch('/api/SetUserAliases', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          id: userId,
+          tenantFilter: userSettingsDefaults.currentTenant,
+          AddedAliases: aliases.join(','),
+          userPrincipalName: graphUserRequest.data?.[0]?.userPrincipalName,
+        }),
+      })
+        .then(response => response.json())
+        .then(data => {
+          setSubmitResult({ success: true, message: 'Aliases added successfully' });
+          graphUserRequest.refetch();
+          setTimeout(() => {
+            setShowAddAliasDialog(false);
+            setNewAliases('');
+            setSubmitResult(null);
+          }, 1500);
+        })
+        .catch(error => {
+          setSubmitResult({ success: false, message: 'Failed to add aliases' });
+        })
+        .finally(() => {
+          setIsSubmitting(false);
+        });
+    }
+  };
 
   const proxyAddressesCard = [
     {
       id: 1,
       cardLabelBox: {
         cardLabelBoxHeader: graphUserRequest.isFetching ? (
           <CircularProgress size="25px" color="inherit" />
-        ) : graphUserRequest.data?.[0]?.proxyAddresses?.length !== 0 ? (
+        ) : graphUserRequest.data?.[0]?.proxyAddresses?.length > 1 ? (
           <Check />
         ) : (
           <Error />
@@ -372,6 +415,19 @@ const Page = () => {
           },
         },
       },
+      children: (
+        <Box sx={{ display: 'flex', justifyContent: 'flex-end', alignItems: 'center', mb: 2, px: 2 }}>
+          <Button
+            startIcon={<Mail />}
+            onClick={() => setShowAddAliasDialog(true)}
+            variant="contained"
+            color="primary"
+            size="small"
+          >
+            Add Alias
+          </Button>
+        </Box>
+      ),
     },
   ];
 
@@ -475,6 +531,61 @@ const Page = () => {
           row={actionData.data}
         />
       )}
+      <Dialog 
+        open={showAddAliasDialog} 
+        onClose={() => setShowAddAliasDialog(false)}
+        maxWidth="sm"
+        fullWidth
+      >
+        <DialogTitle>
+          <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+            Add Proxy Addresses
+            <IconButton onClick={() => setShowAddAliasDialog(false)} size="small">
+              <Close />
+            </IconButton>
+          </Box>
+        </DialogTitle>
+        <DialogContent>
+          <Box sx={{ mt: 2 }}>
+            <TextField
+              autoFocus
+              fullWidth
+              multiline
+              rows={6}
+              value={newAliases}
+              onChange={(e) => setNewAliases(e.target.value)}
+              placeholder="One alias per line"
+              variant="outlined"
+              disabled={isSubmitting}
+            />
+            {submitResult && (
+              <Alert 
+                severity={submitResult.success ? "success" : "error"}
+                sx={{ mt: 2 }}
+              >
+                {submitResult.message}
+              </Alert>
+            )}
+          </Box>
+        </DialogContent>
+        <DialogActions sx={{ px: 3, pb: 2 }}>
+          <Button 
+            onClick={() => setShowAddAliasDialog(false)}
+            disabled={isSubmitting}
+          >
+            Cancel
+          </Button>
+          <Button 
+            onClick={handleAddAliases} 
+            variant="contained" 
+            color="primary"
+            disabled={!newAliases.trim() || isSubmitting}
+            startIcon={isSubmitting ? <CircularProgress size={20} color="inherit" /> : null}
+          >
+            {isSubmitting ? 'Adding...' : 'Add Aliases'}
+          </Button>
+        </DialogActions>
+      </Dialog>
     </HeaderedTabbedLayout>
   );
 };

src/pages/identity/administration/users/user/exchange.jsx

@@ -28,6 +28,7 @@ const TeamsAddTeamForm = () => {
       title="Add Team"
       backButtonTitle="Teams Overview"
       postUrl="/api/AddTeam"
+      resetForm={true}
       customDataformatter={(values) => {
         const shippedValues = {
           tenantID: tenantDomain,