[pull] dev from KelvinTegelaar:dev

src/data/standards.json

@@ -855,22 +855,38 @@
             "label": "Publishing Editor - The user can create, read, edit, and delete all items in the folder, and create subfolders.",
             "value": "PublishingEditor"
           },
+          {
+            "label": "Editor - The user can create items in the folder. The contents of the folder do not appear.",
+            "value": "Editor"
+          },
+          {
+            "label": "Publishing Author.  The user can read, create all items/subfolders. Can modify and delete only items they create.",
+            "value": "PublishingAuthor"
+          },
+          {
+            "label": "Author - The user can create and read items, and modify and delete items that they create.",
+            "value": "Author"
+          },
+          {
+            "label": "Non Editing Author - The user has full read access and create items. Can can delete only own items.",
+            "value": "NonEditingAuthor"
+          },
           {
             "label": "Reviewer - The user can read all items in the folder.",
             "value": "Reviewer"
           },
           {
-            "label": "Editor - The user can create items in the folder. The contents of the folder do not appear.",
+            "label": "Contributor - The user can create items and folders.",
             "value": "Contributor"
           },
-          {
-            "label": "Limited Details - The user can view free/busy time within the calendar and the subject and location of appointments.",
-            "value": "LimitedDetails"
-          },
           {
             "label": "Availability Only - Indicates that the user can view only free/busy time within the calendar.",
             "value": "AvailabilityOnly"
           },
+          {
+            "label": "Limited Details - The user can view free/busy time within the calendar and the subject and location of appointments.",
+            "value": "LimitedDetails"
+          },
           {
             "label": "None - The user has no permissions on the folder.",
             "value": "none"
@@ -1366,6 +1382,67 @@
     "impact": "Low Impact",
     "impactColour": "info"
   },
+  {
+    "name": "standards.intuneBrandingProfile",
+    "cat": "Intune Standards",
+    "tag": ["lowimpact"],
+    "helpText": "Sets the branding profile for the Intune Company Portal app. This is a tenant wide setting and overrules any settings set on the app level.",
+    "addedComponent": [
+      {
+        "type": "input",
+        "name": "standards.intuneBrandingProfile.displayName",
+        "label": "Organization name"
+      },
+      {
+        "type": "boolean",
+        "name": "standards.intuneBrandingProfile.showLogo",
+        "label": "Show logo"
+      },
+      {
+        "type": "boolean",
+        "name": "standards.intuneBrandingProfile.showDisplayNameNextToLogo",
+        "label": "Show organization name next to logo"
+      },
+      {
+        "type": "input",
+        "name": "standards.intuneBrandingProfile.contactITName",
+        "label": "Contact IT name"
+      },
+      {
+        "type": "input",
+        "name": "standards.intuneBrandingProfile.contactITPhoneNumber",
+        "label": "Contact IT phone number"
+      },
+      {
+        "type": "input",
+        "name": "standards.intuneBrandingProfile.contactITEmailAddress",
+        "label": "Contact IT email address"
+      },
+      {
+        "type": "input",
+        "name": "standards.intuneBrandingProfile.contactITNotes",
+        "label": "Contact IT notes"
+      },
+      {
+        "type": "input",
+        "name": "standards.intuneBrandingProfile.onlineSupportSiteName",
+        "label": "Online support site name"
+      },
+      {
+        "type": "input",
+        "name": "standards.intuneBrandingProfile.onlineSupportSiteUrl",
+        "label": "Online support site URL"
+      },
+      {
+        "type": "input",
+        "name": "standards.intuneBrandingProfile.privacyUrl",
+        "label": "Privacy statement URL"
+      }
+    ],
+    "label": "Set Intune Company Portal branding profile",
+    "impact": "Low Impact",
+    "impactColour": "info"
+  },
   {
     "name": "standards.intuneDeviceReg",
     "cat": "Intune Standards",
@@ -1516,6 +1593,41 @@
     "impact": "High Impact",
     "impactColour": "danger"
   },
