Use AuthorizeRequestType enum

DuendeSoftware · Nov 14, 2023 · 9d23c2c · 9d23c2c
1 parent f73a0a0
commit 9d23c2c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/src/IdentityServer/Endpoints/AuthorizeEndpointBase.cs b/src/IdentityServer/Endpoints/AuthorizeEndpointBase.cs
@@ -228,7 +228,7 @@ private Task RaiseFailureEventAsync(ValidatedAuthorizeRequest request, string er
         Telemetry.Metrics.TokenIssuedFailure(
             request.ClientId,
             request.GrantType,
-            request.IsPushedAuthorizationRequest,
+            request.AuthorizeRequestType,
             error);
         return _events.RaiseAsync(new TokenIssuedFailureEvent(request, error, errorDescription));
     }
@@ -241,7 +241,7 @@ private Task RaiseResponseEventAsync(AuthorizeResponse response)
             Telemetry.Metrics.TokenIssued(
                 response.Request.ClientId,
                 response.Request.GrantType,
-                response.Request.IsPushedAuthorizationRequest);
+                response.Request.AuthorizeRequestType);
             return _events.RaiseAsync(new TokenIssuedSuccessEvent(response));
         }
 

diff --git a/src/IdentityServer/Endpoints/TokenEndpoint.cs b/src/IdentityServer/Endpoints/TokenEndpoint.cs
@@ -96,7 +96,7 @@ private async Task<IEndpointResult> ProcessTokenRequestAsync(HttpContext context
         if (clientResult.IsError)
         {
             var errorMsg = clientResult.Error ?? OidcConstants.TokenErrors.InvalidClient;
-            Telemetry.Metrics.TokenIssuedFailure(clientResult.Client?.ClientId, null, false, errorMsg);
+            Telemetry.Metrics.TokenIssuedFailure(clientResult.Client?.ClientId, null, null, errorMsg);
             return Error(errorMsg);
         }
 
@@ -113,7 +113,7 @@ private async Task<IEndpointResult> ProcessTokenRequestAsync(HttpContext context
         var error = await TryReadProofTokens(context, requestContext);
         if (error != null)
         {
-            Telemetry.Metrics.TokenIssuedFailure(clientResult.Client.ClientId, null, false, error.Response.Error);
+            Telemetry.Metrics.TokenIssuedFailure(clientResult.Client.ClientId, null, null, error.Response.Error);
             return error;
         }
 
@@ -122,7 +122,7 @@ private async Task<IEndpointResult> ProcessTokenRequestAsync(HttpContext context
         {
             await _events.RaiseAsync(new TokenIssuedFailureEvent(requestResult));
             Telemetry.Metrics.TokenIssuedFailure(
-                clientResult.Client.ClientId, requestResult.ValidatedRequest?.GrantType, false, requestResult.Error);
+                clientResult.Client.ClientId, requestResult.ValidatedRequest?.GrantType, null, requestResult.Error);
             var err = Error(requestResult.Error, requestResult.ErrorDescription, requestResult.CustomResponse);
             err.Response.DPoPNonce = requestResult.DPoPNonce;
             return err;
@@ -133,7 +133,7 @@ private async Task<IEndpointResult> ProcessTokenRequestAsync(HttpContext context
         var response = await _responseGenerator.ProcessAsync(requestResult);
 
         await _events.RaiseAsync(new TokenIssuedSuccessEvent(response, requestResult));
-        Telemetry.Metrics.TokenIssued(clientResult.Client.ClientId, requestResult.ValidatedRequest.GrantType, false);
+        Telemetry.Metrics.TokenIssued(clientResult.Client.ClientId, requestResult.ValidatedRequest.GrantType, null);
         LogTokens(response, requestResult);
 
         // return result

diff --git a/src/IdentityServer/Validation/Models/ValidatedAuthorizeRequest.cs b/src/IdentityServer/Validation/Models/ValidatedAuthorizeRequest.cs
@@ -260,11 +260,6 @@ public class ValidatedAuthorizeRequest : ValidatedRequest
     /// </summary>
     public string? PushedAuthorizationReferenceValue { get; set; }
 
-    /// <summary>
-    /// Is this a pushed authorization request?
-    /// </summary>
-    public bool IsPushedAuthorizationRequest { get => PushedAuthorizationReferenceValue.IsPresent(); }
-
     /// <summary>
     /// Gets or sets a value indicating the context in which authorization
     /// validation is occurring (the PAR endpoint or the authorize endpoint with

diff --git a/src/Telemetry/Telemetry.cs b/src/Telemetry/Telemetry.cs
@@ -2,6 +2,7 @@
 // See LICENSE in the project root for license information.
 
 
+using Duende.IdentityServer.Validation;
 using System;
 using System.Diagnostics;
 using System.Diagnostics.Metrics;
@@ -217,9 +218,9 @@ public static class Tags
             public const string Path = "path";
 
             /// <summary>
-            /// pushed_authorization_request
+            /// authorize_request_type
             /// </summary>
-            public const string PushedAuthorizationRequest = "pushed_authorization_request";
+            public const string AuthorizeRequestType = "authorize_request_type";
 
             /// <summary>
             /// scheme
@@ -646,14 +647,14 @@ public static void RevocationFailure(string clientId, string error)
         /// </summary>
         /// <param name="clientId">Client Id</param>
         /// <param name="grantType">Grant Type</param>
-        /// <param name="isPushedAuthorizationRequest">Is this a result of a pushed authorization request?</param>
-        public static void TokenIssued(string clientId, string grantType, bool isPushedAuthorizationRequest)
+        /// <param name="requestType">Type of authorization request</param>
+        public static void TokenIssued(string clientId, string grantType, AuthorizeRequestType? requestType)
         {
             Success(clientId);
             TokenIssuedCounter.Add(1,
                 new(Tags.Client, clientId),
                 new(Tags.GrantType, grantType),
-                new(Tags.PushedAuthorizationRequest, isPushedAuthorizationRequest));
+                new(Tags.AuthorizeRequestType, requestType));
         }
 
         /// <summary>
@@ -667,14 +668,14 @@ public static void TokenIssued(string clientId, string grantType, bool isPushedA
         /// <param name="clientId">Client Id</param>
         /// <param name="grantType">Grant Type</param>
         /// <param name="error">Error</param>
-        /// <param name="isPushedAuthorizationRequest">Is this a result of a pushed authorization request?</param>
-        public static void TokenIssuedFailure(string clientId, string grantType, bool isPushedAuthorizationRequest, string error)
+        /// <param name="requestType">Type of authorization request</param>
+        public static void TokenIssuedFailure(string clientId, string grantType, AuthorizeRequestType? requestType, string error)
         {
             Failure(error, clientId);
             TokenIssuedFailureCounter.Add(1,
                 new(Tags.Client, clientId),
                 new(Tags.GrantType, grantType),
-                new(Tags.PushedAuthorizationRequest, isPushedAuthorizationRequest),
+                new(Tags.AuthorizeRequestType, requestType),
                 new(Tags.Error, error));
         }