diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1
index ddfa5a2f29eb..de573c156b7a 100644
--- a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1
+++ b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1
@@ -60,8 +60,8 @@ function Push-ExecScheduledCommand {
if ($Results) {
$TableDesign = ''
$FinalResults = if ($results -is [array] -and $results[0] -is [string]) { $Results | ConvertTo-Html -Fragment -Property @{ l = 'Text'; e = { $_ } } } else { $Results | ConvertTo-Html -Fragment }
- $HTML = $FinalResults -replace '
', "$TableDesign" | Out-String
- $title = "$TaskType - $($task.Name)"
+ $HTML = $FinalResults -replace '', "This alert is for tenant $tenant.
$TableDesign" | Out-String
+ $title = "$TaskType - $($task.Name) - $tenant"
Write-Host 'Scheduler: Sending the results to the target.'
Write-Host "The content of results is: $Results"
switch -wildcard ($task.PostExecution) {
diff --git a/Modules/CIPPCore/Public/GraphHelper/Get-Tenants.ps1 b/Modules/CIPPCore/Public/GraphHelper/Get-Tenants.ps1
index c38b5c1c59b3..77a9e22e107b 100644
--- a/Modules/CIPPCore/Public/GraphHelper/Get-Tenants.ps1
+++ b/Modules/CIPPCore/Public/GraphHelper/Get-Tenants.ps1
@@ -103,7 +103,7 @@ function Get-Tenants {
}
}
- [PSCustomObject]@{
+ $obj = [PSCustomObject]@{
PartitionKey = 'Tenants'
RowKey = $_.Name
customerId = $_.Name
@@ -111,7 +111,6 @@ function Get-Tenants {
relationshipEnd = $LatestRelationship.relationshipEnd
relationshipCount = $_.Count
defaultDomainName = $defaultDomainName
- initialDomainName = $initialDomainName
hasAutoExtend = $AutoExtend
delegatedPrivilegeStatus = 'granularDelegatedAdminPrivileges'
domains = ''
@@ -123,6 +122,10 @@ function Get-Tenants {
RequiresRefresh = [bool]$RequiresRefresh
LastRefresh = (Get-Date).ToUniversalTime()
}
+ if ($Obj.defaultDomainName -eq 'Invalid' -or !$Obj.defaultDomainName) {
+ continue
+ }
+ Add-CIPPAzDataTableEntity @TenantsTable -Entity $obj -Force | Out-Null
}
}
$IncludedTenantsCache = [system.collections.generic.list[object]]::new()
@@ -145,6 +148,7 @@ function Get-Tenants {
RequiresRefresh = [bool]$RequiresRefresh
LastRefresh = (Get-Date).ToUniversalTime()
}) | Out-Null
+
}
foreach ($Tenant in $TenantList) {
if ($Tenant.defaultDomainName -eq 'Invalid' -or !$Tenant.defaultDomainName) {
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsent.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsent.ps1
index 235feac18ab3..d62e02a3a223 100644
--- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsent.ps1
+++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsent.ps1
@@ -8,9 +8,9 @@ function Invoke-CIPPStandardOauthConsent {
$StateIsCorrect = if ($State.permissionGrantPolicyIdsAssignedToDefaultUserRole -eq 'managePermissionGrantsForSelf.cipp-consent-policy') { $true } else { $false }
If ($Settings.remediate -eq $true) {
- $AllowedAppIdsForTenant = $Settings.AllowedApps -split ','
+ $AllowedAppIdsForTenant = $settings.AllowedApps -split ','
try {
- if ($State.permissionGrantPolicyIdsAssignedToDefaultUserRole -notin @('ManagePermissionGrantsForSelf.cipp-1sent-policy')) {
+ if ($State.permissionGrantPolicyIdsAssignedToDefaultUserRole -notin @('managePermissionGrantsForSelf.cipp-consent-policy')) {
$Existing = (New-GraphGetRequest -Uri 'https://graph.microsoft.com/beta/policies/permissionGrantPolicies/' -tenantid $tenant) | Where-Object -Property id -EQ 'cipp-consent-policy'
if (!$Existing) {
New-GraphPostRequest -tenantid $tenant -Uri 'https://graph.microsoft.com/beta/policies/permissionGrantPolicies' -Type POST -Body '{ "id":"cipp-consent-policy", "displayName":"Application Consent Policy", "description":"This policy controls the current application consent policies."}' -ContentType 'application/json'
@@ -27,9 +27,7 @@ function Invoke-CIPPStandardOauthConsent {
}
New-GraphPostRequest -tenantid $tenant -Uri 'https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy' -Type PATCH -Body '{"permissionGrantPolicyIdsAssignedToDefaultUserRole":["managePermissionGrantsForSelf.cipp-consent-policy"]}' -ContentType 'application/json'
}
- if ($AllowedAppIdsForTenant) {
- }
-
+
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Application Consent Mode has been enabled.' -sev Info
} catch {
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
diff --git a/version_latest.txt b/version_latest.txt
index 3b867ccd76c3..262122f6796a 100644
--- a/version_latest.txt
+++ b/version_latest.txt
@@ -1 +1 @@
-5.7.0
\ No newline at end of file
+5.7.1
\ No newline at end of file