replace AzureAd module dependency with just in time installation

fixes ➖ ➕ Remove PSNotification, replace AzureAd with Microsoft.Graph #744
d365collaborative · Jun 22, 2024 · 6d26d0f · 6d26d0f
1 parent d3e5588
commit 6d26d0f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -14,11 +14,6 @@ jobs:
         uses: PowershellFrameworkCollective/psframework@32c18f13173be8cc6b6803c63c40b9d7ab5aec12 # version 1.0.12
       - name: Azure.Storage
         uses: Azure/[email protected] # unclear which commit/tag corresponds to https://www.powershellgallery.com/packages/Azure.Storage/4.4.0
-      # AzureAd does not seem to have a public GitHub repository
-      # - name: AzureAd
-      #   uses: 
-      - name: PSNotification
-        uses: Splaxi/PSNotification@b344c3dfdb04db1a338f203d1a0c5ae72d67ae89 # version 0.5.3
       - name: PSOAuthHelper
         uses: Splaxi/PSOAuthHelper@837a2da63bf76e86f339a4e43e38df5a3b82affe # version 0.3.0
       - name: ImportExcel

diff --git a/build/vsts-prerequisites.ps1 b/build/vsts-prerequisites.ps1
@@ -1,8 +1,8 @@
 Write-Host "Working on the machine named: $($env:computername)"
 Write-Host "The user running is: $($env:UserName)"
 
-# $modules = @("PSFramework", "Az.Storage", "AzureAd", "PSNotification", "PSOAuthHelper", "PowerShellGet", "PackageManagement","ImportExcel","PSScriptAnalyzer")
-$modules = @("PSFramework", "PSScriptAnalyzer", "Az.Storage", "AzureAd", "PSNotification", "PSOAuthHelper", "ImportExcel")
+# $modules = @("PSFramework", "Az.Storage", "PSOAuthHelper", "PowerShellGet", "PackageManagement","ImportExcel","PSScriptAnalyzer")
+$modules = @("PSFramework", "PSScriptAnalyzer", "Az.Storage", "PSOAuthHelper", "ImportExcel")
 
 Install-Module "Pester" -MaximumVersion 4.99.99 -Force -Confirm:$false -Scope CurrentUser -AllowClobber -SkipPublisherCheck
 

diff --git a/build/vsts-validate-psscriptanalyzer.ps1 b/build/vsts-validate-psscriptanalyzer.ps1
@@ -14,7 +14,7 @@
 Write-Host "Working on the machine named: $($env:computername)"
 Write-Host "The user running is: $($env:UserName)"
 
-$modules = @("PSFramework", "PSScriptAnalyzer", "Az.Storage", "AzureAd", "PSNotification", "PSOAuthHelper", "ImportExcel")
+$modules = @("PSFramework", "PSScriptAnalyzer", "Az.Storage", "PSOAuthHelper", "ImportExcel")
 
 foreach ($item in $modules) {
     $module = Get-Module -Name $item -ErrorAction SilentlyContinue

diff --git a/build/vsts-validate.ps1 b/build/vsts-validate.ps1
@@ -17,7 +17,7 @@
 Write-Host "Working on the machine named: $($env:computername)"
 Write-Host "The user running is: $($env:UserName)"
 
-$modules = @("PSFramework", "PSScriptAnalyzer", "Az.Storage", "AzureAd", "PSNotification", "PSOAuthHelper", "ImportExcel")
+$modules = @("PSFramework", "PSScriptAnalyzer", "Az.Storage", "PSOAuthHelper", "ImportExcel")
 
 foreach ($item in $modules) {
     $module = Get-Module -Name $item -ErrorAction SilentlyContinue

diff --git a/d365fo.tools/d365fo.tools.psd1 b/d365fo.tools/d365fo.tools.psd1
@@ -1,4 +1,4 @@
-@{
+@{
 	# Script module or binary module file associated with this manifest
 	RootModule        = 'd365fo.tools.psm1'
 
@@ -30,7 +30,6 @@
 	RequiredModules   = @(
 		@{ ModuleName = 'PSFramework'; ModuleVersion = '1.0.12' }
 		, @{ ModuleName = 'Az.Storage'; ModuleVersion = '1.11.0' }
-		, @{ ModuleName = 'AzureAd'; ModuleVersion = '2.0.1.16' }
 		, @{ ModuleName = 'PSOAuthHelper'; ModuleVersion = '0.3.0' }
 		, @{ ModuleName = 'ImportExcel'; ModuleVersion = '7.1.0' }
 	)

diff --git a/d365fo.tools/functions/import-d365aaduser.ps1 b/d365fo.tools/functions/import-d365aaduser.ps1
@@ -167,6 +167,12 @@ function Import-D365AadUser {
         [string] $AadGroupId
     )
 
+    $azureADModule = Get-Module -Name "AzureAD" -ListAvailable
+    if ($null -eq $azureADModule) {
+        Write-PSFMessage -Level Host -Message "AzureAD module is not installed. Trying to install it now." -Color Yellow
+        Install-Module -Name "AzureAD" -Force -AllowClobber -Scope CurrentUser
+    }
+
     $UseTrustedConnection = Test-TrustedConnection $PSBoundParameters
 
     $SqlParams = @{ DatabaseServer = $DatabaseServer; DatabaseName = $DatabaseName;