Skip to content

Commit affc8b8

Browse files
KelvinTegelaarKelvinTegelaar
committed
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev
2 parents 362cdac + fa42620 commit affc8b8

File tree

44 files changed

+270
-156
lines changed

Some content is hidden

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

44 files changed

+270
-156
lines changed

‎Modules/CIPPCore/Public/Add-CIPPWin32LobAppContent.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ function Add-CIPPWin32LobAppContent {
138138
if ($CommitStateReq.uploadState -like '*fail*') {
139139
$errorMsg = "Commit failed. Upload state: $($CommitStateReq.uploadState)"
140140
if ($Headers) {
141-
Write-LogMessage -Headers $Headers -API $APIName -message $errorMsg -Sev 'Warning' -tenant $TenantFilter
141+
Write-LogMessage -Headers $Headers -API $APIName -message $errorMsg -sev 'Warn' -tenant $TenantFilter
142142
}
143143
throw $errorMsg
144144
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ function Push-CIPPOffboardingComplete {
1515
$TaskInfo = $Item.Parameters.TaskInfo
1616
$TenantFilter = $Item.Parameters.TenantFilter
1717
$Username = $Item.Parameters.Username
18+
$Headers = $Item.Parameters.Headers
1819
$Results = $Item.Results # Results come from orchestrator, not Parameters
1920

2021
try {
@@ -102,19 +103,19 @@ function Push-CIPPOffboardingComplete {
102103
TaskState = 'Completed'
103104
}
104105

105-
Write-LogMessage -API 'Offboarding' -tenant $TenantFilter -message "Offboarding completed successfully for $Username" -sev Info
106+
Write-LogMessage -API 'Offboarding' -tenant $TenantFilter -message "Offboarding completed successfully for $Username" -sev Info -headers $Headers
106107

107108
# Send post-execution alerts if configured
108109
if ($TaskInfo.PostExecution -and $ProcessedResults) {
109110
Send-CIPPScheduledTaskAlert -Results $ProcessedResults -TaskInfo $TaskInfo -TenantFilter $TenantFilter
110111
}
111112
}
112-
113+
Write-LogMessage -API 'Offboarding' -tenant $TenantFilter -message "Offboarding completed for $Username" -sev Info -headers $Headers
113114
return "Offboarding completed for $Username"
114115

115116
} catch {
116117
$ErrorMsg = "Failed to complete offboarding for $Username : $($_.Exception.Message)"
117-
Write-LogMessage -API 'Offboarding' -tenant $TenantFilter -message $ErrorMsg -sev Error
118+
Write-LogMessage -API 'Offboarding' -tenant $TenantFilter -message $ErrorMsg -sev Error -headers $Headers -LogData (Get-CippException -Exception $_)
118119
throw $ErrorMsg
119120
}
120121
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function Push-CIPPOffboardingTask {
1919
Write-Information "Executing offboarding cmdlet: $Cmdlet"
2020

2121
# Check if cmdlet exists
22-
$CmdletInfo = Get-Command -Name $Cmdlet -ErrorAction SilentlyContinue
22+
$CmdletInfo = Get-Command -Name $Cmdlet -Module CIPPCore -ErrorAction SilentlyContinue
2323
if (-not $CmdletInfo) {
2424
throw "Cmdlet $Cmdlet does not exist"
2525
}

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-ListScheduledItemDetails.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ function Invoke-ListScheduledItemDetails {
119119
}
120120
} catch {
121121
# If JSON parsing fails, use raw value
122-
Write-LogMessage -API $APIName -message "Error parsing Task.Results as JSON: $_" -Sev 'Warning'
122+
Write-LogMessage -API $APIName -message "Error parsing Task.Results as JSON: $_" -sev 'Warn'
123123
$ResultData = $Task.Results
124124
}
125125
} else {
@@ -155,7 +155,7 @@ function Invoke-ListScheduledItemDetails {
155155
try {
156156
$ParsedResults = $Result.Results | ConvertFrom-Json -ErrorAction Stop
157157
} catch {
158-
Write-LogMessage -API $APIName -message "Failed to parse result as JSON: $_" -Sev 'Warning'
158+
Write-LogMessage -API $APIName -message "Failed to parse result as JSON: $_" -sev 'Warn'
159159
# On failure, keep as string
160160
$ParsedResults = $Result.Results
161161
}

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecApiClient.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ function Invoke-ExecApiClient {
192192
$Body = @{ Results = "API client $ClientId not found or not a valid CIPP-API application" }
193193
}
194194
} catch {
195-
Write-LogMessage -headers $Request.Headers -API 'ExecApiClient' -message "Failed to remove app registration for $ClientId" -Sev 'Warning'
195+
Write-LogMessage -headers $Request.Headers -API 'ExecApiClient' -message "Failed to remove app registration for $ClientId" -sev 'Warn'
196196
}
197197
}
198198
default {

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecGDAPTrace.ps1‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ function Invoke-ExecAccessTest {
163163
# Filter didn't work, try direct lookup by UPN (works if UPN is unique identifier)
164164
$User = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users/$UPN" -tenantid $env:TenantID -NoAuthCheck $true
165165
} catch {
166-
Write-LogMessage -Headers $Headers -API $APIName -message "Could not find user $UPN in partner tenant: $($_.Exception.Message)" -Sev 'Warning'
166+
Write-LogMessage -Headers $Headers -API $APIName -message "Could not find user $UPN in partner tenant: $($_.Exception.Message)" -sev 'Warn'
167167
}
168168

169169
# If user not found, return error
@@ -212,7 +212,7 @@ function Invoke-ExecAccessTest {
212212
}
213213
}
214214
} catch {
215-
Write-LogMessage -Headers $Headers -API $APIName -message "Could not get user group memberships: $($_.Exception.Message)" -Sev 'Warning'
215+
Write-LogMessage -Headers $Headers -API $APIName -message "Could not get user group memberships: $($_.Exception.Message)" -sev 'Warn'
216216
}
217217

