Update the client service to attach the additional parameters to the …

…correct request instances
openiddict · Dec 2, 2023 · f541dcd · f541dcd
1 parent d069c0d
commit f541dcd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/OpenIddict.Client/OpenIddictClientModels.cs b/src/OpenIddict.Client/OpenIddictClientModels.cs
@@ -22,6 +22,7 @@ public sealed record class InteractiveAuthenticationRequest
         /// <summary>
         /// Gets or sets the parameters that will be added to the token request.
         /// </summary>
+        [Obsolete("This property is no longer supported and will be removed in a future version.")]
         public Dictionary<string, OpenIddictParameter>? AdditionalTokenRequestParameters { get; init; }
 
         /// <summary>
@@ -43,6 +44,7 @@ public sealed record class InteractiveAuthenticationRequest
         /// <summary>
         /// Gets the scopes that will be sent to the authorization server.
         /// </summary>
+        [Obsolete("This property is no longer supported and will be removed in a future version.")]
         public List<string>? Scopes { get; init; }
     }
 

diff --git a/src/OpenIddict.Client/OpenIddictClientService.cs b/src/OpenIddict.Client/OpenIddictClientService.cs
@@ -325,6 +325,14 @@ public async ValueTask<InteractiveAuthenticationResult> AuthenticateInteractivel
                 Nonce = request.Nonce
             };
 
+            if (request.Properties is { Count: > 0 })
+            {
+                foreach (var property in request.Properties)
+                {
+                    context.Properties[property.Key] = property.Value;
+                }
+            }
+
             await dispatcher.DispatchAsync(context);
 
             if (context.IsRejected)
@@ -733,7 +741,7 @@ public async ValueTask<DeviceAuthenticationResult> AuthenticateWithDeviceAsync(D
                         Issuer = request.Issuer,
                         ProviderName = request.ProviderName,
                         RegistrationId = request.RegistrationId,
-                        Request = request.AdditionalTokenRequestParameters
+                        TokenRequest = request.AdditionalTokenRequestParameters
                             is Dictionary<string, OpenIddictParameter> parameters ? new(parameters) : new(),
                     };
 
@@ -912,13 +920,13 @@ public async ValueTask<DeviceChallengeResult> ChallengeUsingDeviceAsync(DeviceCh
             var context = new ProcessChallengeContext(transaction)
             {
                 CancellationToken = request.CancellationToken,
+                DeviceAuthorizationRequest = request.AdditionalDeviceAuthorizationRequestParameters
+                    is Dictionary<string, OpenIddictParameter> parameters ? new(parameters) : new(),
                 GrantType = GrantTypes.DeviceCode,
                 Issuer = request.Issuer,
                 Principal = new ClaimsPrincipal(new ClaimsIdentity()),
                 ProviderName = request.ProviderName,
-                RegistrationId = request.RegistrationId,
-                Request = request.AdditionalDeviceAuthorizationRequestParameters
-                    is Dictionary<string, OpenIddictParameter> parameters ? new(parameters) : new(),
+                RegistrationId = request.RegistrationId
             };
 
             if (request.Scopes is { Count: > 0 })