')
- $IntroText = "$($data.UserId) has added $($data.ObjectId) to the $(($data.ModifiedProperties | Where-Object -Property Name -EQ "Role.DisplayName").NewValue) role. The information about the role can be found in the table below.
$Table"
+ $IntroText = "$($data.UserId) has added $($data.ObjectId) to the $(($data.ModifiedProperties | Where-Object -Property Name -EQ 'Role.DisplayName').NewValue) role. The information about the role can be found in the table below.
$Table"
$ButtonUrl = "$CIPPPURL/identity/administration/roles?customerId=$($data.OrganizationId)"
- $ButtonText = "Role Management"
- $AfterButtonText = "If this role is incorrect, or you need more information, use the button to jump to the Role Management page.
"
+ $ButtonText = 'Role Management'
+ $AfterButtonText = 'If this role is incorrect, or you need more information, use the button to jump to the Role Management page.
'
}
- "Disable account." {
+ 'Disable account.' {
$Title = "$($TenantFilter) - $($data.ObjectId) has been disabled"
$IntroText = "$($data.ObjectId) has been disabled by $($data.UserId)."
$ButtonUrl = "$CIPPPURL/identity/administration/users?customerId=$($data.OrganizationId)"
- $ButtonText = "User Management"
- $AfterButtonText = "If this is incorrect, use the user management screen to unblock the users sign-in
"
+ $ButtonText = 'User Management'
+ $AfterButtonText = 'If this is incorrect, use the user management screen to unblock the users sign-in
'
}
- "Enable account." {
+ 'Enable account.' {
$Title = "$($TenantFilter) - $($data.ObjectId) has been enabled"
$IntroText = "$($data.ObjectId) has been enabled by $($data.UserId)."
$ButtonUrl = "$CIPPPURL/identity/administration/users?customerId=$($data.OrganizationId)"
- $ButtonText = "User Management"
- $AfterButtonText = "If this is incorrect, use the user management screen to unblock the users sign-in
"
+ $ButtonText = 'User Management'
+ $AfterButtonText = 'If this is incorrect, use the user management screen to unblock the users sign-in
'
}
- "Update StsRefreshTokenValidFrom Timestamp." {
+ 'Update StsRefreshTokenValidFrom Timestamp.' {
$Title = "$($TenantFilter) - $($data.ObjectId) has had all sessions revoked"
$IntroText = "$($data.ObjectId) has had their sessions revoked by $($data.UserId)."
- $ButtonUrl = "$CIPPPURL/identity/administration/users?customerId=$($data.OrganizationId)"
- $ButtonText = "User Management"
- $AfterButtonText = "If this is incorrect, use the user management screen to unblock the users sign-in
"
+ $ButtonUrl = "$CIPPPURL/identity/administration/users?customerId=$($data.OrganizationId)"
+ $ButtonText = 'User Management'
+ $AfterButtonText = 'If this is incorrect, use the user management screen to unblock the users sign-in
'
}
- "Disable Strong Authentication." {
+ 'Disable Strong Authentication.' {
$Title = "$($TenantFilter) - $($data.ObjectId) has been MFA disabled"
$IntroText = "$($data.ObjectId) MFA has been disabled by $($data.UserId)."
- $ButtonUrl = "$CIPPPURL/identity/administration/users?customerId=$($data.OrganizationId)"
- $ButtonText = "User Management"
- $AfterButtonText = "If this is incorrect, use the user management screen to reenable MFA
"
+ $ButtonUrl = "$CIPPPURL/identity/administration/users?customerId=$($data.OrganizationId)"
+ $ButtonText = 'User Management'
+ $AfterButtonText = 'If this is incorrect, use the user management screen to reenable MFA
'
}
- "Remove Member from a role." {
+ 'Remove Member from a role.' {
$Title = "$($TenantFilter) - Role change detected for $($data.ObjectId)"
$Table = ($data.ModifiedProperties | ConvertTo-Html -Fragment | Out-String).Replace('', ' ')
- $IntroText = "$($data.UserId) has removed $($data.ObjectId) to the $(($data.ModifiedProperties | Where-Object -Property Name -EQ "Role.DisplayName").NewValue) role. The information about the role can be found in the table below.
$Table"
- $ButtonUrl = "$CIPPPURL/identity/administration/roles?customerId=$($data.OrganizationId)"
- $ButtonText = "Role Management"
- $AfterButtonText = "If this role change is incorrect, or you need more information, use the button to jump to the Role Management page.
"
+ $IntroText = "$($data.UserId) has removed $($data.ObjectId) to the $(($data.ModifiedProperties | Where-Object -Property Name -EQ 'Role.DisplayName').NewValue) role. The information about the role can be found in the table below.
$Table"
+ $ButtonUrl = "$CIPPPURL/identity/administration/roles?customerId=$($data.OrganizationId)"
+ $ButtonText = 'Role Management'
+ $AfterButtonText = 'If this role change is incorrect, or you need more information, use the button to jump to the Role Management page.
'
}
- "Reset user password." {
+ 'Reset user password.' {
$Title = "$($TenantFilter) - $($data.ObjectId) has had their password reset"
$IntroText = "$($data.ObjectId) has had their password reset by $($data.userId)."
- $ButtonUrl = "$CIPPPURL/identity/administration/users?customerId=$($data.OrganizationId)"
- $ButtonText = "User Management"
- $AfterButtonText = "If this is incorrect, use the user management screen to unblock the users sign-in
"
+ $ButtonUrl = "$CIPPPURL/identity/administration/users?customerId=$($data.OrganizationId)"
+ $ButtonText = 'User Management'
+ $AfterButtonText = 'If this is incorrect, use the user management screen to unblock the users sign-in
'
}
- "AdminLoggedIn" {
+ 'AdminLoggedIn' {
$Table = ($TableObj | ConvertTo-Html -Fragment -As List | Out-String).Replace('', ' ')
if ($Appname) { $AppName = $AppName.'Application Name' } else { $appName = $data.ApplicationId }
$Title = "$($TenantFilter) - an admin account has logged on"
$IntroText = "$($data.UserId) ($($data.Userkey)) has logged on from IP $($data.ClientIP) to the application $($Appname). See the table below for more information. $Table"
$ButtonUrl = "$CIPPPURL/identity/administration/ViewBec?userId=$($data.UserKey)&tenantDomain=$($data.OrganizationId)"
- $ButtonText = "User Management"
- $AfterButtonText = "If this is incorrect, use the user management screen to block the user and revoke the sessions
"
+ $ButtonText = 'User Management'
+ $AfterButtonText = 'If this is incorrect, use the user management screen to block the user and revoke the sessions
'
}
- "UserLoggedInFromUnknownLocation" {
+ 'UserLoggedInFromUnknownLocation' {
$Table = ($TableObj | ConvertTo-Html -Fragment -As List | Out-String).Replace('', ' ')
if ($Appname) { $AppName = $AppName.'Application Name' } else { $appName = $data.ApplicationId }
$Title = "$($TenantFilter) - a user has logged on from a potentially unsafe location"
$IntroText = "$($data.UserId) ($($data.Userkey)) has logged on from IP $($data.ClientIP) to the application $($Appname). According to our database this is located in $($Country) - $($City).
You have set up alerts to be notified when this happens. See the table below for more info.$Table"
$ButtonUrl = "$CIPPPURL/identity/administration/ViewBec?userId=$($data.ObjectId)&tenantDomain=$($data.OrganizationId)"
- $ButtonText = "User Management"
- $AfterButtonText = "If this is incorrect, use the user management screen to block the user and revoke the sessions
"
+ $ButtonText = 'User Management'
+ $AfterButtonText = 'If this is incorrect, use the user management screen to block the user and revoke the sessions
'
}
+ 'Add service principal.' {
+ if ($Appname) { $AppName = $AppName.'Application Name' } else { $appName = $data.ApplicationId }
+ $Title = "$($TenantFilter) - Service Principal $($data.ObjectId) has been added."
+ $IntroText = "$($data.ObjectId) has been added by $($data.UserId)."
+ $ButtonUrl = "$CIPPPURL/tenant/administration/enterprise-apps?customerId=?customerId=$($data.OrganizationId)"
+ $ButtonText = 'Enterprise Apps'
+ }
+ 'Remove service principal.' {
+ if ($Appname) { $AppName = $AppName.'Application Name' } else { $appName = $data.ApplicationId }
+ $Title = "$($TenantFilter) - Service Principal $($data.ObjectId) has been removed."
+ $IntroText = "$($data.ObjectId) has been added by $($data.UserId)."
+ $ButtonUrl = "$CIPPPURL/tenant/administration/enterprise-apps?customerId=?customerId=$($data.OrganizationId)"
+ $ButtonText = 'Enterprise Apps'
+ }
+
default {
break
}
@@ -177,8 +191,8 @@ function Invoke-CippWebhookProcessing {
}
$HTML = "$HTML" -f $Title, $IntroText, $ButtonUrl, $ButtonText, $AfterButtonText
- Write-Host "Add IP and potential location to knownlocation db for this specific user"
-
+ Write-Host 'Add IP and potential location to knownlocation db for this specific user'
+
if ($data.ClientIP) {
$IP = $data.ClientIP
if ($IP -match '^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+$') {
@@ -202,11 +216,11 @@ function Invoke-CippWebhookProcessing {
PotentialCity = $City
} | ConvertTo-Json -Depth 15 -Compress
if ($Title) {
- Write-Host "Sending alert to email"
+ Write-Host 'Sending alert to email'
Send-CIPPAlert -Type 'email' -Title $title -HTMLContent $HTML
- Write-Host "Sending alert to webhook"
+ Write-Host 'Sending alert to webhook'
Send-CIPPAlert -Type 'webhook' -Title $title -JSONContent $JsonContent
- Write-Host "Sending alert to PSA"
+ Write-Host 'Sending alert to PSA'
Send-CIPPAlert -Type 'psa' -Title $title -HTMLContent $HTML
}
}
diff --git a/Modules/CIPPCore/Public/Send-CIPPAlert.ps1 b/Modules/CIPPCore/Public/Send-CIPPAlert.ps1
index 23a640eb4027..be9d5c706381 100644
--- a/Modules/CIPPCore/Public/Send-CIPPAlert.ps1
+++ b/Modules/CIPPCore/Public/Send-CIPPAlert.ps1
@@ -71,7 +71,7 @@ function Send-CIPPAlert {
}
catch {
Write-Host "Could not send alerts to webhook: $($_.Exception.message)"
- Write-LogMessage -API 'Webhook Alerts' -message "Could not send alerts to : $($_.Exception.message)" -sev info
+ Write-LogMessage -API 'Webhook Alerts' -message "Could not send alerts to webhook: $($_.Exception.message)" -sev info
}
}
Write-Host "Trying to send to PSA"
@@ -91,7 +91,7 @@ function Send-CIPPAlert {
}
catch {
Write-Host "Could not send alerts to ticketing system: $($_.Exception.message)"
- Write-LogMessage -API 'Webhook Alerts' -message "Could not send alerts to : $($_.Exception.message)" -sev info
+ Write-LogMessage -API 'Webhook Alerts' -message "Could not send alerts to ticketing system: $($_.Exception.message)" -sev info
}
}
}
diff --git a/Modules/CIPPCore/Public/Set-CIPPCPVConsent.ps1 b/Modules/CIPPCore/Public/Set-CIPPCPVConsent.ps1
new file mode 100644
index 000000000000..32786d5bd89d
--- /dev/null
+++ b/Modules/CIPPCore/Public/Set-CIPPCPVConsent.ps1
@@ -0,0 +1,101 @@
+function Set-CIPPCPVConsent {
+ [CmdletBinding()]
+ param(
+ $Tenantfilter,
+ $APIName = "CPV Consent",
+ $ExecutingUser
+ )
+ $Results = [System.Collections.ArrayList]@()
+ Set-Location (Get-Item $PSScriptRoot).Parent.FullName
+ $ExpectedPermissions = Get-Content '.\Cache_SAMSetup\SAMManifest.json' | ConvertFrom-Json
+ $Translator = Get-Content '.\Cache_SAMSetup\PermissionsTranslator.json' | ConvertFrom-Json
+ try {
+ $ServicePrincipalList = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals?`$select=AppId,id,displayName&`$top=999" -tenantid $Tenantfilter
+ $ourSVCPrincipal = $ServicePrincipalList | Where-Object -Property AppId -EQ $env:ApplicationID
+ }
+ catch {
+
+ }
+ if (!$ourSVCPrincipal) {
+ try {
+ $AppBody = @"
+{
+ "ApplicationGrants":[ {"EnterpriseApplicationId":"00000003-0000-0000-c000-000000000000","Scope":"Application.ReadWrite.all,DelegatedPermissionGrant.ReadWrite.All"}],
+ "ApplicationId": "ed2d757e-dbab-439c-a2d3-1567de12d31f"
+}
+"@
+ $CPVConsent = New-GraphpostRequest -body $AppBody -Type POST -noauthcheck $true -uri "https://api.partnercenter.microsoft.com/v1/customers/$($TenantFilter)/applicationconsents" -scope "https://api.partnercenter.microsoft.com/.default" -tenantid $env:TenantID
+ $Results.add("Succesfully added CPV Application")
+ $ServicePrincipalList = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals?`$select=AppId,id&`$top=999" -tenantid $Tenantfilter
+ $ourSVCPrincipal = $ServicePrincipalList | Where-Object -Property AppId -EQ $env:ApplicationID
+
+ }
+ #TODO: after doing this, write to the table that we have done this for current applicationId, so that we don't ever have to do it again when running on a schedule.
+
+ catch {
+ Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Could not add our Service Principal to the client tenant: $($_.Exception.message)" -Sev "Error" -tenant $($Tenantfilter)
+ return @("Could not add our Service Principal to the client tenant $($Tenantfilter): $($_.Exception.message)")
+ }
+
+ }
+ else {
+ $Results.add("Application Exists, adding permissions")
+ }
+ #TODO: Add this as a function so we can use it for more than just our app
+ $CurrentRoles = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals/$($ourSVCPrincipal.id)/appRoleAssignments" -tenantid $tenantfilter
+
+ $Grants = foreach ($App in $ExpectedPermissions.requiredResourceAccess) {
+ $svcPrincipalId = $ServicePrincipalList | Where-Object -Property AppId -EQ $app.resourceAppId
+ if (!$svcPrincipalId) { continue } #If the app does not exist, we can't add permissions for it. E.g. Defender etc.
+ foreach ($SingleResource in $app.ResourceAccess | Where-Object -Property Type -EQ "Role") {
+ if ($singleresource.id -In $currentroles.appRoleId) { continue }
+ [pscustomobject]@{
+ principalId = $($ourSVCPrincipal.id)
+ resourceId = $($svcPrincipalId.id)
+ appRoleId = "$($SingleResource.Id)"
+ }
+ }
+ }
+
+ foreach ($Grant in $grants) {
+ try {
+ $SettingsRequest = New-GraphPOSTRequest -body ($grant | ConvertTo-Json) -uri "https://graph.microsoft.com/beta/servicePrincipals/$($ourSVCPrincipal.id)/appRoleAssignedTo" -tenantid $tenantfilter -type POST
+ }
+ catch {
+ $Results.add("Failed to grant $($grant.appRoleId) to $($grant.resourceId): $($_.Exception.Message)")
+ }
+ }
+
+ #Adding all required Delegated permissions
+ $CurrentDelegatedScopes = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals/$($ourSVCPrincipal.id)/oauth2PermissionGrants" -tenantid $tenantfilter
+ foreach ($App in $ExpectedPermissions.requiredResourceAccess) {
+ $svcPrincipalId = $ServicePrincipalList | Where-Object -Property AppId -EQ $app.resourceAppId
+ if (!$svcPrincipalId) { continue } #If the app does not exist, we can't add permissions for it. E.g. Defender etc.
+ $NewScope = ($Translator | Where-Object { $_.id -in $app.ResourceAccess.id } | Where-Object { $_.value -notin 'profile', 'openid', 'offline_access' }).value -join ' '
+ $OldScope = ($CurrentDelegatedScopes | Where-Object -Property Resourceid -EQ $svcPrincipalId.id)
+ if (!$OldScope) {
+ $Createbody = @{
+ clientId = $ourSVCPrincipal.id
+ consentType = "AllPrincipals"
+ resourceId = $svcPrincipalId.id
+ scope = $NewScope
+ } | ConvertTo-Json -Compress
+ $CreateRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/v1.0/oauth2PermissionGrants" -tenantid $tenantfilter -body $Createbody -type POST
+ $Results.add("Succesfully added permissions for $($svcPrincipalId.displayName)")
+ }
+ else {
+ $compare = Compare-Object -ReferenceObject $OldScope.scope.Split(' ') -DifferenceObject $NewScope.Split(' ')
+ if (!$compare) {
+ $Results.add("All delegated permissions exist for $($svcPrincipalId.displayName)")
+ continue
+ }
+ $Patchbody = @{
+ scope = "$NewScope"
+ } | ConvertTo-Json -Compress
+ $Patchrequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/v1.0/oauth2PermissionGrants/$($Oldscope.id)" -tenantid $tenantfilter -body $Patchbody -type PATCH
+ $Results.add("Succesfully updated permissions for $($svcPrincipalId.displayName)")
+ }
+
+ }
+ return $Results
+}
\ No newline at end of file
diff --git a/Modules/CippEntrypoints/CippEntrypoints.psm1 b/Modules/CippEntrypoints/CippEntrypoints.psm1
index 4f11543eefa0..ffea0fd0021d 100644
--- a/Modules/CippEntrypoints/CippEntrypoints.psm1
+++ b/Modules/CippEntrypoints/CippEntrypoints.psm1
@@ -5,19 +5,7 @@ function Receive-CippHttpTrigger {
$APIName = $TriggerMetadata.FunctionName
- $FunctionVerbs = @{
- 'Get' = '^(?List.+$)'
- 'Update' = '^(?Edit.+$)'
- 'New' = '^(?Add.+$)'
- 'Invoke' = '^(?Exec.+$)'
- }
-
- foreach ($FunctionVerb in $FunctionVerbs.Keys) {
- if ($APIName -match $FunctionVerbs.$FunctionVerb) {
- $FunctionName = '{0}-{1}' -f $FunctionVerb, $Matches.APIName
- break
- }
- }
+ $FunctionName = 'Invoke-{0}' -f $APIName
$HttpTrigger = @{
Request = $Request
diff --git a/Modules/CippExtensions/CippExtensions.psd1 b/Modules/CippExtensions/CippExtensions.psd1
index 76606b0bd22a..b66d07c0b57a 100644
Binary files a/Modules/CippExtensions/CippExtensions.psd1 and b/Modules/CippExtensions/CippExtensions.psd1 differ
diff --git a/Modules/CippExtensions/Private/Get-HaloMapping.ps1 b/Modules/CippExtensions/Private/Get-HaloMapping.ps1
new file mode 100644
index 000000000000..c818c75ad9fa
--- /dev/null
+++ b/Modules/CippExtensions/Private/Get-HaloMapping.ps1
@@ -0,0 +1,42 @@
+function Get-HaloMapping {
+ [CmdletBinding()]
+ param (
+ $CIPPMapping
+ )
+ #Get available mappings
+ $Mappings = [pscustomobject]@{}
+ $Filter = "PartitionKey eq 'Mapping'"
+ Get-AzDataTableEntity @CIPPMapping -Filter $Filter | ForEach-Object {
+ $Mappings | Add-Member -NotePropertyName $_.RowKey -NotePropertyValue @{ label = "$($_.HaloPSAName)"; value = "$($_.HaloPSA)" }
+ }
+ #Get Available TEnants
+ $Tenants = Get-Tenants
+ #Get available halo clients
+ $Table = Get-CIPPTable -TableName Extensionsconfig
+ try {
+ $Configuration = ((Get-AzDataTableEntity @Table).config | ConvertFrom-Json).HaloPSA
+ $Token = Get-HaloToken -configuration $Configuration
+ $i = 1
+ $RawHaloClients = do {
+ $Result = Invoke-RestMethod -Uri "$($Configuration.ResourceURL)/Client?page_no=$i&page_size=999&pageinate=true" -ContentType 'application/json' -Method GET -Headers @{Authorization = "Bearer $($token.access_token)" }
+ $Result.clients | Select-Object * -ExcludeProperty logo
+ $i++
+ $pagecount = [Math]::Ceiling($Result.record_count / 999)
+ } while ($i -le $pagecount)
+ }
+ catch { $RawHaloClients = @() }
+ $HaloClients = $RawHaloClients | ForEach-Object {
+ [PSCustomObject]@{
+ name = $_.name
+ value = "$($_.id)"
+ }
+ }
+ $MappingObj = [PSCustomObject]@{
+ Tenants = @($Tenants)
+ HaloClients = @($HaloClients)
+ Mappings = $Mappings
+ }
+
+ return $MappingObj
+
+}
\ No newline at end of file
diff --git a/Modules/CippExtensions/Private/Set-HaloMapping.ps1 b/Modules/CippExtensions/Private/Set-HaloMapping.ps1
new file mode 100644
index 000000000000..865034fe6a29
--- /dev/null
+++ b/Modules/CippExtensions/Private/Set-HaloMapping.ps1
@@ -0,0 +1,22 @@
+function Set-HaloMapping {
+ [CmdletBinding()]
+ param (
+ $CIPPMapping,
+ $APIName,
+ $Request
+ )
+
+ foreach ($Mapping in ([pscustomobject]$Request.body.mappings).psobject.properties) {
+ $AddObject = @{
+ PartitionKey = 'Mapping'
+ RowKey = "$($mapping.name)"
+ 'HaloPSA' = "$($mapping.value.value)"
+ 'HaloPSAName' = "$($mapping.value.label)"
+ }
+ Add-AzDataTableEntity @CIPPMapping -Entity $AddObject -Force
+ Write-LogMessage -API $APINAME -user $request.headers.'x-ms-client-principal' -message "Added mapping for $($mapping.name)." -Sev 'Info'
+ }
+ $Result = [pscustomobject]@{'Results' = "Successfully edited mapping table." }
+
+ Return $Result
+}
\ No newline at end of file
diff --git a/Modules/GraphRequests/GraphRequests.psm1 b/Modules/GraphRequests/GraphRequests.psm1
index f584acc34193..12f13762d19c 100644
--- a/Modules/GraphRequests/GraphRequests.psm1
+++ b/Modules/GraphRequests/GraphRequests.psm1
@@ -1,5 +1,5 @@
-$Public = @(Get-ChildItem -Path $PSScriptRoot\Public\*.ps1 -ErrorAction SilentlyContinue)
-$Private = @(Get-ChildItem -Path $PSScriptRoot\private\*.ps1 -ErrorAction SilentlyContinue)
+$Public = @(Get-ChildItem -Path $PSScriptRoot\Public\*.ps1 -Recurse -ErrorAction SilentlyContinue)
+$Private = @(Get-ChildItem -Path $PSScriptRoot\private\*.ps1 -Recurse -ErrorAction SilentlyContinue)
$Functions = $Public + $Private
foreach ($import in @($Functions)) {
try {
diff --git a/Modules/GraphRequests/Public/Get-GraphRequestList.ps1 b/Modules/GraphRequests/Public/Core Functions/Get-GraphRequestList.ps1
similarity index 94%
rename from Modules/GraphRequests/Public/Get-GraphRequestList.ps1
rename to Modules/GraphRequests/Public/Core Functions/Get-GraphRequestList.ps1
index 85c405cd4bf3..33b0711f43ae 100644
--- a/Modules/GraphRequests/Public/Get-GraphRequestList.ps1
+++ b/Modules/GraphRequests/Public/Core Functions/Get-GraphRequestList.ps1
@@ -25,8 +25,7 @@ function Get-GraphRequestList {
if ($QueueNameOverride) {
$QueueName = $QueueNameOverride
- }
- else {
+ } else {
$TextInfo = (Get-Culture).TextInfo
$QueueName = $TextInfo.ToTitleCase($DisplayName -csplit '(?=[A-Z])' -ne '' -join ' ')
}
@@ -47,20 +46,17 @@ function Get-GraphRequestList {
$Filter = "QueueId eq '{0}'" -f $QueueId
$Rows = Get-AzDataTableEntity @Table -Filter $Filter
$Type = 'Queue'
- }
- elseif ($Tenant -eq 'AllTenants' -or (!$SkipCache.IsPresent -and !$ClearCache.IsPresent -and !$CountOnly.IsPresent)) {
+ } elseif ($Tenant -eq 'AllTenants' -or (!$SkipCache.IsPresent -and !$ClearCache.IsPresent -and !$CountOnly.IsPresent)) {
$Table = Get-CIPPTable -TableName $TableName
if ($Tenant -eq 'AllTenants') {
$Filter = "PartitionKey eq '{0}' and QueueType eq 'AllTenants'" -f $PartitionKey
- }
- else {
+ } else {
$Filter = "PartitionKey eq '{0}' and Tenant eq '{1}'" -f $PartitionKey, $Tenant
}
#Write-Host $Filter
$Rows = Get-AzDataTableEntity @Table -Filter $Filter | Where-Object { $_.Timestamp.DateTime -gt (Get-Date).ToUniversalTime().AddHours(-1) }
$Type = 'Cache'
- }
- else {
+ } else {
$Type = 'None'
$Rows = @()
}
@@ -87,16 +83,14 @@ function Get-GraphRequestList {
try {
Get-GraphRequestList @GraphRequestParams | Select-Object *, @{l = 'Tenant'; e = { $_.defaultDomainName } }, @{l = 'CippStatus'; e = { 'Good' } }
- }
- catch {
+ } catch {
[PSCustomObject]@{
Tenant = $_.defaultDomainName
CippStatus = "Could not connect to tenant. $($_.Exception.message)"
}
}
}
- }
- else {
+ } else {
if ($RunningQueue) {
Write-Host 'Queue currently running'
Write-Host ($RunningQueue | ConvertTo-Json)
@@ -104,8 +98,7 @@ function Get-GraphRequestList {
Tenant = 'Data still processing, please wait'
QueueId = $RunningQueue.RowKey
}
- }
- else {
+ } else {
$Queue = New-CippQueueEntry -Name "$QueueName (All Tenants)" -Link $CippLink -Reference $QueueReference
[PSCustomObject]@{
QueueMessage = 'Loading data for all tenants. Please check back after the job completes'
@@ -132,8 +125,7 @@ function Get-GraphRequestList {
Push-OutputBinding -Name QueueItem -Value $QueueTenant
}
- }
- catch {
+ } catch {
Write-Host "QUEUE ERROR: $($_.Exception.Message)"
}
}
@@ -162,6 +154,7 @@ function Get-GraphRequestList {
$QueueThresholdExceeded = $false
if ($Parameters.'$count' -and !$SkipCache -and !$NoPagination) {
$Count = New-GraphGetRequest @GraphRequest -CountOnly -ErrorAction Stop
+ if ($CountOnly.IsPresent) { return $Count }
Write-Host "Total results (`$count): $Count"
if ($Count -gt 8000) {
$QueueThresholdExceeded = $true
@@ -173,8 +166,7 @@ function Get-GraphRequestList {
QueueId = $RunningQueue.RowKey
Queued = $true
}
- }
- else {
+ } else {
$Queue = New-CippQueueEntry -Name $QueueName -Link $CippLink -Reference $QueueReference
$QueueTenant = @{
Tenant = $Tenant
@@ -208,20 +200,17 @@ function Get-GraphRequestList {
foreach ($Result in $GraphRequestResults) {
$Result | Select-Object @{n = 'TenantInfo'; e = { $TenantInfo | Where-Object { $Result.$ReverseTenantLookupProperty -eq $_.tenantId } } }, *
}
- }
- else {
+ } else {
$GraphRequestResults
}
}
- }
- catch {
+ } catch {
throw $_.Exception
}
}
}
- }
- else {
+ } else {
$Rows | ForEach-Object {
$_.Data | ConvertFrom-Json
}
diff --git a/Modules/GraphRequests/Public/Get-ListGraphRequest.ps1 b/Modules/GraphRequests/Public/Entrypoints/Invoke-ListGraphRequest.ps1
similarity index 98%
rename from Modules/GraphRequests/Public/Get-ListGraphRequest.ps1
rename to Modules/GraphRequests/Public/Entrypoints/Invoke-ListGraphRequest.ps1
index cfcb4eab2d08..c1ff835fc18d 100644
--- a/Modules/GraphRequests/Public/Get-ListGraphRequest.ps1
+++ b/Modules/GraphRequests/Public/Entrypoints/Invoke-ListGraphRequest.ps1
@@ -1,5 +1,5 @@
-function Get-ListGraphRequest {
+function Invoke-ListGraphRequest {
# Input bindings are passed in via param block.
param($Request, $TriggerMetadata)
diff --git a/Modules/GraphRequests/Public/Push-ListGraphRequestQueue.ps1 b/Modules/GraphRequests/Public/Entrypoints/Push-ListGraphRequestQueue.ps1
similarity index 100%
rename from Modules/GraphRequests/Public/Push-ListGraphRequestQueue.ps1
rename to Modules/GraphRequests/Public/Entrypoints/Push-ListGraphRequestQueue.ps1
diff --git a/RemoveScheduledItems/function.json b/RemoveScheduledItem/function.json
similarity index 94%
rename from RemoveScheduledItems/function.json
rename to RemoveScheduledItem/function.json
index 925eab5aeae1..b0ca1676cc0b 100644
--- a/RemoveScheduledItems/function.json
+++ b/RemoveScheduledItem/function.json
@@ -1,19 +1,19 @@
-{
- "bindings": [
- {
- "authLevel": "anonymous",
- "type": "httpTrigger",
- "direction": "in",
- "name": "Request",
- "methods": [
- "get",
- "post"
- ]
- },
- {
- "type": "http",
- "direction": "out",
- "name": "Response"
- }
- ]
+{
+ "bindings": [
+ {
+ "authLevel": "anonymous",
+ "type": "httpTrigger",
+ "direction": "in",
+ "name": "Request",
+ "methods": [
+ "get",
+ "post"
+ ]
+ },
+ {
+ "type": "http",
+ "direction": "out",
+ "name": "Response"
+ }
+ ]
}
\ No newline at end of file
diff --git a/RemoveScheduledItems/run.ps1 b/RemoveScheduledItem/run.ps1
similarity index 58%
rename from RemoveScheduledItems/run.ps1
rename to RemoveScheduledItem/run.ps1
index ce7c0a0dcd9c..191c95570b0f 100644
--- a/RemoveScheduledItems/run.ps1
+++ b/RemoveScheduledItem/run.ps1
@@ -1,11 +1,14 @@
-using namespace System.Net
-param($Request, $TriggerMetadata)
-$APIName = $TriggerMetadata.FunctionName
-Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
-$task = $Request.Body | ConvertFrom-Json
-$Table = Get-CIPPTable -TableName 'ScheduledTasks'
-Remove-AzDataTableEntity @Table -PartitionKey 'ScheduledTask' -RowKey $task.TaskID -force
-Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
- StatusCode = [HttpStatusCode]::OK
- Body = 'Task removed successfully.'
-})
\ No newline at end of file
+using namespace System.Net
+param($Request, $TriggerMetadata)
+$APIName = $TriggerMetadata.FunctionName
+Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+$task = @{
+ RowKey = $Request.Query.ID
+ PartitionKey = 'ScheduledTask'
+}
+$Table = Get-CIPPTable -TableName 'ScheduledTasks'
+Remove-AzDataTableEntity @Table -Entity $task
+Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+ StatusCode = [HttpStatusCode]::OK
+ Body = @{ Results = 'Task removed successfully.' }
+ })
\ No newline at end of file
diff --git a/Scheduler_UserTasks/_functions.json b/Scheduler_UserTasks/_functions.json
deleted file mode 100644
index a4e981dd588d..000000000000
--- a/Scheduler_UserTasks/_functions.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "bindings": [
- {
- "name": "Timer",
- "schedule": "0 */15 * * * *",
- "direction": "in",
- "type": "timerTrigger"
- },
- {
- "name": "starter",
- "type": "durableClient",
- "direction": "in"
- }
- ]
- }
\ No newline at end of file
diff --git a/Scheduler_UserTasks/function.json b/Scheduler_UserTasks/function.json
new file mode 100644
index 000000000000..de2a7380d759
--- /dev/null
+++ b/Scheduler_UserTasks/function.json
@@ -0,0 +1,16 @@
+{
+ "bindings": [
+ {
+ "name": "Timer",
+ "schedule": "0 */15 * * * *",
+ "direction": "in",
+ "type": "timerTrigger"
+ },
+ {
+ "type": "queue",
+ "direction": "out",
+ "name": "Msg",
+ "queueName": "scheduledcommandprocessor"
+ }
+ ]
+}
diff --git a/Scheduler_UserTasks/run.ps1 b/Scheduler_UserTasks/run.ps1
index 91432822b602..af9effa41337 100644
--- a/Scheduler_UserTasks/run.ps1
+++ b/Scheduler_UserTasks/run.ps1
@@ -1,44 +1,51 @@
param($Timer)
$Table = Get-CippTable -tablename 'ScheduledTasks'
-$Filter = "Results eq 'Not Executed'"
+$Filter = "TaskState eq 'Planned' or TaskState eq 'Failed - Planned'"
$tasks = Get-AzDataTableEntity @Table -Filter $Filter
-
foreach ($task in $tasks) {
- # Check if task has not been executed yet (i.e., 'Results' is 'Not Executed')
- if ((Get-Date) -ge $task.ExpectedRunTime) {
+ $tenant = $task.Tenant
+ $currentUnixTime = [int64](([datetime]::UtcNow) - (Get-Date "1/1/1970")).TotalSeconds
+ if ($currentUnixTime -ge $task.ScheduledTime) {
try {
Update-AzDataTableEntity @Table -Entity @{
PartitionKey = $task.PartitionKey
- RowKey = $task.RowKey
- TaskState = 'Running'
- # Update other properties as needed
+ RowKey = $task.RowKey
+ ExecutedTime = "$currentUnixTime"
+ TaskState = 'Running'
}
+ $task.Parameters = $task.Parameters | ConvertFrom-Json -AsHashtable
- $results = Invoke-Command -ScriptBlock ([ScriptBlock]::Create($task.Command)) -ArgumentList $task.Parameters
+ if (!$task.Parameters) { $task.Parameters = @{} }
+ $ScheduledCommand = [pscustomobject]@{
+ Command = $task.Command
+ Parameters = $task.Parameters
+ TaskInfo = $task
+ }
- Update-AzDataTableEntity @Table -Entity @{
- PartitionKey = $task.PartitionKey
- RowKey = $task.RowKey
- Results = "$results"
- TaskState = 'Completed'
- # Update other properties as needed
+ if ($task.Tenant -eq "AllTenants") {
+ $Results = Get-Tenants | ForEach-Object {
+ $ScheduledCommand.Parameters['TenantFilter'] = $_.defaultDomainName
+ Push-OutputBinding -Name Msg -Value $ScheduledCommand
+ }
+ }
+ else {
+ $ScheduledCommand.Parameters['TenantFilter'] = $task.Tenant
+ $Results = Push-OutputBinding -Name Msg -Value $ScheduledCommand
}
- Write-LogMessage -API "Scheduler_UserTasks" -tenant $tenant -message "Successfully executed task: $($task.RowKey)" -sev Info
}
catch {
$errorMessage = $_.Exception.Message
Update-AzDataTableEntity @Table -Entity @{
PartitionKey = $task.PartitionKey
- RowKey = $task.RowKey
- Results = "$errorMessage"
- TaskState = 'Failed'
- # Update other properties as needed
+ RowKey = $task.RowKey
+ Results = "$errorMessage"
+ ExecutedTime = "$currentUnixTime"
+ TaskState = 'Failed'
}
-
- Write-LogMessage -API "Scheduler_UserTasks" -tenant $tenant -message "Failed to execute task: $errorMessage" -sev Error
+ Write-LogMessage -API "Scheduler_UserTasks" -tenant $tenant -message "Failed to execute task $($task.Name): $errorMessage" -sev Error
}
}
}
\ No newline at end of file
diff --git a/version_latest.txt b/version_latest.txt
index ef8d7569d677..81911389142b 100644
--- a/version_latest.txt
+++ b/version_latest.txt
@@ -1 +1 @@
-4.2.0
\ No newline at end of file
+4.3.0
\ No newline at end of file