Merge pull request #1261 from kris6673/kris6673-patch-1

FIX: App approval alert only triggering if there is 2 pending and othermails null'ing
KelvinTegelaar · Jan 25, 2025 · 06c92f1 · 06c92f1
2 parents cedb963 + d63346c
commit 06c92f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertNewAppApproval.ps1 b/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertNewAppApproval.ps1
@@ -13,7 +13,7 @@ function Get-CIPPAlertNewAppApproval {
     )
     try {
         $Approvals = New-GraphGetRequest -Uri "https://graph.microsoft.com/v1.0/identityGovernance/appConsent/appConsentRequests?`$filter=userConsentRequests/any (u:u/status eq 'InProgress')" -tenantid $TenantFilter
-        if ($Approvals.count -gt 1) {
+        if ($Approvals.count -gt 0) {
             $AlertData = "There are $($Approvals.count) App Approval(s) pending."
             Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $AlertData
         }

diff --git a/...PCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-EditUser.ps1 b/...PCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-EditUser.ps1
@@ -51,7 +51,7 @@ Function Invoke-EditUser {
             'streetAddress'     = $UserObj.streetAddress
             'postalCode'        = $UserObj.PostalCode
             'companyName'       = $UserObj.CompanyName
-            'otherMails'        = @($UserObj.otherMails)
+            'otherMails'        = $UserObj.otherMails ? @($UserObj.otherMails) : @()
             'passwordProfile'   = @{
                 'forceChangePasswordNextSignIn' = [bool]$UserObj.MustChangePass
             }