Merge pull request #907 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Alerts/Get-CIPPAlertInactiveGuestUsers.ps1

@@ -39,7 +39,7 @@ function Get-CIPPAlertInactiveGuestUsers {
                 "https://graph.microsoft.com/beta/users?`$select=id,UserPrincipalName,signInActivity,mail,userType,accountEnabled,assignedLicenses"
             }
 
-            $GraphRequest = New-GraphGetRequest -uri $Uri-tenantid $TenantFilter | Where-Object { $_.userType -eq 'Guest' }
+            $GraphRequest = New-GraphGetRequest -uri $Uri -tenantid $TenantFilter | Where-Object { $_.userType -eq 'Guest' }
 
             $AlertData = foreach ($user in $GraphRequest) {
                 $lastInteractive = $user.signInActivity.lastSignInDateTime

Modules/CIPPCore/Public/Alerts/Get-CIPPAlertNewRole.ps1

@@ -43,6 +43,6 @@ function Get-CIPPAlertNewRole {
             Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $AlertData
         }
     } catch {
-        Write-LogMessage -API 'Alerts' -tenant $($TenantFilter) -message "Could not get get role changes for $($TenantFilter): $(Get-NormalizedError -message $_.Exception.message)" -sev Error
+        Write-LogMessage -API 'Alerts' -tenant $($TenantFilter) -message "Could not get role changes for $($TenantFilter): $(Get-NormalizedError -message $_.Exception.message)" -sev Error
     }
 }

Modules/CIPPCore/Public/Alerts/Get-CIPPAlertStaleEntraDevices.ps1

@@ -64,7 +64,7 @@ function Get-CIPPAlertStaleEntraDevices {
                         enrollmentType        = if ($device.enrollmentType) { $device.enrollmentType } else { 'N/A' }
                         Enabled               = if ($device.accountEnabled) { $device.accountEnabled } else { 'N/A' }
                         Managed               = if ($device.isManaged) { $device.isManaged } else { 'N/A' }
-                        Complaint             = if ($device.isCompliant) { $device.isCompliant } else { 'N/A' }
+                        Compliant             = if ($device.isCompliant) { $device.isCompliant } else { 'N/A' }
                         JoinType              = $TrustType
                         lastActivity          = if ($lastActivity) { $lastActivity } else { 'N/A' }
                         DaysSinceLastActivity = if ($daysSinceLastActivity) { $daysSinceLastActivity } else { 'N/A' }
@@ -78,6 +78,6 @@ function Get-CIPPAlertStaleEntraDevices {
             Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $AlertData
         } catch {}
     } catch {
-        Write-LogMessage -API 'Alerts' -tenant $($TenantFilter) -message "Failed to check inactive guest users for $($TenantFilter): $(Get-NormalizedError -message $_.Exception.message)" -sev Error
+        Write-LogMessage -API 'Alerts' -tenant $($TenantFilter) -message "Failed to check stale Entra devices for $($TenantFilter): $(Get-NormalizedError -message $_.Exception.message)" -sev Error
     }
 }

Modules/CIPPCore/Public/Alerts/Get-CIPPAlertUnusedLicenses.ps1

@@ -33,7 +33,10 @@ function Get-CIPPAlertUnusedLicenses {
                 }
             }
         }
-        Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $AlertData
+
+        if ($AlertData) {
+            Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $AlertData
+        }
     } catch {
         Write-LogMessage -API 'Alerts' -tenant $($TenantFilter) -message "Unused Licenses Alert Error occurred: $(Get-NormalizedError -message $_.Exception.message)" -sev Error
     }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionMapping.ps1

@@ -1,7 +1,7 @@
 Function Invoke-ExecExtensionMapping {
   <#
     .FUNCTIONALITY
-        Entrypoint
+        Entrypoint,AnyTenant
     .ROLE
         CIPP.Extension.ReadWrite
     #>

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tools/Custom-Scripts/Invoke-AddCustomScript.ps1

@@ -213,7 +213,8 @@ function Invoke-AddCustomScript {
             Write-LogMessage -API $APIName -headers $Headers -message "Created custom script: $ScriptName (Version: $Version)" -sev 'Info'
 
             $Body = @{
-                Results = "Successfully created custom script '$ScriptName'"
+                Results    = "Successfully saved custom script '$ScriptName'"
+                ScriptGuid = $ScriptGuid
             }
 
             $StatusCode = [HttpStatusCode]::OK