Skip to content

fixing authentication to use MgGraph #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: scope-fix
Choose a base branch
from
Open

fixing authentication to use MgGraph #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2629026
fixing authentication to use MgGraph
mathiasborowicz Aug 19, 2024
0f3dc39
changed RequiredModules to use Microsoft Graph
mathiasborowicz Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Intune.HV.Tools/Intune.HV.Tools.psd1
View file
Open in desktop
Binary file not shown.
17 changes: 9 additions & 8 deletions Intune.HV.Tools/Private/Get-AutopilotPolicy.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#requires -Modules @{ ModuleName="WindowsAutoPilotIntune"; ModuleVersion="4.3" }
#requires -Modules @{ ModuleName="Microsoft.Graph.Intune"; ModuleVersion="6.1907.1.0"}
#requires -Modules @{ ModuleName="WindowsAutoPilotIntune"; ModuleVersion="5.6" }
#requires -Modules @{ ModuleName="Microsoft.Graph.Identity.DirectoryManagement"; ModuleVersion="2.22.0"}
function Get-AutopilotPolicy {
[cmdletbinding()]
param (
Expand All @@ -10,7 +10,7 @@ function Get-AutopilotPolicy {
if (!(Test-Path "$FileDestination\AutopilotConfigurationFile.json" -ErrorAction SilentlyContinue)) {
$modules = @(
"WindowsAutoPilotIntune",
"Microsoft.Graph.Intune"
"Microsoft.Graph.Identity.DirectoryManagement"
)
if ($PSVersionTable.PSVersion.Major -eq 7) {
$modules | ForEach-Object {
Expand All @@ -22,16 +22,16 @@ function Get-AutopilotPolicy {
Import-Module $_
}
}
#region Connect to Intune
Connect-MSGraph | Out-Null
#endregion Connect to Intune
#region Connect to Microsoft Graph
Connect-MgGraph -Scopes "DeviceManagementServiceConfig.Read.All,Organization.Read.All" -NoWelcome
#endregion Connect to Microsoft Graph
#region Get policies
$apPolicies = Get-AutopilotProfile
if (!($apPolicies)) {
Write-Warning "No Autopilot policies found.."
}
else {
if ($apPolicies.count -gt 1) {
if ($apPolicies.id.count -gt 1) {
Write-Host "Multiple Autopilot policies found - select the correct one.." -ForegroundColor Cyan
$selectedAp = $apPolicies | Select-Object displayName | Out-GridView -passthru
$apPol = $apPolicies | Where-Object {$_.displayName -eq $selectedAp.displayName}
Expand All @@ -42,6 +42,7 @@ function Get-AutopilotPolicy {
}
$apPol | ConvertTo-AutopilotConfigurationJSON | Out-File "$FileDestination\AutopilotConfigurationFile.json" -Encoding ascii -Force
Write-Host "Autopilot profile selected: $($apPol.displayName)" -ForegroundColor Green
Disconnect-MgGraph | Out-Null
}
#endregion Get policies
}
Expand All @@ -56,7 +57,7 @@ function Get-AutopilotPolicy {
if ($PSVersionTable.PSVersion.Major -eq 7) {
$modules = @(
"WindowsAutoPilotIntune",
"Microsoft.Graph.Intune"
"Microsoft.Graph.Identity.DirectoryManagement"
) | ForEach-Object {
Remove-Module $_ -ErrorAction SilentlyContinue 3>$null
}
Expand Down