removing unnecessary string assignment

microsoftgraph · Jun 26, 2024 · e708fc1 · e708fc1
1 parent ecacea1
commit e708fc1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/src/Authentication/Authentication.Core/Interfaces/IGraphRequestPopContext.cs b/src/Authentication/Authentication.Core/Interfaces/IGraphRequestPopContext.cs
@@ -14,7 +14,6 @@ public interface IGraphRequestPopContext
         Uri Uri { get; set; }
         HttpMethod HttpMethod { get; set; }
         AccessToken AccessToken { get; set; }
-        string ProofofPossessionNonce { get; set; }
         PopTokenRequestContext PopTokenContext { get; set; }
         Request Request { get; set; }
         InteractiveBrowserCredential PopInteractiveBrowserCredential { get; set; }

diff --git a/src/Authentication/Authentication.Core/Utilities/AuthenticationHelpers.cs b/src/Authentication/Authentication.Core/Utilities/AuthenticationHelpers.cs
@@ -479,8 +479,7 @@ private static async Task<PopTokenRequestContext> CreatePopTokenRequestContext(I
             // Find the nonce in the WWW-Authenticate header in the response.
             var popMethod = GraphSession.Instance.GraphRequestPopContext.HttpMethod ?? HttpMethod.Get;
             var popResponse = await popHttpClient.SendAsync(new HttpRequestMessage(popMethod, popResourceUri));
-            GraphSession.Instance.GraphRequestPopContext.ProofofPossessionNonce = WwwAuthenticateParameters.CreateFromAuthenticationHeaders(popResponse.Headers, "Pop").Nonce;
-
+
             // Refresh token logic --- start
             var popPipelineOptions = new HttpPipelineOptions(new PopClientOptions()
             {
@@ -493,7 +492,7 @@ private static async Task<PopTokenRequestContext> CreatePopTokenRequestContext(I
             GraphSession.Instance.GraphRequestPopContext.Request.Uri.Reset(popResourceUri);
 
             // Refresh token logic --- end
-            var popContext = new PopTokenRequestContext(authContext.Scopes, isProofOfPossessionEnabled: true, proofOfPossessionNonce: GraphSession.Instance.GraphRequestPopContext.ProofofPossessionNonce, request: GraphSession.Instance.GraphRequestPopContext.Request);
+            var popContext = new PopTokenRequestContext(authContext.Scopes, isProofOfPossessionEnabled: true, proofOfPossessionNonce: WwwAuthenticateParameters.CreateFromAuthenticationHeaders(popResponse.Headers, "Pop").Nonce, request: GraphSession.Instance.GraphRequestPopContext.Request);
             return popContext;
         }
         public static RequestMethod ConvertToAzureRequestMethod(HttpMethod httpMethod)

diff --git a/src/Authentication/Authentication/Handlers/AuthenticationHandler.cs b/src/Authentication/Authentication/Handlers/AuthenticationHandler.cs
@@ -52,8 +52,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 // Continuous nonce extraction on each request
                 if (GraphSession.Instance.GraphOption.EnableATPoPForMSGraph)
                 {
-                    GraphSession.Instance.GraphRequestPopContext.ProofofPossessionNonce = WwwAuthenticateParameters.CreateFromAuthenticationHeaders(response.Headers, PopAuthenticationScheme).Nonce;
-                    GraphSession.Instance.GraphRequestPopContext.PopTokenContext = new PopTokenRequestContext(GraphSession.Instance.AuthContext.Scopes, isProofOfPossessionEnabled: true, proofOfPossessionNonce: GraphSession.Instance.GraphRequestPopContext.ProofofPossessionNonce, request: GraphSession.Instance.GraphRequestPopContext.Request);
+                    GraphSession.Instance.GraphRequestPopContext.PopTokenContext = new PopTokenRequestContext(GraphSession.Instance.AuthContext.Scopes, isProofOfPossessionEnabled: true, proofOfPossessionNonce: WwwAuthenticateParameters.CreateFromAuthenticationHeaders(response.Headers, PopAuthenticationScheme).Nonce, request: GraphSession.Instance.GraphRequestPopContext.Request);
                 }
 
                 // Check if response is a 401 & is not a streamed body (is buffered)

diff --git a/src/Authentication/Authentication/Models/GraphRequestPopContext.cs b/src/Authentication/Authentication/Models/GraphRequestPopContext.cs
@@ -15,7 +15,6 @@ internal class GraphRequestPopContext : IGraphRequestPopContext
         public Uri Uri { get; set; }
         public HttpMethod HttpMethod { get; set; }
         public AccessToken AccessToken { get; set; }
-        public string ProofofPossessionNonce { get; set; }
         public PopTokenRequestContext PopTokenContext { get; set; }
         public Request Request { get; set; }
         public InteractiveBrowserCredential PopInteractiveBrowserCredential { get; set; }