Update InteractiveChallengeRequest and InteractiveSignOutRequest to s…

…upport attaching an identity token or login hint
Thodor12 · Feb 4, 2025 · bd74a6c · bd74a6c
1 parent a18433d
commit bd74a6c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/sandbox/OpenIddict.Sandbox.Console.Client/InteractiveService.cs b/sandbox/OpenIddict.Sandbox.Console.Client/InteractiveService.cs
@@ -126,6 +126,7 @@ await _service.RevokeTokenAsync(new()
                         var nonce = (await _service.SignOutInteractivelyAsync(new()
                         {
                             CancellationToken = stoppingToken,
+                            IdentityTokenHint = response.BackchannelIdentityToken ?? response.FrontchannelIdentityToken,
                             ProviderName = provider
                         })).Nonce;
 

diff --git a/src/OpenIddict.Client/OpenIddictClientModels.cs b/src/OpenIddict.Client/OpenIddictClientModels.cs
@@ -165,6 +165,17 @@ public sealed record class InteractiveChallengeRequest
         [EditorBrowsable(EditorBrowsableState.Advanced)]
         public string? GrantType { get; init; }
 
+        /// <summary>
+        /// Gets or sets the optional identity token hint that will
+        /// be sent to the authorization server, if applicable.
+        /// </summary>
+        public string? IdentityTokenHint { get; set; }
+
+        /// <summary>
+        /// Gets or sets the optional login hint that will be sent to the authorization server, if applicable.
+        /// </summary>
+        public string? LoginHint { get; set; }
+
         /// <summary>
         /// Gets or sets the application-specific properties that will be added to the context.
         /// </summary>
@@ -253,6 +264,17 @@ public sealed record class InteractiveSignOutRequest
         /// </summary>
         public CancellationToken CancellationToken { get; init; }
 
+        /// <summary>
+        /// Gets or sets the optional identity token hint that will
+        /// be sent to the authorization server, if applicable.
+        /// </summary>
+        public string? IdentityTokenHint { get; set; }
+
+        /// <summary>
+        /// Gets or sets the optional login hint that will be sent to the authorization server, if applicable.
+        /// </summary>
+        public string? LoginHint { get; set; }
+
         /// <summary>
         /// Gets or sets the application-specific properties that will be added to the context.
         /// </summary>

diff --git a/src/OpenIddict.Client/OpenIddictClientService.cs b/src/OpenIddict.Client/OpenIddictClientService.cs
@@ -389,7 +389,9 @@ public async ValueTask<InteractiveChallengeResult> ChallengeInteractivelyAsync(I
                 CancellationToken = request.CancellationToken,
                 CodeChallengeMethod = request.CodeChallengeMethod,
                 GrantType = request.GrantType,
+                IdentityTokenHint = request.IdentityTokenHint,
                 Issuer = request.Issuer,
+                LoginHint = request.LoginHint,
                 Principal = new ClaimsPrincipal(new ClaimsIdentity()),
                 ProviderName = request.ProviderName,
                 RegistrationId = request.RegistrationId,
@@ -1399,7 +1401,9 @@ public async ValueTask<InteractiveSignOutResult> SignOutInteractivelyAsync(Inter
             var context = new ProcessSignOutContext(transaction)
             {
                 CancellationToken = request.CancellationToken,
+                IdentityTokenHint = request.IdentityTokenHint,
                 Issuer = request.Issuer,
+                LoginHint = request.LoginHint,
                 Principal = new ClaimsPrincipal(new ClaimsIdentity()),
                 ProviderName = request.ProviderName,
                 RegistrationId = request.RegistrationId,