Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

Author: KelvinTegelaar

Modules/CIPPCore/Public/Set-CIPPSAMAdminRoles.ps1

@@ -20,10 +20,15 @@ function Set-CIPPSAMAdminRoles {
     $SAMRolesTable = Get-CIPPTable -tablename 'SAMRoles'
     $Roles = Get-CIPPAzDataTableEntity @SAMRolesTable
 
-    $SAMRoles = $Roles.Roles | ConvertFrom-Json
-    $Tenants = $Roles.Tenants | ConvertFrom-Json
-    if ($Tenants.value) {
-        $Tenants = $Tenants.value
+    try {
+        $SAMRoles = $Roles.Roles | ConvertFrom-Json -ErrorAction Stop
+        $Tenants = $Roles.Tenants | ConvertFrom-Json -ErrorAction Stop
+        if ($Tenants.value) {
+            $Tenants = $Tenants.value
+        }
+    } catch {
+        $ActionLogs.Add('CIPP-SAM roles not configured')
+        return $ActionLogs
     }
 
     if (($SAMRoles | Measure-Object).count -gt 0 -and $Tenants -contains $TenantFilter -or $Tenants -contains 'AllTenants') {