Skip to content

Commit c9cb112

Browse files
functions that are done
1 parent 291fbf9 commit c9cb112

File tree

53 files changed

+154
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+154
-78
lines changed

Modules/CIPPCore/Public/Get-CippDbRole.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function Get-CippDbRole {
3434
'4a5d8f65-41da-4de4-8968-e035b65339cf',
3535
'75941009-915a-4869-abe7-691bff18279e'
3636
)
37-
$Roles = $Roles | Where-Object { $PrivilegedRoleTemplateIds -contains $_.templateId }
37+
$Roles = $Roles | Where-Object { $PrivilegedRoleTemplateIds -contains $_.RoletemplateId }
3838
}
3939

4040
if ($CisaHighlyPrivilegedRoles) {
@@ -46,7 +46,7 @@ function Get-CippDbRole {
4646
'966707d0-3269-4727-9be2-8c3a10f19b9d',
4747
'b0f54661-2d74-4c50-afa3-1ec803f12efe'
4848
)
49-
$Roles = $Roles | Where-Object { $CisaRoleTemplateIds -contains $_.templateId }
49+
$Roles = $Roles | Where-Object { $CisaRoleTemplateIds -contains $_.RoletemplateId }
5050
}
5151

5252
return $Roles

Modules/CIPPCore/Public/Set-CIPPDBCacheApps.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function Set-CIPPDBCacheApps {
1515
try {
1616
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching applications' -sev Info
1717

18-
$Apps = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/applications?$top=999' -tenantid $TenantFilter
18+
$Apps = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/applications?$top=999&expand=owners' -tenantid $TenantFilter
1919
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Apps' -Data $Apps
2020
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Apps' -Data $Apps -Count
2121
$Apps = $null

Modules/CIPPCore/Public/Set-CIPPDBCacheAuthenticationFlowsPolicy.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function Set-CIPPDBCacheAuthenticationFlowsPolicy {
1515
try {
1616
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching authentication flows policy' -sev Info
1717

18-
$AuthFlowPolicy = New-GraphGetRequest -uri 'https://graph.microsoft.com/v1.0/policies/authenticationFlowsPolicy' -tenantid $TenantFilter
18+
$AuthFlowPolicy = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/policies/authenticationFlowsPolicy' -tenantid $TenantFilter -AsApp $true
1919

2020
if ($AuthFlowPolicy) {
2121
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'AuthenticationFlowsPolicy' -Data @($AuthFlowPolicy)

Modules/CIPPCore/Public/Set-CIPPDBCacheB2BManagementPolicy.ps1

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ function Set-CIPPDBCacheB2BManagementPolicy {
1515
try {
1616
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching B2B management policy' -sev Info
1717

18-
$LegacyPolicies = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/policies' -tenantid $TenantFilter
19-
$B2BManagementPolicy = $LegacyPolicies | Where-Object { $_.Type -eq 'B2BManagementPolicy' }
18+
$LegacyPolicies = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/policies/b2bManagementPolicies' -tenantid $TenantFilter
19+
$B2BManagementPolicy = $LegacyPolicies
2020

2121
if ($B2BManagementPolicy) {
2222
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'B2BManagementPolicy' -Data @($B2BManagementPolicy)
@@ -26,9 +26,6 @@ function Set-CIPPDBCacheB2BManagementPolicy {
2626
}
2727

2828
} catch {
29-
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter `
30-
-message "Failed to cache B2B management policy: $($_.Exception.Message)" `
31-
-sev Warning `
32-
-LogData (Get-CippException -Exception $_)
29+
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Failed to cache B2B management policy: $($_.Exception.Message)" -sev Warning -LogData (Get-CippException -Exception $_)
3330
}
3431
}

Modules/CIPPCore/Public/Set-CIPPDBCacheDeviceRegistrationPolicy.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ function Set-CIPPDBCacheDeviceRegistrationPolicy {
1515
try {
1616
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching device registration policy' -sev Info
1717

18-
$DeviceRegistrationPolicy = New-GraphGetRequest -uri 'https://graph.microsoft.com/v1.0/policies/deviceRegistrationPolicy' -tenantid $TenantFilter
19-
18+
$DeviceRegistrationPolicy = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/policies/deviceRegistrationPolicy' -tenantid $TenantFilter
19+
2020
if ($DeviceRegistrationPolicy) {
2121
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'DeviceRegistrationPolicy' -Data @($DeviceRegistrationPolicy)
2222
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Cached device registration policy successfully' -sev Info

Modules/CIPPCore/Public/Tests/Invoke-CippTestZTNA21804.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function Invoke-CippTestZTNA21804 {
22
param($Tenant)
3-
3+
#Tested
44
try {
55
$authMethodsPolicy = New-CIPPDbRequest -TenantFilter $Tenant -Type 'AuthenticationMethodsPolicy'
66

Modules/CIPPCore/Public/Tests/Invoke-CippTestZTNA21806.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function Invoke-CippTestZTNA21806 {
22
param($Tenant)
3-
3+
#tested
44
try {
55
$allCAPolicies = New-CIPPDbRequest -TenantFilter $Tenant -Type 'ConditionalAccessPolicies'
66

Modules/CIPPCore/Public/Tests/Invoke-CippTestZTNA21807.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function Invoke-CippTestZTNA21807 {
22
param($Tenant)
3-
3+
#Tested
44
try {
55
$AuthPolicy = New-CIPPDbRequest -TenantFilter $Tenant -Type 'AuthorizationPolicy'
66

Modules/CIPPCore/Public/Tests/Invoke-CippTestZTNA21808.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function Invoke-CippTestZTNA21808 {
22
param($Tenant)
3-
3+
#Tested
44
try {
55
$CAPolicies = New-CIPPDbRequest -TenantFilter $Tenant -Type 'ConditionalAccessPolicies'
66
if (-not $CAPolicies) {

Modules/CIPPCore/Public/Tests/Invoke-CippTestZTNA21809.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function Invoke-CippTestZTNA21809 {
22
param($Tenant)
3-
3+
#Tested
44
try {
55
$result = New-CIPPDbRequest -TenantFilter $Tenant -Type 'AdminConsentRequestPolicy'
66

0 commit comments

Comments
 (0)