Merge branch 'KelvinTegelaar:master' into master

lcsnetworks · Oct 13, 2023 · d2d5a50 · d2d5a50
2 parents 1834c2c + cddb852
commit d2d5a50
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Modules/CippExtensions/Private/Get-HaloToken.ps1 b/Modules/CippExtensions/Private/Get-HaloToken.ps1
@@ -11,10 +11,11 @@ function Get-HaloToken {
             client_secret = (Get-AzKeyVaultSecret -VaultName $ENV:WEBSITE_DEPLOYMENT_ID -Name 'HaloPSA' -AsPlainText)
             scope         = 'all'
         }
-        if ($Configuration.tenant) { $Tenant = "?tenant=$($Configuration.tenant)"}
+        if (![string]::IsNullOrEmpty($Configuration.tenant)) { $Tenant = "?tenant=$($Configuration.tenant)" }
         $token = Invoke-RestMethod -Uri "$($Configuration.AuthURL)/token$Tenant" -Method Post -Body $body -ContentType 'application/x-www-form-urlencoded'
         return $token
-    } else {
+    }
+    else {
         throw 'No Halo configuration'
     }
 }
diff --git a/Scheduler_CIPPNotifications/run.ps1 b/Scheduler_CIPPNotifications/run.ps1
@@ -156,7 +156,7 @@ if ($config.sendtoIntegration) {
   }
   catch {
     Write-Host "Could not send alerts to ticketing system: $($_.Exception.message)"
-    Write-LogMessage -API 'Alerts' -tenant $Tenant -message "Could not send alerts to : $($_.Exception.message)" -sev info
+    Write-LogMessage -API 'Alerts' -tenant $Tenant -message "Could not send alerts to ticketing system: $($_.Exception.message)" -sev info
   }
 }
 

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-4.4.0
+4.4.1