+  {
+    "name": "standards.sharingDomainRestriction",
+    "cat": "SharePoint Standards",
+    "tag": ["highimpact", "CIS"],
+    "helpText": "Restricts sharing to only users with the specified domain. This is useful for organizations that only want to share with their own domain.",
+    "addedComponent": [
+      {
+        "type": "Select",
+        "name": "standards.sharingDomainRestriction.Mode",
+        "label": "Limit external sharing by domains",
+        "values": [
+          {
+            "label": "Off",
+            "value": "none"
+          },
+          {
+            "label": "Restirct sharing to specific domains",
+            "value": "allowList"
+          },
+          {
+            "label": "Block sharing to specific domains",
+            "value": "blockList"
+          }
+        ]
+      },
+      {
+        "type": "input",
+        "name": "standards.sharingDomainRestriction.Domains",
+        "label": "Domains to allow/block, comma separated"
+      }
+    ],
+    "label": "Restrict sharing to a specific domain",
+    "impact": "High Impact",
+    "impactColour": "danger"
+  },
   {
     "name": "standards.TenantDefaultTimezone",
     "cat": "SharePoint Standards",

src/views/email-exchange/administration/QuarantineList.jsx

@@ -135,6 +135,17 @@ const QuarantineList = () => {
       capabilities={{ allTenants: false, helpContext: 'https://google.com' }}
       title="Quarantine Management"
       datatable={{
+        filterlist: [
+          { filterName : 'Status: Not Released', filter: '"ReleaseStatus":"NotReleased"' },
+          { filterName : 'Status: Released', filter: '"ReleaseStatus":"Released"' },
+          { filterName : 'Status: Denied', filter: '"ReleaseStatus":"Denied"' },
+          { filterName : 'Reason: High Confidence Phishing', filter: '"QuarantineTypes":"HighConfPhish"' },
+          { filterName : 'Reason: Phishing', filter: '"QuarantineTypes":"Phish"' },
+          { filterName : 'Reason: Spam', filter: '"QuarantineTypes":"Spam"' },
+          { filterName : 'Reason: Malware', filter: '"QuarantineTypes":"Malware"' },
+          { filterName : 'Reason: FileTypeBlock', filter: '"QuarantineTypes":"FileTypeBlock"' },
+          { filterName : 'Reason: Bulk', filter: '"QuarantineTypes":"Bulk"' },
+        ],
         keyField: 'id',
         reportName: `${tenant?.defaultDomainName}-Mailbox-Quarantine`,
         path: '/api/ListMailQuarantine',

src/views/identity/administration/DeployJITAdmin.jsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import { CButton, CCallout, CCol, CForm, CRow, CSpinner, CTooltip } from '@coreui/react'
 import { useSelector } from 'react-redux'
-import { Field, Form } from 'react-final-form'
+import { Field, Form, FormSpy } from 'react-final-form'
 import {
   Condition,
   RFFCFormInput,
@@ -45,6 +45,7 @@ const DeployJITAdmin = () => {
       useraction: values.useraction,
       AdminRoles: values.AdminRoles?.map((role) => role.value),
       StartDate: startTime,
+      UseTAP: values.useTap,
       EndDate: endTime,
       ExpireAction: values.expireAction.value,
       PostExecution: {
@@ -137,6 +138,23 @@ const DeployJITAdmin = () => {
                               name="UserId"
                               isLoading={usersIsFetching}
                             />
+                            <FormSpy subscription={{ values: true }}>
+                              {({ values }) => {
+                                return users.map((user, key) => {
+                                  if (
+                                    user.id === values?.UserId?.value &&
+                                    user.accountEnabled === false
+                                  ) {
+                                    return (
+                                      <CCallout color="warning" key={key} className="mt-3">
+                                        This user is currently disabled, they will automatically be
+                                        enabled when JIT is executed.
+                                      </CCallout>
+                                    )
+                                  }
+                                })
+                              }}
+                            </FormSpy>
                           </CCol>
                         </CRow>
                       </Condition>
@@ -195,6 +213,15 @@ const DeployJITAdmin = () => {
                           />
                         </CCol>
                       </CRow>
+                      <CRow className="mb-3">
+                        <CCol>
+                          <CTooltip content="Generate a Temporary Access Password for the JIT Admin account if enabled for the tenant. This applies to both New and Existing users. The start time coincides with the scheduled time.">
+                            <div>
+                              <RFFCFormSwitch name="useTap" label="Generate TAP" />
+                            </div>
+                          </CTooltip>
+                        </CCol>
+                      </CRow>
                       <CRow className="mb-3">
                         <CCol>
                           <label>Send results to</label>
@@ -258,6 +285,13 @@ const DeployJITAdmin = () => {
                     cell: cellGenericFormatter(),
                     exportSelector: 'userPrincipalName',
                   },
+                  {
+                    name: 'Account Enabled',
+                    selector: (row) => row['accountEnabled'],
+                    sortable: true,
+                    cell: cellGenericFormatter(),
+                    exportSelector: 'accountEnabled',
+                  },
                   {
                     name: 'JIT Enabled',
                     selector: (row) => row['jitAdminEnabled'],

src/views/identity/administration/EditGroup.jsx

@@ -111,7 +111,7 @@ const EditGroup = () => {
       allowExternal: values.allowExternal,
       sendCopies: values.sendCopies,
       mail: group[0].mail,
-      groupName: group[0].DisplayName,
+      groupName: group[0].displayName,
     }
     //window.alert(JSON.stringify(shippedValues))
     genericPostRequest({ path: '/api/EditGroup', values: shippedValues }).then((res) => {

src/views/identity/administration/Users.jsx

@@ -293,7 +293,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
             label: 'Revoke all user sessions',
             color: 'danger',
             modal: true,
-            modalUrl: `/api/ExecRevokeSessions?TenantFilter=${tenant.defaultDomainName}&ID=${row.id}`,
+            modalUrl: `/api/ExecRevokeSessions?TenantFilter=${tenant.defaultDomainName}&ID=${row.id}&Username=${row.userPrincipalName}`,
             modalMessage: 'Are you sure you want to revoke this users sessions?',
           },
           {

src/views/teams-share/onedrive/OneDriveList.jsx

@@ -37,7 +37,7 @@ const OneDriveList = () => {
                 TenantFilter: tenant.defaultDomainName,
                 RemovePermission: false,
               },
-              modalUrl: `/api/ExecSharePointOwner`,
+              modalUrl: `/api/ExecSharePointPerms`,
               modalDropdown: {
                 url: `/api/listUsers?TenantFilter=${tenant.defaultDomainName}`,
                 labelField: 'displayName',
@@ -55,7 +55,7 @@ const OneDriveList = () => {
                 TenantFilter: tenant.defaultDomainName,
                 RemovePermission: true,
               },
-              modalUrl: `/api/ExecSharePointOwner`,
+              modalUrl: `/api/ExecSharePointPerms`,
               modalDropdown: {
                 url: `/api/listUsers?TenantFilter=${tenant.defaultDomainName}`,
                 labelField: 'displayName',

src/views/teams-share/sharepoint/SharepointList.jsx

@@ -79,7 +79,7 @@ const SharepointList = () => {
                 RemovePermission: false,
                 URL: row.URL,
               },
-              modalUrl: `/api/ExecSharePointOwner`,
+              modalUrl: `/api/ExecSharePointPerms`,
               modalDropdown: {
                 url: `/api/listUsers?TenantFilter=${tenant.defaultDomainName}`,
                 labelField: 'displayName',
@@ -98,7 +98,7 @@ const SharepointList = () => {
                 RemovePermission: true,
                 URL: row.URL,
               },
-              modalUrl: `/api/ExecSharePointOwner`,
+              modalUrl: `/api/ExecSharePointPerms`,
               modalDropdown: {
                 url: `/api/listUsers?TenantFilter=${tenant.defaultDomainName}`,
                 labelField: 'displayName',