diff --git a/source/Private/Assert-ModuleAvailability.ps1 b/source/Private/Assert-ModuleAvailability.ps1 index 1d9423f..0433343 100644 --- a/source/Private/Assert-ModuleAvailability.ps1 +++ b/source/Private/Assert-ModuleAvailability.ps1 @@ -41,11 +41,9 @@ function Assert-ModuleAvailability { Write-Verbose "Importing module $ModuleName..." Import-Module -Name $ModuleName -RequiredVersion $RequiredVersion -ErrorAction Stop -WarningAction SilentlyContinue | Out-Null } - } catch { throw "Assert-ModuleAvailability:`n$_" } } - } diff --git a/source/Private/Connect-M365Suite.ps1 b/source/Private/Connect-M365Suite.ps1 index 11ee279..836c9e1 100644 --- a/source/Private/Connect-M365Suite.ps1 +++ b/source/Private/Connect-M365Suite.ps1 @@ -119,6 +119,9 @@ function Connect-M365Suite { Write-Verbose "Tenant Context: $($tenant.TenantName)`n" #Write-Verbose "Tenant ID: $($tenant.TenantID)" } + if ($script:PnpAuth) { + Write-Warning "`n!!!!!!!!!!!!Important!!!!!!!!!!!!!!`nIf you use auth tokens, you will need to kill the current session before subsequent runs as the PNP.Powershell module has conflicts with MgGraph!`n!!!!!!!!!!!!Important!!!!!!!!!!!!!!" + } $confirmation = Read-Host "Do you want to proceed with these connections? (Y/N)" if ($confirmation -notLike 'Y') { Write-Verbose "Connection setup aborted by user."