Skip to content

Commit f120e50

Browse files
Merge pull request #6754 from FabienTschanz/fix/permissions
Update required permissions for resources
2 parents 39a39a7 + ac0cfa5 commit f120e50

File tree

6 files changed

+28
-158
lines changed

6 files changed

+28
-158
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@
2020
due to the object depth exceeding two levels.
2121
* O365OrgSettings
2222
* Added `CertificatePath` with `CertificatePassword` as an authentication method.
23+
* TeamsChannel
24+
* Updated required permissions for read / update.
25+
* TeamsEmergencyCallRoutingPolicy
26+
* Updated required permissions for read / update.
27+
* TeamsTeam
28+
* Updated required permissions for read / update.
29+
* TeamsUser
30+
* Updated required permissions for read / update.
2331
* M365DSCDRGUtil
2432
* Fixed an issue where `Rename-M365DSCCimInstanceParameter` omitted values.
2533
FIXES [#6727](https://github.com/microsoft/Microsoft365DSC/issues/6727)

Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/settings.json

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -21,40 +21,16 @@
2121
"name": "Organization.Read.All"
2222
},
2323
{
24-
"name": "User.Read.All"
25-
},
26-
{
27-
"name": "Group.ReadWrite.All"
28-
},
29-
{
30-
"name": "AppCatalog.ReadWrite.All"
31-
},
32-
{
33-
"name": "TeamSettings.ReadWrite.All"
34-
},
35-
{
36-
"name": "Channel.Delete.All"
37-
},
24+
"name": "TeamSettings.ReadWrite.All"
25+
},
3826
{
39-
"name": "ChannelSettings.ReadWrite.All"
40-
},
41-
{
42-
"name": "ChannelMember.ReadWrite.All"
27+
"name": "ChannelSettings.Read.All"
4328
}
4429
],
4530
"update": [
4631
{
4732
"name": "Organization.Read.All"
4833
},
49-
{
50-
"name": "User.Read.All"
51-
},
52-
{
53-
"name": "Group.ReadWrite.All"
54-
},
55-
{
56-
"name": "AppCatalog.ReadWrite.All"
57-
},
5834
{
5935
"name": "TeamSettings.ReadWrite.All"
6036
},
@@ -63,9 +39,6 @@
6339
},
6440
{
6541
"name": "ChannelSettings.ReadWrite.All"
66-
},
67-
{
68-
"name": "ChannelMember.ReadWrite.All"
6942
}
7043
]
7144
}

Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/settings.json

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -19,53 +19,11 @@
1919
"read": [
2020
{
2121
"name": "Organization.Read.All"
22-
},
23-
{
24-
"name": "User.Read.All"
25-
},
26-
{
27-
"name": "Group.ReadWrite.All"
28-
},
29-
{
30-
"name": "AppCatalog.ReadWrite.All"
31-
},
32-
{
33-
"name": "TeamSettings.ReadWrite.All"
34-
},
35-
{
36-
"name": "Channel.Delete.All"
37-
},
38-
{
39-
"name": "ChannelSettings.ReadWrite.All"
40-
},
41-
{
42-
"name": "ChannelMember.ReadWrite.All"
4322
}
4423
],
4524
"update": [
4625
{
4726
"name": "Organization.Read.All"
48-
},
49-
{
50-
"name": "User.Read.All"
51-
},
52-
{
53-
"name": "Group.ReadWrite.All"
54-
},
55-
{
56-
"name": "AppCatalog.ReadWrite.All"
57-
},
58-
{
59-
"name": "TeamSettings.ReadWrite.All"
60-
},
61-
{
62-
"name": "Channel.Delete.All"
63-
},
64-
{
65-
"name": "ChannelSettings.ReadWrite.All"
66-
},
67-
{
68-
"name": "ChannelMember.ReadWrite.All"
6927
}
7028
]
7129
}

Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/settings.json

