Merge pull request #115 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecSetCIPPAutoBackup.ps1

@@ -15,7 +15,7 @@ Function Invoke-ExecSetCIPPAutoBackup {
     Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
     $unixtime = [int64](([datetime]::UtcNow) - (Get-Date '1/1/1970')).TotalSeconds
-    if ($Request.Body.Enabled -eq 'True') {
+    if ($Request.Body.Enabled -eq $true) {
         $Table = Get-CIPPTable -TableName 'ScheduledTasks'
         $AutomatedCIPPBackupTask = Get-AzDataTableEntity @table -Filter "Name eq 'Automated CIPP Backup'"
         $task = @{

Modules/CIPPCore/Public/Entrypoints/Invoke-ListCSPsku.ps1

@@ -14,13 +14,19 @@ Function Invoke-ListCSPsku {
     Write-LogMessage -headers $Request.Headers -API $APINAME -message 'Accessed this API' -Sev 'Debug'
     $TenantFilter = $Request.Query.tenantFilter
 
-    if ($Request.Query.currentSkuOnly) {
-        $GraphRequest = Get-SherwebCurrentSubscription -TenantFilter $TenantFilter
-    } else {
-        $GraphRequest = Get-SherwebCatalog -TenantFilter $TenantFilter
+    try {
+        if ($Request.Query.currentSkuOnly) {
+            $GraphRequest = Get-SherwebCurrentSubscription -TenantFilter $TenantFilter
+        } else {
+            $GraphRequest = Get-SherwebCatalog -TenantFilter $TenantFilter
+        }
+    } catch {
+        $GraphRequest = [PSCustomObject]@{
+            name = @(@{value = 'Error getting catalog' })
+            sku  = $_.Exception.Message
+        }
     }
 
-
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
             Body       = @($GraphRequest)

Modules/CIPPCore/Public/GraphHelper/New-ExoRequest.ps1

@@ -31,7 +31,7 @@ function New-ExoRequest {
         [Parameter(ParameterSetName = 'AvailableCmdlets')]
         [switch]$AvailableCmdlets,
 
-        $ModuleVersion = '3.5.1',
+        $ModuleVersion = '3.7.1',
         [switch]$AsApp
     )
     if ((Get-AuthorisedRequest -TenantID $tenantid) -or $NoAuthCheck -eq $True) {

Modules/CIPPCore/Public/Webhooks/Invoke-CIPPWebhookProcessing.ps1

@@ -85,7 +85,7 @@ function Invoke-CippWebhookProcessing {
     }
     $LogId = Send-CIPPAlert @CIPPAlert
 
-    $AuditLogLink = '{0}/tenant/administration/audit-logs/log?logId={2}' -f $CIPPURL, $LogId
+    $AuditLogLink = '{0}/tenant/administration/audit-logs/log?logId={1}&tenantFilter={2}' -f $CIPPURL, $LogId, $Tenant.defaultDomainName
     $GenerateEmail = New-CIPPAlertTemplate -format 'html' -data $Data -ActionResults $ActionResults -CIPPURL $CIPPURL -Tenant $Tenant.defaultDomainName -AuditLogLink $AuditLogLink
 
     Write-Host 'Going to create the content'

Modules/CippExtensions/Public/Sherweb/Get-SherwebCatalog.ps1

@@ -4,13 +4,18 @@ function Get-SherwebCatalog {
         [string]$CustomerId,
         [string]$TenantFilter
     )
+
     if ($TenantFilter) {
-        Get-ExtensionMapping -Extension 'Sherweb' | Where-Object { $_.RowKey -eq $TenantFilter } | ForEach-Object {
-            Write-Host "Extracted customer id from tenant filter - It's $($_.IntegrationId)"
-            $CustomerId = $_.IntegrationId
-        }
+        $TenantFilter = (Get-Tenants -TenantFilter $TenantFilter).customerId
+        $CustomerId = Get-ExtensionMapping -Extension 'Sherweb' | Where-Object { $_.RowKey -eq $TenantFilter } | Select-Object -ExpandProperty IntegrationId
+    }
+
+    if (![string]::IsNullOrEmpty($CustomerId)) {
+        Write-Information "Getting catalog for $CustomerId"
+        $AuthHeader = Get-SherwebAuthentication
+        $SubscriptionsList = Invoke-RestMethod -Uri "https://api.sherweb.com/service-provider/v1/customer-catalogs/$CustomerId" -Method GET -Headers $AuthHeader
+        return $SubscriptionsList.catalogItems
+    } else {
+        throw 'No Sherweb mapping found'
     }
-    $AuthHeader = Get-SherwebAuthentication
-    $SubscriptionsList = Invoke-RestMethod -Uri "https://api.sherweb.com/service-provider/v1/customer-catalogs/$CustomerId" -Method GET -Headers $AuthHeader
-    return $SubscriptionsList.catalogItems
 }

Modules/CippExtensions/Public/Sherweb/Get-SherwebCurrentSubscription.ps1

@@ -11,6 +11,7 @@ function Get-SherwebCurrentSubscription {
         $CustomerId = Get-ExtensionMapping -Extension 'Sherweb' | Where-Object { $_.RowKey -eq $TenantFilter } | Select-Object -ExpandProperty IntegrationId
     }
 
+    Write-Information "Getting current subscription for $CustomerId"
     $AuthHeader = Get-SherwebAuthentication
     $Uri = "https://api.sherweb.com/service-provider/v1/billing/subscriptions/details?customerId=$CustomerId"
     $SubscriptionDetails = Invoke-RestMethod -Uri $Uri -Method GET -Headers $AuthHeader

Modules/CippExtensions/Public/Sherweb/Get-SherwebCustomerConfiguration.ps1

@@ -5,10 +5,8 @@ function Get-SherwebCustomerConfiguration {
         [string]$TenantFilter
     )
     if ($TenantFilter) {
-        Get-ExtensionMapping -Extension 'Sherweb' | Where-Object { $_.RowKey -eq $TenantFilter } | ForEach-Object {
-            Write-Host "Extracted customer id from tenant filter - It's $($_.IntegrationId)"
-            $CustomerId = $_.IntegrationId
-        }
+        $TenantFilter = (Get-Tenants -TenantFilter $TenantFilter).customerId
+        $CustomerId = Get-ExtensionMapping -Extension 'Sherweb' | Where-Object { $_.RowKey -eq $TenantFilter } | Select-Object -ExpandProperty IntegrationId
     }
     $AuthHeader = Get-SherwebAuthentication
     $Uri = "https://api.sherweb.com/service-provider/v1/customers/$($CustomerId)/platforms-configurations/"

Modules/CippExtensions/Public/Sherweb/Remove-SherwebSubscription.ps1

@@ -7,10 +7,8 @@ function Remove-SherwebSubscription {
         [string]$TenantFilter
     )
     if ($TenantFilter) {
-        Get-ExtensionMapping -Extension 'Sherweb' | Where-Object { $_.RowKey -eq $TenantFilter } | ForEach-Object {
-            Write-Host "Extracted customer id from tenant filter - It's $($_.IntegrationId)"
-            $CustomerId = $_.IntegrationId
-        }
+        $TenantFilter = (Get-Tenants -TenantFilter $TenantFilter).customerId
+        $CustomerId = Get-ExtensionMapping -Extension 'Sherweb' | Where-Object { $_.RowKey -eq $TenantFilter } | Select-Object -ExpandProperty IntegrationId
     }
     $AuthHeader = Get-SherwebAuthentication
     $Body = ConvertTo-Json -Depth 10 -InputObject @{

Modules/CippExtensions/Public/Sherweb/Set-SherwebSubscription.ps1

@@ -10,10 +10,8 @@ function Set-SherwebSubscription {
         [string]$TenantFilter
     )
     if ($TenantFilter) {
-        Get-ExtensionMapping -Extension 'Sherweb' | Where-Object { $_.RowKey -eq $TenantFilter } | ForEach-Object {
-            Write-Host "Extracted customer id from tenant filter - It's $($_.IntegrationId)"
-            $CustomerId = $_.IntegrationId
-        }
+        $TenantFilter = (Get-Tenants -TenantFilter $TenantFilter).customerId
+        $CustomerId = Get-ExtensionMapping -Extension 'Sherweb' | Where-Object { $_.RowKey -eq $TenantFilter } | Select-Object -ExpandProperty IntegrationId
     }
     $AuthHeader = Get-SherwebAuthentication
     $ExistingSubscription = Get-SherwebCurrentSubscription -CustomerId $CustomerId -SKU $SKU