Avoid setting DefaultRequestHeaders when request is in flight. (#1604)

* Avoid setting DefaultRequestHeaders when request is in flight. * Bump version number.
microsoftgraph · Nov 1, 2022 · a45920b · a45920b
1 parent 217262b
commit a45920b
Show file tree

Hide file tree

Showing 45 changed files with 81 additions and 59 deletions.
diff --git a/config/ModuleMetadata.json b/config/ModuleMetadata.json
@@ -25,5 +25,5 @@
   ],
   "releaseNotes": "See https://aka.ms/GraphPowerShell-Release.",
   "assemblyOriginatorKeyFile": "35MSSharedLib1024.snk",
-  "version": "1.14.0"
+  "version": "1.14.1"
 }
diff --git a/src/Applications/Applications/readme.md b/src/Applications/Applications/readme.md
@@ -78,6 +78,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Authentication/Authentication.Test/Helpers/HttpHelpersTests.cs b/src/Authentication/Authentication.Test/Helpers/HttpHelpersTests.cs
@@ -4,13 +4,15 @@
 namespace Microsoft.Graph.Authentication.Test.Helpers
 {
     using System;
+    using System.Collections.Generic;
+    using System.Management.Automation;
     using System.Net.Http;
+    using System.Threading.Tasks;
     using Microsoft.Graph.Authentication.Core;
     using Microsoft.Graph.PowerShell.Authentication;
     using Microsoft.Graph.PowerShell.Authentication.Helpers;
     using Microsoft.Graph.PowerShell.Authentication.Models;
     using Xunit;
-
     public class HttpHelpersTests
     {
         [Fact]
@@ -184,5 +186,30 @@ public void GetGraphHttpClientShouldReturnNewHttpClientSignOutThenSignIn()
             // reset static instance.
             GraphSession.Reset();
         }
+
+        [Fact]
+        public async void GetGraphHttpClientShouldBeThreadSafeAsync()
+        {
+            GraphSession.Initialize(() => new GraphSession());
+            GraphSession.Instance.RequestContext = new RequestContext();
+            var authContext = new AuthContext
+            {
+                AuthType = AuthenticationType.UserProvidedAccessToken,
+                ContextScope = ContextScope.Process,
+                PSHostVersion = new Version("7.2.7")
+            };
+
+            var tasks = new List<Task<HttpClient>>();
+            for (int i = 0; i < 100; i++)
+            {
+                tasks.Add(Task.Factory.StartNew(() => HttpHelpers.GetGraphHttpClient(authContext)));
+            }
+            var exception = await Record.ExceptionAsync(() => Task.WhenAll(tasks));
+            Assert.Null(exception);
+
+            // reset static instance.
+            GraphSession.Reset();
+        }
+
     }
 }
diff --git a/src/Authentication/Authentication/Helpers/HttpHelpers.cs b/src/Authentication/Authentication/Helpers/HttpHelpers.cs
@@ -11,7 +11,6 @@ namespace Microsoft.Graph.PowerShell.Authentication.Helpers
     using System.Security.Authentication;
     using Microsoft.Graph.PowerShell.Authentication.Handlers;
     using System.Management.Automation;
-    using System;
     using Microsoft.Graph.PowerShell.Authentication.Core.Interfaces;
 
     /// <summary>
@@ -54,16 +53,6 @@ private static void ReplaceSDKHeader(HttpClient httpClient, string headerName, s
             }
         }
 
-        public static HttpClient GetGraphHttpClient(InvocationInfo invocationInfo, IAuthContext authContext = null)
-        {
-            authContext = authContext ?? GraphSession.Instance.AuthContext;
-            if (authContext is null) { throw new AuthenticationException(Core.ErrorConstants.Message.MissingAuthContext); }
-            var httpClient = GetGraphHttpClient(authContext);
-            var requestUserAgent = new RequestUserAgent(authContext.PSHostVersion, invocationInfo);
-            ReplaceSDKHeader(httpClient, HttpKnownHeaderNames.UserAgent, requestUserAgent.UserAgent);
-            return httpClient;
-        }
-
         /// <summary>
         /// Creates a pre-configured Microsoft Graph <see cref="HttpClient"/>.
         /// </summary>
@@ -81,6 +70,8 @@ public static HttpClient GetGraphHttpClient(IAuthContext authContext = null)
 
             IAuthenticationProvider authProvider = AuthenticationHelpers.GetAuthProvider(authContext);
             var newHttpClient = GetGraphHttpClient(authProvider, GraphSession.Instance.RequestContext);
+            var requestUserAgent = new RequestUserAgent(authContext.PSHostVersion, null);
+            ReplaceSDKHeader(newHttpClient, HttpKnownHeaderNames.UserAgent, requestUserAgent.UserAgent);
             GraphSession.Instance.GraphHttpClient = newHttpClient;
             return newHttpClient;
         }

diff --git a/src/Authentication/Authentication/Helpers/RequestUserAgent.cs b/src/Authentication/Authentication/Helpers/RequestUserAgent.cs
@@ -47,8 +47,9 @@ internal string App
         {
             get
             {
-                var app = string.Format(CultureInfo.InvariantCulture,
-                    "PowerShell/{0} {1}", _psHostVersion, _invocationInfo.MyCommand.Name);
+                var app = string.Empty;
+                if (_psHostVersion != null)
+                    app = string.Format(CultureInfo.InvariantCulture, "PowerShell/{0} {1}", _psHostVersion, _invocationInfo?.MyCommand?.Name);
                 return app;
             }
         }

diff --git a/src/Authentication/Authentication/Microsoft.Graph.Authentication.psd1 b/src/Authentication/Authentication/Microsoft.Graph.Authentication.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft
 #
