This commit is contained in:
Mikael Karlsson
2025-09-14 14:15:15 +10:00
parent 951b583dd2
commit 485a9de855
32 changed files with 401 additions and 85 deletions

View File

@@ -237,7 +237,7 @@ function Invoke-InitializeModule
ViewID = "IntuneGraphAPI"
API = "/deviceManagement/deviceComplianceScripts"
PostImportCommand = { Start-PostImportComplianceScripts @args }
Permissons=@("DeviceManagementConfiguration.ReadWrite.All")
Permissons=@("DeviceManagementScripts.ReadWrite.All")
GroupId = "CompliancePolicies"
Icon = "Scripts"
ImportOrder = 80
@@ -378,7 +378,7 @@ function Invoke-InitializeModule
DetailExtension = { Add-ScriptExtensions @args }
ExportExtension = { Add-ScriptExportExtensions @args }
PostExportCommand = { Start-PostExportScripts @args }
Permissons=@("DeviceManagementManagedDevices.ReadWrite.All") # !!! DeviceManagementScripts.ReadWrite.All
Permissons=@("DeviceManagementScripts.ReadWrite.All")
AssignmentsType = "deviceManagementScriptAssignments"
Icon="Scripts"
GroupId = "Scripts"
@@ -392,7 +392,7 @@ function Invoke-InitializeModule
DetailExtension = { Add-ScriptExtensions @args }
ExportExtension = { Add-ScriptExportExtensions @args }
PostExportCommand = { Start-PostExportScripts @args }
Permissons=@("DeviceManagementManagedDevices.ReadWrite.All")
Permissons=@("DeviceManagementScripts.ReadWrite.All")
AssignmentsType = "deviceManagementScriptAssignments"
Icon="Scripts"
GroupId = "Scripts"
@@ -403,7 +403,7 @@ function Invoke-InitializeModule
Id = "MacCustomAttributes"
API = "/deviceManagement/deviceCustomAttributeShellScripts"
ViewID = "IntuneGraphAPI"
Permissons=@("DeviceManagementManagedDevices.ReadWrite.All")
Permissons=@("DeviceManagementScripts.ReadWrite.All")
AssignmentsType = "deviceManagementScriptAssignments"
Icon="CustomAttributes"
GroupId = "CustomAttributes" # MacOS Settings
@@ -750,7 +750,7 @@ function Invoke-InitializeModule
PreUpdateCommand = { Start-PreUpdateDeviceHealthScripts @args }
PostExportCommand = { Start-PostExportDeviceHealthScripts @args }
ExportExtension = { Add-ScriptExportExtensions @args }
Permissons=@("DeviceManagementConfiguration.ReadWrite.All")
Permissons=@("DeviceManagementScripts.ReadWrite.All")
GroupId = "EndpointAnalytics"
Icon = "Report"
AssignmentsType = "deviceHealthScriptAssignments"
@@ -4135,13 +4135,15 @@ function Add-ConditionalAccessImportExtensions
$CAStates += [PSCustomObject]@{
Name = "Off"
Value = "disabled"
}
}
$defaultCAState = Get-SettingValue "ConditionalAccessState"
$global:cbImportCAState = [System.Windows.Controls.ComboBox]::new()
$global:cbImportCAState.DisplayMemberPath = "Name"
$global:cbImportCAState.SelectedValuePath = "Value"
$global:cbImportCAState.ItemsSource = $CAStates
$global:cbImportCAState.SelectedValue = "disabled"
$global:cbImportCAState.SelectedValue = $defaultCAState
$global:cbImportCAState.Margin="0,5,0,0"
$global:cbImportCAState.HorizontalAlignment="Left"
$global:cbImportCAState.Width=250

View File

@@ -704,7 +704,10 @@ function Invoke-LoadADMXSettings
$tvItem | Add-Member -MemberType NoteProperty -Name "AllPolicies" -Value $true
}
$global:tvADMXCategories.Items[1].Items.Add($tvItem) | Out-Null
try {
$global:tvADMXCategories.Items[1].Items.Add($tvItem) | Out-Null
}
catch{}
}
function Set-ADMXSettingStatusText
@@ -854,6 +857,7 @@ function Get-ADMXCategoryNamePath
}
$catObj = $script:admxXML.policyDefinitions.categories.selectSingleNode("$($script:xmlNSPrefix)category[@name='$($categoryId)']",$script:xmlNS)
#$catObj = $script:admxXML.policyDefinitions.categories.category | Where Name -eq "$categoryId"
$categories = @()
while($catObj)
@@ -862,6 +866,7 @@ function Get-ADMXCategoryNamePath
if($catObj.parentCategory.ref)
{
$catObj = $script:admxXML.policyDefinitions.categories.selectSingleNode("$($script:xmlNSPrefix)category[@name='$($catObj.parentCategory.ref)']", $script:xmlNS)
#$catObj = $script:admxXML.policyDefinitions.categories.category | where name -eq $catObj.parentCategory.ref
}
else
{

View File

@@ -53,6 +53,25 @@ function Invoke-InitializeModule
}
)
$script:lstConditionalAccessState = @(
[PSCustomObject]@{
Name = "As Exported - Change On to Report-only"
Value = "AsExportedReportOnly"
},
[PSCustomObject]@{
Name = "As Exported"
Value = "AsExported"
},
[PSCustomObject]@{
Name = "Report-only"
Value = "enabledForReportingButNotEnforced"
},
[PSCustomObject]@{
Name = "Off"
Value = "disabled"
}
)
$script:lstGraphPageSize = @(
[PSCustomObject]@{
Name = "Graph API Default"
@@ -274,6 +293,15 @@ function Invoke-InitializeModule
DefaultValue = "20"
Description = "How many items load at a time"
}) "GraphGeneral"
Add-SettingsObject (New-Object PSObject -Property @{
Title = "Default Conditional Access Policy State"
Key = "ConditionalAccessState"
Type = "List"
ItemsSource = $script:lstConditionalAccessState
DefaultValue = "disabled"
Description = "Define the default option of the Conditional Access policy state. It is recommended to have this to disabled to avoid accidental tenant lock out"
}) "ImportExport"
}
function Get-GraphAppInfo