Skip to content

Commit 9c53cf7

Browse files
pull[bot]pull[bot]
authored
Merge pull request #646 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents 1e4a2f9 + 291fbf9 commit 9c53cf7

33 files changed

+726
-50
lines changed

‎Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-CIPPDBCacheData.ps1‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,186 +18,232 @@ function Push-CIPPDBCacheData {
1818
try {
1919
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Starting database cache collection for tenant' -sev Info
2020

21+
Write-Host 'Getting cache for Users'
2122
try { Set-CIPPDBCacheUsers -TenantFilter $TenantFilter } catch {
2223
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Users collection failed: $($_.Exception.Message)" -sev Error
2324
}
2425

26+
Write-Host 'Getting cache for Groups'
2527
try { Set-CIPPDBCacheGroups -TenantFilter $TenantFilter } catch {
2628
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Groups collection failed: $($_.Exception.Message)" -sev Error
2729
}
2830

31+
Write-Host 'Getting cache for Guests'
2932
try { Set-CIPPDBCacheGuests -TenantFilter $TenantFilter } catch {
3033
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Guests collection failed: $($_.Exception.Message)" -sev Error
3134
}
3235

36+
Write-Host 'Getting cache for ServicePrincipals'
3337
try { Set-CIPPDBCacheServicePrincipals -TenantFilter $TenantFilter } catch {
3438
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ServicePrincipals collection failed: $($_.Exception.Message)" -sev Error
3539
}
3640

41+
Write-Host 'Getting cache for Apps'
3742
try { Set-CIPPDBCacheApps -TenantFilter $TenantFilter } catch {
3843
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Apps collection failed: $($_.Exception.Message)" -sev Error
3944
}
4045

46+
Write-Host 'Getting cache for Devices'
4147
try { Set-CIPPDBCacheDevices -TenantFilter $TenantFilter } catch {
4248
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Devices collection failed: $($_.Exception.Message)" -sev Error
4349
}
4450

51+
Write-Host 'Getting cache for ManagedDevices'
4552
try { Set-CIPPDBCacheManagedDevices -TenantFilter $TenantFilter } catch {
4653
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ManagedDevices collection failed: $($_.Exception.Message)" -sev Error
4754
}
4855

56+
Write-Host 'Getting cache for Organization'
4957
try { Set-CIPPDBCacheOrganization -TenantFilter $TenantFilter } catch {
5058
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Organization collection failed: $($_.Exception.Message)" -sev Error
5159
}
5260

61+
Write-Host 'Getting cache for Roles'
5362
try { Set-CIPPDBCacheRoles -TenantFilter $TenantFilter } catch {
5463
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Roles collection failed: $($_.Exception.Message)" -sev Error
5564
}
5665

66+
Write-Host 'Getting cache for AdminConsentRequestPolicy'
5767
try { Set-CIPPDBCacheAdminConsentRequestPolicy -TenantFilter $TenantFilter } catch {
5868
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "AdminConsentRequestPolicy collection failed: $($_.Exception.Message)" -sev Error
5969
}
6070

71+
Write-Host 'Getting cache for AuthorizationPolicy'
6172
try { Set-CIPPDBCacheAuthorizationPolicy -TenantFilter $TenantFilter } catch {
6273
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "AuthorizationPolicy collection failed: $($_.Exception.Message)" -sev Error
6374
}
6475

76+
Write-Host 'Getting cache for AuthenticationMethodsPolicy'
6577
try { Set-CIPPDBCacheAuthenticationMethodsPolicy -TenantFilter $TenantFilter } catch {
6678
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "AuthenticationMethodsPolicy collection failed: $($_.Exception.Message)" -sev Error
6779
}
6880

81+
Write-Host 'Getting cache for DeviceSettings'
6982
try { Set-CIPPDBCacheDeviceSettings -TenantFilter $TenantFilter } catch {
7083
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "DeviceSettings collection failed: $($_.Exception.Message)" -sev Error
7184
}
7285

86+
Write-Host 'Getting cache for DirectoryRecommendations'
7387
try { Set-CIPPDBCacheDirectoryRecommendations -TenantFilter $TenantFilter } catch {
7488
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "DirectoryRecommendations collection failed: $($_.Exception.Message)" -sev Error
7589
}
7690

91+
Write-Host 'Getting cache for CrossTenantAccessPolicy'
7792
try { Set-CIPPDBCacheCrossTenantAccessPolicy -TenantFilter $TenantFilter } catch {
7893
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "CrossTenantAccessPolicy collection failed: $($_.Exception.Message)" -sev Error
7994
}
8095

96+
Write-Host 'Getting cache for DefaultAppManagementPolicy'
8197
try { Set-CIPPDBCacheDefaultAppManagementPolicy -TenantFilter $TenantFilter } catch {
8298
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "DefaultAppManagementPolicy collection failed: $($_.Exception.Message)" -sev Error
8399
}
84100

101+
Write-Host 'Getting cache for Settings'
85102
try { Set-CIPPDBCacheSettings -TenantFilter $TenantFilter } catch {
86103
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Settings collection failed: $($_.Exception.Message)" -sev Error
87104
}
88105

106+
Write-Host 'Getting cache for SecureScore'
89107
try { Set-CIPPDBCacheSecureScore -TenantFilter $TenantFilter } catch {
90108
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "SecureScore collection failed: $($_.Exception.Message)" -sev Error
91109
}
92110

111+
Write-Host 'Getting cache for IntunePolicies'
93112
try { Set-CIPPDBCacheIntunePolicies -TenantFilter $TenantFilter } catch {
94113
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "IntunePolicies collection failed: $($_.Exception.Message)" -sev Error
95114
}
96115

116+
Write-Host 'Getting cache for ConditionalAccessPolicies'
97117
try { Set-CIPPDBCacheConditionalAccessPolicies -TenantFilter $TenantFilter } catch {
98118
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ConditionalAccessPolicies collection failed: $($_.Exception.Message)" -sev Error
99119
}
100120

121+
Write-Host 'Getting cache for PIMSettings'
101122
try { Set-CIPPDBCachePIMSettings -TenantFilter $TenantFilter } catch {
102123
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "PIMSettings collection failed: $($_.Exception.Message)" -sev Error
103124
}
104125

126+
Write-Host 'Getting cache for Domains'
105127
try { Set-CIPPDBCacheDomains -TenantFilter $TenantFilter } catch {
106128
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Domains collection failed: $($_.Exception.Message)" -sev Error
107129
}
108130

131+
Write-Host 'Getting cache for RoleEligibilitySchedules'
109132
try { Set-CIPPDBCacheRoleEligibilitySchedules -TenantFilter $TenantFilter } catch {
110133
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "RoleEligibilitySchedules collection failed: $($_.Exception.Message)" -sev Error
111134
}
112135

136+
Write-Host 'Getting cache for RoleManagementPolicies'
113137
try { Set-CIPPDBCacheRoleManagementPolicies -TenantFilter $TenantFilter } catch {
114138
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "RoleManagementPolicies collection failed: $($_.Exception.Message)" -sev Error
115139
}
116140

141+
Write-Host 'Getting cache for RoleAssignmentScheduleInstances'
117142
try { Set-CIPPDBCacheRoleAssignmentScheduleInstances -TenantFilter $TenantFilter } catch {
118143
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "RoleAssignmentScheduleInstances collection failed: $($_.Exception.Message)" -sev Error
119144
}
120145

146+
Write-Host 'Getting cache for B2BManagementPolicy'
121147
try { Set-CIPPDBCacheB2BManagementPolicy -TenantFilter $TenantFilter } catch {
122148
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "B2BManagementPolicy collection failed: $($_.Exception.Message)" -sev Error
123149
}
124150

151+
Write-Host 'Getting cache for AuthenticationFlowsPolicy'
125152
try { Set-CIPPDBCacheAuthenticationFlowsPolicy -TenantFilter $TenantFilter } catch {
126153
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "AuthenticationFlowsPolicy collection failed: $($_.Exception.Message)" -sev Error
127154
}
128155

156+
Write-Host 'Getting cache for RiskyUsers'
129157
try { Set-CIPPDBCacheRiskyUsers -TenantFilter $TenantFilter } catch {
130158
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "RiskyUsers collection failed: $($_.Exception.Message)" -sev Error
131159
}
132160

161+
Write-Host 'Getting cache for RiskyServicePrincipals'
133162
try { Set-CIPPDBCacheRiskyServicePrincipals -TenantFilter $TenantFilter } catch {
134163
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "RiskyServicePrincipals collection failed: $($_.Exception.Message)" -sev Error
135164
}
136165

166+
Write-Host 'Getting cache for ServicePrincipalRiskDetections'
137167
try { Set-CIPPDBCacheServicePrincipalRiskDetections -TenantFilter $TenantFilter } catch {
138168
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ServicePrincipalRiskDetections collection failed: $($_.Exception.Message)" -sev Error
139169
}
140170

171+
Write-Host 'Getting cache for RiskDetections'
141172
try { Set-CIPPDBCacheRiskDetections -TenantFilter $TenantFilter } catch {
142173
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "RiskDetections collection failed: $($_.Exception.Message)" -sev Error
143174
}
144175

176+
Write-Host 'Getting cache for DeviceRegistrationPolicy'
145177
try { Set-CIPPDBCacheDeviceRegistrationPolicy -TenantFilter $TenantFilter } catch {
146178
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "DeviceRegistrationPolicy collection failed: $($_.Exception.Message)" -sev Error
147179
}
148180

181+
Write-Host 'Getting cache for CredentialUserRegistrationDetails'
149182
try { Set-CIPPDBCacheCredentialUserRegistrationDetails -TenantFilter $TenantFilter } catch {
150183
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "CredentialUserRegistrationDetails collection failed: $($_.Exception.Message)" -sev Error
151184
}
152185

186+
Write-Host 'Getting cache for UserRegistrationDetails'
153187
try { Set-CIPPDBCacheUserRegistrationDetails -TenantFilter $TenantFilter } catch {
154188
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "UserRegistrationDetails collection failed: $($_.Exception.Message)" -sev Error
155189
}
156190

191+
Write-Host 'Getting cache for ManagedDeviceEncryptionStates'
157192
try { Set-CIPPDBCacheManagedDeviceEncryptionStates -TenantFilter $TenantFilter } catch {
158193
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ManagedDeviceEncryptionStates collection failed: $($_.Exception.Message)" -sev Error
159194
}
160195

196+
Write-Host 'Getting cache for OAuth2PermissionGrants'
161197
try { Set-CIPPDBCacheOAuth2PermissionGrants -TenantFilter $TenantFilter } catch {
162198
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "OAuth2PermissionGrants collection failed: $($_.Exception.Message)" -sev Error
163199
}
164200

201+
Write-Host 'Getting cache for AppRoleAssignments'
165202
try { Set-CIPPDBCacheAppRoleAssignments -TenantFilter $TenantFilter } catch {
166203
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "AppRoleAssignments collection failed: $($_.Exception.Message)" -sev Error
167204
}
168205

206+
Write-Host 'Getting cache for ExoAntiPhishPolicies'
169207
try { Set-CIPPDBCacheExoAntiPhishPolicies -TenantFilter $TenantFilter } catch {
170208
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ExoAntiPhishPolicies collection failed: $($_.Exception.Message)" -sev Error
171209
}
172210

211+
Write-Host 'Getting cache for ExoMalwareFilterPolicies'
173212
try { Set-CIPPDBCacheExoMalwareFilterPolicies -TenantFilter $TenantFilter } catch {
174213
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ExoMalwareFilterPolicies collection failed: $($_.Exception.Message)" -sev Error
175214
}
176215

216+
Write-Host 'Getting cache for ExoSafeLinksPolicies'
177217
try { Set-CIPPDBCacheExoSafeLinksPolicies -TenantFilter $TenantFilter } catch {
178218
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ExoSafeLinksPolicies collection failed: $($_.Exception.Message)" -sev Error
179219
}
180220

221+
Write-Host 'Getting cache for ExoSafeAttachmentPolicies'
181222
try { Set-CIPPDBCacheExoSafeAttachmentPolicies -TenantFilter $TenantFilter } catch {
182223
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ExoSafeAttachmentPolicies collection failed: $($_.Exception.Message)" -sev Error
183224
}
184225

226+
Write-Host 'Getting cache for ExoTransportRules'
185227
try { Set-CIPPDBCacheExoTransportRules -TenantFilter $TenantFilter } catch {
186228
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ExoTransportRules collection failed: $($_.Exception.Message)" -sev Error
187229
}
188230

231+
Write-Host 'Getting cache for ExoDkimSigningConfig'
189232
try { Set-CIPPDBCacheExoDkimSigningConfig -TenantFilter $TenantFilter } catch {
190233
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ExoDkimSigningConfig collection failed: $($_.Exception.Message)" -sev Error
191234
}
192235

236+
Write-Host 'Getting cache for ExoOrganizationConfig'
193237
try { Set-CIPPDBCacheExoOrganizationConfig -TenantFilter $TenantFilter } catch {
194238
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ExoOrganizationConfig collection failed: $($_.Exception.Message)" -sev Error
195239
}
196240

241+
Write-Host 'Getting cache for ExoAcceptedDomains'
197242
try { Set-CIPPDBCacheExoAcceptedDomains -TenantFilter $TenantFilter } catch {
198243
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ExoAcceptedDomains collection failed: $($_.Exception.Message)" -sev Error
199244
}
200245

246+
Write-Host 'Getting cache for IntuneAppProtectionPolicies'
201247
try { Set-CIPPDBCacheIntuneAppProtectionPolicies -TenantFilter $TenantFilter } catch {
202248
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "IntuneAppProtectionPolicies collection failed: $($_.Exception.Message)" -sev Error
203249
}

‎Modules/CIPPCore/Public/Set-CIPPDBCacheAppRoleAssignments.ps1‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ function Set-CIPPDBCacheAppRoleAssignments {
1616
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching app role assignments' -sev Info
1717

1818
# Get all service principals first
19-
$ServicePrincipals = New-GraphGetRequest -uri 'https://graph.microsoft.com/v1.0/servicePrincipals?$select=id,appId,displayName&$top=999' -tenantid $TenantFilter
19+
$ServicePrincipals = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/servicePrincipals?$select=id,appId,displayName&$top=999&expand=appRoleAssignments' -tenantid $TenantFilter
2020

2121
$AllAppRoleAssignments = [System.Collections.Generic.List[object]]::new()
2222

2323
foreach ($SP in $ServicePrincipals) {
2424
try {
25-
$AppRoleAssignments = New-GraphGetRequest -uri "https://graph.microsoft.com/v1.0/servicePrincipals/$($SP.id)/appRoleAssignments?`$top=999" -tenantid $TenantFilter
26-
25+
$AppRoleAssignments = $SP.appRoleAssignments
2726
foreach ($Assignment in $AppRoleAssignments) {
2827
# Enrich with service principal info
2928
$Assignment | Add-Member -NotePropertyName 'servicePrincipalDisplayName' -NotePropertyValue $SP.displayName -Force

‎Modules/CIPPCore/Public/Set-CIPPDBCacheConditionalAccessPolicies.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function Set-CIPPDBCacheConditionalAccessPolicies {
4848
}
4949

5050
try {
51-
$AuthStrengths = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/identity/conditionalAccess/authenticationStrength/policies?$top=999' -tenantid $TenantFilter
51+
$AuthStrengths = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/identity/conditionalAccess/authenticationStrength/policies' -tenantid $TenantFilter
5252

5353
if ($AuthStrengths) {
5454
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'AuthenticationStrengths' -Data $AuthStrengths

0 commit comments

Comments
 (0)