-# Generated on: 10/25/2022
+# Generated on: 10/31/2022
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = './Microsoft.Graph.Authentication.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.14.0'
+ModuleVersion = '1.14.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -99,7 +99,9 @@ PrivateData = @{
     PSData = @{
 
         # Tags applied to this module. These help with module discovery in online galleries.
-        Tags = 'Microsoft','Office365','Graph','PowerShell','Teams','Outlook','OneDrive','AzureAD','GraphAPI','Productivity','SharePoint','Intune','SDK'
+        Tags = 'Microsoft', 'Office365', 'Graph', 'PowerShell', 'Teams', 'Outlook', 
+               'OneDrive', 'AzureAD', 'GraphAPI', 'Productivity', 'SharePoint', 'Intune', 
+               'SDK'
 
         # A URL to the license for this module.
         LicenseUri = 'https://aka.ms/devservicesagreement'
@@ -124,7 +126,8 @@ PrivateData = @{
 
     } # End of PSData hashtable
 
- } # End of PrivateData hashtable
+
+} # End of PrivateData hashtable
 
 # HelpInfo URI of this module
 # HelpInfoURI = ''

diff --git a/src/Bookings/Bookings/readme.md b/src/Bookings/Bookings/readme.md
@@ -50,6 +50,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Calendar/Calendar/readme.md b/src/Calendar/Calendar/readme.md
@@ -52,6 +52,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/ChangeNotifications/ChangeNotifications/readme.md b/src/ChangeNotifications/ChangeNotifications/readme.md
@@ -34,6 +34,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/CloudCommunications/CloudCommunications/readme.md b/src/CloudCommunications/CloudCommunications/readme.md
@@ -59,6 +59,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Compliance/Compliance/readme.md b/src/Compliance/Compliance/readme.md
@@ -47,6 +47,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/CrossDeviceExperiences/CrossDeviceExperiences/readme.md b/src/CrossDeviceExperiences/CrossDeviceExperiences/readme.md
@@ -34,6 +34,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/DeviceManagement.Actions/DeviceManagement.Actions/readme.md b/src/DeviceManagement.Actions/DeviceManagement.Actions/readme.md
@@ -166,6 +166,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/DeviceManagement.Administration/DeviceManagement.Administration/readme.md b/src/DeviceManagement.Administration/DeviceManagement.Administration/readme.md
@@ -64,6 +64,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/DeviceManagement.Enrolment/DeviceManagement.Enrolment/readme.md b/src/DeviceManagement.Enrolment/DeviceManagement.Enrolment/readme.md
@@ -49,6 +49,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/DeviceManagement.Functions/DeviceManagement.Functions/readme.md b/src/DeviceManagement.Functions/DeviceManagement.Functions/readme.md
@@ -47,6 +47,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/DeviceManagement/DeviceManagement/readme.md b/src/DeviceManagement/DeviceManagement/readme.md
@@ -54,6 +54,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Devices.CloudPrint/Devices.CloudPrint/readme.md b/src/Devices.CloudPrint/Devices.CloudPrint/readme.md
@@ -50,6 +50,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Devices.CorporateManagement/Devices.CorporateManagement/readme.md b/src/Devices.CorporateManagement/Devices.CorporateManagement/readme.md
@@ -99,6 +99,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Devices.ServiceAnnouncement/Devices.ServiceAnnouncement/readme.md b/src/Devices.ServiceAnnouncement/Devices.ServiceAnnouncement/readme.md
@@ -49,6 +49,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/DirectoryObjects/DirectoryObjects/readme.md b/src/DirectoryObjects/DirectoryObjects/readme.md
@@ -47,6 +47,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Education/Education/readme.md b/src/Education/Education/readme.md
@@ -35,6 +35,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Files/Files/readme.md b/src/Files/Files/readme.md
@@ -50,6 +50,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Financials/Financials/readme.md b/src/Financials/Financials/readme.md
@@ -42,6 +42,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Groups/Groups/readme.md b/src/Groups/Groups/readme.md
@@ -120,6 +120,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Identity.DirectoryManagement/Identity.DirectoryManagement/readme.md b/src/Identity.DirectoryManagement/Identity.DirectoryManagement/readme.md
@@ -70,6 +70,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Identity.Governance/Identity.Governance/readme.md b/src/Identity.Governance/Identity.Governance/readme.md
@@ -320,6 +320,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Identity.SignIns/Identity.SignIns/readme.md b/src/Identity.SignIns/Identity.SignIns/readme.md
@@ -72,6 +72,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Mail/Mail/readme.md b/src/Mail/Mail/readme.md
@@ -34,6 +34,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/ManagedTenants/ManagedTenants/readme.md b/src/ManagedTenants/ManagedTenants/readme.md
@@ -43,6 +43,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Notes/Notes/readme.md b/src/Notes/Notes/readme.md
@@ -44,6 +44,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/People/People/readme.md b/src/People/People/readme.md
@@ -74,6 +74,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/PersonalContacts/PersonalContacts/readme.md b/src/PersonalContacts/PersonalContacts/readme.md
@@ -34,6 +34,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Planner/Planner/readme.md b/src/Planner/Planner/readme.md
@@ -75,6 +75,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Reports/Reports/readme.md b/src/Reports/Reports/readme.md
@@ -79,6 +79,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/SchemaExtensions/SchemaExtensions/readme.md b/src/SchemaExtensions/SchemaExtensions/readme.md
@@ -35,6 +35,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Search/Search/readme.md b/src/Search/Search/readme.md
@@ -35,6 +35,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.14.0
+module-version: 1.14.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```