Lines changed: 7 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
"resourceName": "TeamsTeam",
33
"description": "",
44
"roles": {
5-
"read": [],
6-
"update": []
5+
"read": [
6+
"Global Reader"
7+
],
8+
"update": [
9+
"Teams Administrator"
10+
]
711
},
812
"permissions": {
913
"graph": {
@@ -15,53 +19,11 @@
1519
"read": [
1620
{
1721
"name": "Organization.Read.All"
18-
},
19-
{
20-
"name": "User.Read.All"
21-
},
22-
{
23-
"name": "Group.ReadWrite.All"
24-
},
25-
{
26-
"name": "AppCatalog.ReadWrite.All"
27-
},
28-
{
29-
"name": "TeamSettings.ReadWrite.All"
30-
},
31-
{
32-
"name": "Channel.Delete.All"
33-
},
34-
{
35-
"name": "ChannelSettings.ReadWrite.All"
36-
},
37-
{
38-
"name": "ChannelMember.ReadWrite.All"
3922
}
4023
],
4124
"update": [
4225
{
4326
"name": "Organization.Read.All"
44-
},
45-
{
46-
"name": "User.Read.All"
47-
},
48-
{
49-
"name": "Group.ReadWrite.All"
50-
},
51-
{
52-
"name": "AppCatalog.ReadWrite.All"
53-
},
54-
{
55-
"name": "TeamSettings.ReadWrite.All"
56-
},
57-
{
58-
"name": "Channel.Delete.All"
59-
},
60-
{
61-
"name": "ChannelSettings.ReadWrite.All"
62-
},
63-
{
64-
"name": "ChannelMember.ReadWrite.All"
6527
}
6628
]
6729
}
@@ -93,4 +55,4 @@
9355
]
9456
}
9557
]
96-
}
58+
}

Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/settings.json

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
"resourceName": "TeamsUser",
33
"description": "",
44
"roles": {
5-
"read": [],
6-
"update": []
5+
"read": [
6+
"Global Reader"
7+
],
8+
"update": [
9+
"Teams Administrator"
10+
]
711
},
812
"permissions": {
913
"graph": {
@@ -17,51 +21,15 @@
1721
"name": "Organization.Read.All"
1822
},
1923
{
20-
"name": "User.Read.All"
21-
},
22-
{
23-
"name": "Group.ReadWrite.All"
24-
},
25-
{
26-
"name": "AppCatalog.ReadWrite.All"
27-
},
28-
{
29-
"name": "TeamSettings.ReadWrite.All"
30-
},
31-
{
32-
"name": "Channel.Delete.All"
33-
},
34-
{
35-
"name": "ChannelSettings.ReadWrite.All"
36-
},
37-
{
38-
"name": "ChannelMember.ReadWrite.All"
24+
"name": "Team.ReadBasic.All"
3925
}
4026
],
4127
"update": [
4228
{
4329
"name": "Organization.Read.All"
4430
},
4531
{
46-
"name": "User.Read.All"
47-
},
48-
{
49-
"name": "Group.ReadWrite.All"
50-
},
51-
{
52-
"name": "AppCatalog.ReadWrite.All"
53-
},
54-
{
55-
"name": "TeamSettings.ReadWrite.All"
56-
},
57-
{
58-
"name": "Channel.Delete.All"
59-
},
60-
{
61-
"name": "ChannelSettings.ReadWrite.All"
62-
},
63-
{
64-
"name": "ChannelMember.ReadWrite.All"
32+
"name": "Team.ReadBasic.All"
6533
}
6634
]
6735
}

Tests/QA/Microsoft365DSC.SettingsJson.Tests.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ Describe -Name 'Successfully validate all used permissions in Settings.json file
6262
'TeamSettings.ReadWrite.All',
6363
'Channel.Delete.All',
6464
'ChannelSettings.ReadWrite.All',
65-
'ChannelMember.ReadWrite.All'
65+
'ChannelMember.ReadWrite.All',
66+
'Team.ReadBasic.All'
6667
)
6768
}
6869

0 commit comments

Comments
 (0)