218218
# ============================================================================
@@ -296,7 +296,7 @@ function Invoke-ExecAccessTest {
296296
})
297297
}
298298
} catch {
299-
Write-LogMessage -Headers $Headers -API $APIName -message "Could not get access assignments for relationship ${RelationshipName}: $($_.Exception.Message)" -Sev 'Warning'
299+
Write-LogMessage -Headers $Headers -API $APIName -message "Could not get access assignments for relationship ${RelationshipName}: $($_.Exception.Message)" -sev 'Warn'
300300
}
301301
}
302302

@@ -346,7 +346,7 @@ function Invoke-ExecAccessTest {
346346

347347
Write-LogMessage -Headers $Headers -API $APIName -message "Fetched $($AllGroups.Count) total groups, $($GroupLookup.Count) in lookup" -Sev 'Debug'
348348
} catch {
349-
Write-LogMessage -Headers $Headers -API $APIName -message "Could not fetch all groups: $($_.Exception.Message). Will use fallback for missing groups." -Sev 'Warning'
349+
Write-LogMessage -Headers $Headers -API $APIName -message "Could not fetch all groups: $($_.Exception.Message). Will use fallback for missing groups." -sev 'Warn'
350350
}
351351

352352
# ========================================================================
@@ -387,12 +387,12 @@ function Invoke-ExecAccessTest {
387387
$GroupId = $Assignment.value.accessContainer.accessContainerId
388388
$Assignment = $Assignment.value
389389
} else {
390-
Write-LogMessage -Headers $Headers -API $APIName -message "Access assignment missing accessContainer: $($Assignment | ConvertTo-Json -Compress)" -Sev 'Warning'
390+
Write-LogMessage -Headers $Headers -API $APIName -message "Access assignment missing accessContainer: $($Assignment | ConvertTo-Json -Compress)" -sev 'Warn'
391391
continue
392392
}
393393

394394
if ([string]::IsNullOrWhiteSpace($GroupId)) {
395-
Write-LogMessage -Headers $Headers -API $APIName -message "Access assignment has empty accessContainerId: $($Assignment | ConvertTo-Json -Compress)" -Sev 'Warning'
395+
Write-LogMessage -Headers $Headers -API $APIName -message "Access assignment has empty accessContainerId: $($Assignment | ConvertTo-Json -Compress)" -sev 'Warn'
396396
continue
397397
}
398398

@@ -405,7 +405,7 @@ function Invoke-ExecAccessTest {
405405
}
406406

407407
if (-not $Roles -or $Roles.Count -eq 0) {
408-
Write-LogMessage -Headers $Headers -API $APIName -message "Access assignment for group $GroupId has no roles assigned" -Sev 'Warning'
408+
Write-LogMessage -Headers $Headers -API $APIName -message "Access assignment for group $GroupId has no roles assigned" -sev 'Warn'
409409
$Roles = @()
410410
}
411411

@@ -420,7 +420,7 @@ function Invoke-ExecAccessTest {
420420
id = $GroupId
421421
displayName = "Unknown Group ($GroupId)"
422422
}
423-
Write-LogMessage -Headers $Headers -API $APIName -message "Group $GroupId not found in lookup, using fallback" -Sev 'Warning'
423+
Write-LogMessage -Headers $Headers -API $APIName -message "Group $GroupId not found in lookup, using fallback" -sev 'Warn'
424424
}
425425

426426
# Process the assignment even if group lookup failed - we still have the group ID and roles
@@ -585,12 +585,12 @@ function Invoke-ExecAccessTest {
585585
} elseif ($Role -is [string]) {
586586
$RoleId = $Role
587587
} else {
588-
Write-LogMessage -Headers $Headers -API $APIName -message "Role object missing roleDefinitionId: $($Role | ConvertTo-Json -Compress)" -Sev 'Warning'
588+
Write-LogMessage -Headers $Headers -API $APIName -message "Role object missing roleDefinitionId: $($Role | ConvertTo-Json -Compress)" -sev 'Warn'
589589
continue
590590
}
591591

