Skip to content

Commit 68f2a40

Browse files
kris6673kris6673
authored
Merge pull request #48 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents 183a6b8 + 78ecfdf commit 68f2a40

File tree

7 files changed

+169
-12
lines changed

7 files changed

+169
-12
lines changed

‎src/data/standards.json

Lines changed: 117 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -855,22 +855,38 @@
855855
"label": "Publishing Editor - The user can create, read, edit, and delete all items in the folder, and create subfolders.",
856856
"value": "PublishingEditor"
857857
},
858+
{
859+
"label": "Editor - The user can create items in the folder. The contents of the folder do not appear.",
860+
"value": "Editor"
861+
},
862+
{
863+
"label": "Publishing Author. The user can read, create all items/subfolders. Can modify and delete only items they create.",
864+
"value": "PublishingAuthor"
865+
},
866+
{
867+
"label": "Author - The user can create and read items, and modify and delete items that they create.",
868+
"value": "Author"
869+
},
870+
{
871+
"label": "Non Editing Author - The user has full read access and create items. Can can delete only own items.",
872+
"value": "NonEditingAuthor"
873+
},
858874
{
859875
"label": "Reviewer - The user can read all items in the folder.",
860876
"value": "Reviewer"
861877
},
862878
{
863-
"label": "Editor - The user can create items in the folder. The contents of the folder do not appear.",
879+
"label": "Contributor - The user can create items and folders.",
864880
"value": "Contributor"
865881
},
866-
{
867-
"label": "Limited Details - The user can view free/busy time within the calendar and the subject and location of appointments.",
868-
"value": "LimitedDetails"
869-
},
870882
{
871883
"label": "Availability Only - Indicates that the user can view only free/busy time within the calendar.",
872884
"value": "AvailabilityOnly"
873885
},
886+
{
887+
"label": "Limited Details - The user can view free/busy time within the calendar and the subject and location of appointments.",
888+
"value": "LimitedDetails"
889+
},
874890
{
875891
"label": "None - The user has no permissions on the folder.",
876892
"value": "none"
@@ -1366,6 +1382,67 @@
13661382
"impact": "Low Impact",
13671383
"impactColour": "info"
13681384
},
1385+
{
1386+
"name": "standards.intuneBrandingProfile",
1387+
"cat": "Intune Standards",
1388+
"tag": ["lowimpact"],
1389+
"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.",
1390+
"addedComponent": [
1391+
{
1392+
"type": "input",
1393+
"name": "standards.intuneBrandingProfile.displayName",
1394+
"label": "Organization name"
1395+
},
1396+
{
1397+
"type": "boolean",
1398+
"name": "standards.intuneBrandingProfile.showLogo",
1399+
"label": "Show logo"
1400+
},
1401+
{
1402+
"type": "boolean",
1403+
"name": "standards.intuneBrandingProfile.showDisplayNameNextToLogo",
1404+
"label": "Show organization name next to logo"
1405+
},
1406+
{
1407+
"type": "input",
1408+
"name": "standards.intuneBrandingProfile.contactITName",
1409+
"label": "Contact IT name"
1410+
},
1411+
{
1412+
"type": "input",
1413+
"name": "standards.intuneBrandingProfile.contactITPhoneNumber",
1414+
"label": "Contact IT phone number"
1415+
},
1416+
{
1417+
"type": "input",
1418+
"name": "standards.intuneBrandingProfile.contactITEmailAddress",
1419+
"label": "Contact IT email address"
1420+
},
1421+
{
1422+
"type": "input",
1423+
"name": "standards.intuneBrandingProfile.contactITNotes",
1424+
"label": "Contact IT notes"
1425+
},
1426+
{
1427+
"type": "input",
1428+
"name": "standards.intuneBrandingProfile.onlineSupportSiteName",
1429+
"label": "Online support site name"
1430+
},
1431+
{
1432+
"type": "input",
1433+
"name": "standards.intuneBrandingProfile.onlineSupportSiteUrl",
1434+
"label": "Online support site URL"
1435+
},
1436+
{
1437+
"type": "input",
1438+
"name": "standards.intuneBrandingProfile.privacyUrl",
1439+
"label": "Privacy statement URL"
1440+
}
1441+
],
1442+
"label": "Set Intune Company Portal branding profile",
1443+
"impact": "Low Impact",
1444+
"impactColour": "info"
1445+
},
13691446
{
13701447
"name": "standards.intuneDeviceReg",
13711448
"cat": "Intune Standards",
@@ -1516,6 +1593,41 @@
15161593
"impact": "High Impact",
15171594
"impactColour": "danger"
15181595
},
1596+
{
1597+
"name": "standards.sharingDomainRestriction",
1598+
"cat": "SharePoint Standards",
1599+
"tag": ["highimpact", "CIS"],
1600+
"helpText": "Restricts sharing to only users with the specified domain. This is useful for organizations that only want to share with their own domain.",
1601+
"addedComponent": [
1602+
{
1603+
"type": "Select",
1604+
"name": "standards.sharingDomainRestriction.Mode",
1605+
"label": "Limit external sharing by domains",
1606+
"values": [
1607+
{
1608+
"label": "Off",
1609+
"value": "none"
1610+
},
1611+
{
1612+
"label": "Restirct sharing to specific domains",
1613+
"value": "allowList"
1614+
},
1615+
{
1616+
"label": "Block sharing to specific domains",
1617+
"value": "blockList"
1618+
}
1619+
]
1620+
},
1621+
{
1622+
"type": "input",
1623+
"name": "standards.sharingDomainRestriction.Domains",
1624+
"label": "Domains to allow/block, comma separated"
1625+
}
1626+
],
1627+
"label": "Restrict sharing to a specific domain",
1628+
"impact": "High Impact",
1629+
"impactColour": "danger"
1630+
},
15191631
{
15201632
"name": "standards.TenantDefaultTimezone",
15211633
"cat": "SharePoint Standards",

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,17 @@ const QuarantineList = () => {
135135
capabilities={{ allTenants: false, helpContext: 'https://google.com' }}
136136
title="Quarantine Management"
137137
datatable={{
138+
filterlist: [
139+
{ filterName : 'Status: Not Released', filter: '"ReleaseStatus":"NotReleased"' },
140+
{ filterName : 'Status: Released', filter: '"ReleaseStatus":"Released"' },
141+
{ filterName : 'Status: Denied', filter: '"ReleaseStatus":"Denied"' },
142+
{ filterName : 'Reason: High Confidence Phishing', filter: '"QuarantineTypes":"HighConfPhish"' },
143+
{ filterName : 'Reason: Phishing', filter: '"QuarantineTypes":"Phish"' },
144+
{ filterName : 'Reason: Spam', filter: '"QuarantineTypes":"Spam"' },
145+
{ filterName : 'Reason: Malware', filter: '"QuarantineTypes":"Malware"' },
146+
{ filterName : 'Reason: FileTypeBlock', filter: '"QuarantineTypes":"FileTypeBlock"' },
147+
{ filterName : 'Reason: Bulk', filter: '"QuarantineTypes":"Bulk"' },
148+
],
138149
keyField: 'id',
139150
reportName: `${tenant?.defaultDomainName}-Mailbox-Quarantine`,
140151
path: '/api/ListMailQuarantine',

‎src/views/identity/administration/DeployJITAdmin.jsx

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState } from 'react'
22
import { CButton, CCallout, CCol, CForm, CRow, CSpinner, CTooltip } from '@coreui/react'
33
import { useSelector } from 'react-redux'
4-
import { Field, Form } from 'react-final-form'
4+
import { Field, Form, FormSpy } from 'react-final-form'
55
import {
66
Condition,
77
RFFCFormInput,
@@ -45,6 +45,7 @@ const DeployJITAdmin = () => {
4545
useraction: values.useraction,
4646
AdminRoles: values.AdminRoles?.map((role) => role.value),
4747
StartDate: startTime,
48+
UseTAP: values.useTap,
4849
EndDate: endTime,
4950
ExpireAction: values.expireAction.value,
5051
PostExecution: {
@@ -137,6 +138,23 @@ const DeployJITAdmin = () => {
137138
name="UserId"
138139
isLoading={usersIsFetching}
139140
/>
141+
<FormSpy subscription={{ values: true }}>
142+
{({ values }) => {
143+
return users.map((user, key) => {
144+
if (
145+
user.id === values?.UserId?.value &&
146+
user.accountEnabled === false
147+
) {
148+
return (
149+
<CCallout color="warning" key={key} className="mt-3">
150+
This user is currently disabled, they will automatically be
151+
enabled when JIT is executed.
152+
</CCallout>
153+
)
154+
}
155+
})
156+
}}
157+
</FormSpy>
140158
</CCol>
141159
</CRow>
142160
</Condition>
@@ -195,6 +213,15 @@ const DeployJITAdmin = () => {
195213
/>
196214
</CCol>
197215
</CRow>
216+
<CRow className="mb-3">
217+
<CCol>
218+
<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.">
219+
<div>
220+
<RFFCFormSwitch name="useTap" label="Generate TAP" />
221+
</div>
222+
</CTooltip>
223+
</CCol>
224+
</CRow>
198225
<CRow className="mb-3">
199226
<CCol>
200227
<label>Send results to</label>
@@ -258,6 +285,13 @@ const DeployJITAdmin = () => {
258285
cell: cellGenericFormatter(),
259286
exportSelector: 'userPrincipalName',
260287
},
288+
{
289+
name: 'Account Enabled',
290+
selector: (row) => row['accountEnabled'],
291+
sortable: true,
292+
cell: cellGenericFormatter(),
293+
exportSelector: 'accountEnabled',
294+
},
261295
{
262296
name: 'JIT Enabled',
263297
selector: (row) => row['jitAdminEnabled'],

‎src/views/identity/administration/EditGroup.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const EditGroup = () => {
111111
allowExternal: values.allowExternal,
112112
sendCopies: values.sendCopies,
113113
mail: group[0].mail,
114-
groupName: group[0].DisplayName,
114+
groupName: group[0].displayName,
115115
}
116116
//window.alert(JSON.stringify(shippedValues))
117117
genericPostRequest({ path: '/api/EditGroup', values: shippedValues }).then((res) => {

‎src/views/identity/administration/Users.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
293293
label: 'Revoke all user sessions',
294294
color: 'danger',
295295
modal: true,
296-
modalUrl: `/api/ExecRevokeSessions?TenantFilter=${tenant.defaultDomainName}&ID=${row.id}`,
296+
modalUrl: `/api/ExecRevokeSessions?TenantFilter=${tenant.defaultDomainName}&ID=${row.id}&Username=${row.userPrincipalName}`,
297297
modalMessage: 'Are you sure you want to revoke this users sessions?',
298298
},
299299
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const OneDriveList = () => {
3737
TenantFilter: tenant.defaultDomainName,
3838
RemovePermission: false,
3939
},
40-
modalUrl: `/api/ExecSharePointOwner`,
40+
modalUrl: `/api/ExecSharePointPerms`,
4141
modalDropdown: {
4242
url: `/api/listUsers?TenantFilter=${tenant.defaultDomainName}`,
4343
labelField: 'displayName',
@@ -55,7 +55,7 @@ const OneDriveList = () => {
5555
TenantFilter: tenant.defaultDomainName,
5656
RemovePermission: true,
5757
},
58-
modalUrl: `/api/ExecSharePointOwner`,
58+
modalUrl: `/api/ExecSharePointPerms`,
5959
modalDropdown: {
6060
url: `/api/listUsers?TenantFilter=${tenant.defaultDomainName}`,
6161
labelField: 'displayName',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const SharepointList = () => {
7979
RemovePermission: false,
8080
URL: row.URL,
8181
},
82-
modalUrl: `/api/ExecSharePointOwner`,
82+
modalUrl: `/api/ExecSharePointPerms`,
8383
modalDropdown: {
8484
url: `/api/listUsers?TenantFilter=${tenant.defaultDomainName}`,
8585
labelField: 'displayName',
@@ -98,7 +98,7 @@ const SharepointList = () => {
9898
RemovePermission: true,
9999
URL: row.URL,
100100
},
101-
modalUrl: `/api/ExecSharePointOwner`,
101+
modalUrl: `/api/ExecSharePointPerms`,
102102
modalDropdown: {
103103
url: `/api/listUsers?TenantFilter=${tenant.defaultDomainName}`,
104104
labelField: 'displayName',

0 commit comments

Comments
 (0)