Merge pull request #5565 from FabienTschanz/fix/reset-only-required-w…

…orkloads Reset only necessary authentication context
microsoft · Dec 17, 2024 · a1ac29e · a1ac29e
2 parents 52335bc + 1b95a62
commit a1ac29e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
   * Fixed the Fabric web request to use basic parsing.
   * Fixed an issue where the export does not convert tenant name into
     generic $OrganizationName variable correctly.
+  * Reset only necessary authentication context.
 * M365DSCUtil
   * Update `Get-M365DSCWorkloadsListFromResourceNames` function for more input types.
     FIXES [#5525](https://github.com/microsoft/Microsoft365DSC/issues/5525)

diff --git a/...65DSC/DSCResources/MSFT_EXOManagementRoleAssignment/MSFT_EXOManagementRoleAssignment.psm1 b/...65DSC/DSCResources/MSFT_EXOManagementRoleAssignment/MSFT_EXOManagementRoleAssignment.psm1
@@ -387,7 +387,7 @@ function Set-TargetResource
         Write-Verbose -Message 'Waiting for 20 seconds for new permissions to be effective.'
         Start-Sleep 20
         Write-Verbose -Message 'Disconnecting from Exchange Online'
-        Reset-MSCloudLoginConnectionProfileContext
+        Reset-MSCloudLoginConnectionProfileContext -Workload ExchangeOnline
     }
 }
 

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.psm1
@@ -165,7 +165,7 @@ function Get-TargetResource
     if ((Get-MSCloudLoginConnectionProfile -Workload SecurityComplianceCenter).Connected -and `
             (Get-MSCloudLoginConnectionProfile -Workload ExchangeOnline).Connected)
     {
-        Reset-MSCloudLoginConnectionProfileContext
+        Reset-MSCloudLoginConnectionProfileContext -Workload ExchangeOnline
     }
     $ConnectionMode = New-M365DSCConnection -Workload 'ExchangeOnline' `
         -InboundParameters $PSBoundParameters

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
@@ -1437,7 +1437,7 @@ function Export-M365DSCConfiguration
     try
     {
         Disconnect-MgGraph -ErrorAction Stop | Out-Null
-        Reset-MSCloudLoginConnectionProfileContext
+        Reset-MSCloudLoginConnectionProfileContext -Workload 'MicrosoftGraph'
     }
     catch
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1437,7 +1437,7 @@ function Export-M365DSCConfiguration @@
         try
         {
             Disconnect-MgGraph -ErrorAction Stop | Out-Null
-            Reset-MSCloudLoginConnectionProfileContext
+            Reset-MSCloudLoginConnectionProfileContext -Workload 'MicrosoftGraph'
         }
         catch
         {
@@ Expand Down @@