592592
if ([string]::IsNullOrWhiteSpace($RoleId)) {
593-
Write-LogMessage -Headers $Headers -API $APIName -message "Role has empty roleDefinitionId for group $GroupId" -Sev 'Warning'
593+
Write-LogMessage -Headers $Headers -API $APIName -message "Role has empty roleDefinitionId for group $GroupId" -sev 'Warn'
594594
continue
595595
}
596596

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ListCustomVariables.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ function Invoke-ListCustomVariables {
242242
}
243243
}
244244
} catch {
245-
Write-LogMessage -API $APIName -message "Could not retrieve tenant-specific variables for $TenantFilter : $($_.Exception.Message)" -Sev 'Warning'
245+
Write-LogMessage -API $APIName -message "Could not retrieve tenant-specific variables for $TenantFilter : $($_.Exception.Message)" -sev 'Warn'
246246
}
247247
}
248248

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Contacts/Invoke-DeployContactTemplates.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Function Invoke-DeployContactTemplates {
2424
if ($TenantItem.value) {
2525
$SelectedTenants.Add($TenantItem.value)
2626
} else {
27-
Write-LogMessage -headers $Headers -API $APIName -message "Tenant item missing value property: $($TenantItem | ConvertTo-Json -Compress)" -Sev 'Warning'
27+
Write-LogMessage -headers $Headers -API $APIName -message "Tenant item missing value property: $($TenantItem | ConvertTo-Json -Compress)" -sev 'Warn'
2828
}
2929
}
3030

@@ -46,7 +46,7 @@ Function Invoke-DeployContactTemplates {
4646
if ($TemplateItem.value) {
4747
$ContactTemplates.Add($TemplateItem.value)
4848
} else {
49-
Write-LogMessage -headers $Headers -API $APIName -message "Template item missing value property: $($TemplateItem | ConvertTo-Json -Compress)" -Sev 'Warning'
49+
Write-LogMessage -headers $Headers -API $APIName -message "Template item missing value property: $($TemplateItem | ConvertTo-Json -Compress)" -sev 'Warn'
5050
}
5151
}
5252
} else {
@@ -74,7 +74,7 @@ Function Invoke-DeployContactTemplates {
7474
$ContactExists = $ExistingContacts | Where-Object { $_.ExternalEmailAddress -eq $ContactTemplate.email }
7575

7676
if ($ContactExists) {
77-
Write-LogMessage -headers $Headers -API $APIName -tenant $TenantFilter -message "Contact with email '$($ContactTemplate.email)' already exists in tenant $TenantFilter" -Sev 'Warning'
77+
Write-LogMessage -headers $Headers -API $APIName -tenant $TenantFilter -message "Contact with email '$($ContactTemplate.email)' already exists in tenant $TenantFilter" -sev 'Warn'
7878
"Contact '$($ContactTemplate.displayName)' with email '$($ContactTemplate.email)' already exists in tenant $TenantFilter"
7979
continue
8080
}

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Contacts/Invoke-ListContactTemplates.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Function Invoke-ListContactTemplates {
3737
}
3838

3939
if (-not $Templates) {
40-
Write-LogMessage -headers $Headers -API $APIName -message "Template with ID $RequestedID not found" -Sev 'Warning'
40+
Write-LogMessage -headers $Headers -API $APIName -message "Template with ID $RequestedID not found" -sev 'Warn'
4141
return ([HttpResponseContext]@{
4242
StatusCode = [HttpStatusCode]::NotFound
4343
Body = @{ Error = "Template with ID $RequestedID not found" }

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ExecHVEUser.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function Invoke-ExecHVEUser {
7575
} catch {
7676
$ErrorMessage = Get-CippException -Exception $_
7777
$Message = "Failed to exclude from CA policy '$($Policy.displayName)': $($ErrorMessage.NormalizedError)"
78-
Write-LogMessage -Headers $Headers -API $APIName -tenant $Tenant -message $Message -Sev 'Warning' -LogData $ErrorMessage
78+
Write-LogMessage -Headers $Headers -API $APIName -tenant $Tenant -message $Message -sev 'Warn' -LogData $ErrorMessage
7979
$Results.Add($Message)
8080
}
8181
}
@@ -85,7 +85,7 @@ function Invoke-ExecHVEUser {
8585
} catch {
8686
$ErrorMessage = Get-CippException -Exception $_
8787
$Message = "Failed to check/update Conditional Access policies: $($ErrorMessage.NormalizedError)"
88-
Write-LogMessage -Headers $Headers -API $APIName -tenant $Tenant -message $Message -Sev 'Warning' -LogData $ErrorMessage
88+
Write-LogMessage -Headers $Headers -API $APIName -tenant $Tenant -message $Message -sev 'Warn' -LogData $ErrorMessage
8989
$Results.Add($Message)
9090
}
9191

0 commit comments

Comments
 (0)