Add User Info Endpoint

Sample/ClientApp_OpenId/Program.cs

@@ -23,6 +23,7 @@
         options.CallbackPath = "/signin-oidc";
         options.SaveTokens = true;
         options.Scope.Add("jwtapitestapp.read");
+       // options.GetClaimsFromUserInfoEndpoint = true;
     });
 
 

Server/src/OAuth20.Server/Controllers/DiscoveryEndpointController.cs

@@ -28,7 +28,7 @@ public JsonResult GetConfiguration()
                 acr_values_supported = new string[] {"urn:mace:incommon:iap:silver", "urn:mace:incommon:iap:bronze"},
                 response_types_supported = new string[] { "code", "code id_token", "id_token", "token id_token" },
                 subject_types_supported = new string[] { "public", "pairwise" },
-
+                user_info_endpoint = "https://localhost:7275/UserInfo/GetUserInfo",
                 userinfo_encryption_enc_values_supported = new string[] { "A128CBC-HS256", "A128GCM" },
                 id_token_signing_alg_values_supported = new string[] { "RS256", "ES256", "HS256" , "SHA256" },
                 id_token_encryption_alg_values_supported = new string[] { "RSA1_5", "A128KW" },

Server/src/OAuth20.Server/Controllers/UserInfoController.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using OAuth20.Server.Services;
 using System.Threading.Tasks;
 
 namespace OAuth20.Server.Controllers
@@ -7,10 +8,16 @@ namespace OAuth20.Server.Controllers
     [ApiController]
     public class UserInfoController : ControllerBase
     {
+        private readonly IUserInfoService _userInfoService;
+        public UserInfoController(IUserInfoService userInfoService)
+        {
+            _userInfoService = userInfoService;
+        }
         [HttpGet, HttpPost]
-        public async Task<IActionResult> UserInfo()
+        public async Task<IActionResult> GetUserInfo()
         {
-            return Ok();
+            var userInfo = await _userInfoService.GetUserInfoAsync();
+            return Ok(userInfo);
         }
     }
 }

Server/src/OAuth20.Server/OAuthResponse/UserInfoResponse.cs

@@ -1,4 +1,6 @@
-namespace OAuth20.Server.OAuthResponse
+using System.Text.Json.Serialization;
+
+namespace OAuth20.Server.OAuthResponse
 {
     public class UserInfoResponse 
     {
@@ -13,5 +15,17 @@ public class UserInfoResponse
         /// Returned result as json.
         /// </summary>
         public string Claims { get; set; }
+
+        [JsonPropertyName("sub")]
+        public string Sub { get; set; }
+
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        [JsonPropertyName("email")]
+        public string Email { get; set; }
+
+        [JsonPropertyName("email_verified")]
+        public bool EmailVerified { get; set; }
     }
 }

Server/src/OAuth20.Server/OauthResponse/DiscoveryResponse.cs

@@ -17,7 +17,7 @@ public class DiscoveryResponse
         public string token_endpoint { get; set; }
         public IList<string> token_endpoint_auth_methods_supported { get; set; }
         public IList<string> token_endpoint_auth_signing_alg_values_supported { get; set; }
-        public string userinfo_endpoint { get; set; }
+        public string user_info_endpoint { get; set; }
         public string check_session_iframe { get; set; }
         public string end_session_endpoint { get; set; }
         public string jwks_uri { get; set; }

Server/src/OAuth20.Server/Program.cs

@@ -62,6 +62,8 @@ Everyone is permitted to copy and distribute verbatim copies
 builder.Services.TryAddScoped<ITokenRevocationValidation, TokenRevocationValidation>();
 builder.Services.TryAddScoped<ITokenIntrospectionValidation, TokenIntrospectionValidation>();
 builder.Services.AddScoped<IClientService, ClientService>();
+builder.Services.AddScoped<IUserInfoService, UserInfoService>();
+builder.Services.AddScoped<IBearerTokenUsageTypeValidation, BearerTokenUsageTypeValidation>();
 builder.Services.AddHttpContextAccessor();
 
 builder.Services.Configure<RouteOptions>(options =>

Server/src/OAuth20.Server/Services/UserInfoService.cs

@@ -7,16 +7,14 @@ Everyone is permitted to copy and distribute verbatim copies
  */
 
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
-using NuGet.Versioning;
 using OAuth20.Server.Configuration;
-using OAuth20.Server.OauthRequest;
 using OAuth20.Server.OAuthResponse;
 using OAuth20.Server.Services.Users;
 using OAuth20.Server.Validations;
 using System;
-using System.ComponentModel.DataAnnotations;
 using System.IdentityModel.Tokens.Jwt;
 using System.IO;
 using System.Linq;
@@ -27,27 +25,30 @@ namespace OAuth20.Server.Services;
 
 public interface IUserInfoService
 {
-
+    Task<UserInfoResponse> GetUserInfoAsync();
 }
-public class UserInfoService
+public class UserInfoService : IUserInfoService
 {
     private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly IBearerTokenUsageTypeValidation _bearerTokenUsageTypeValidation;
     private readonly OAuthServerOptions _optionsMonitor;
     private readonly IClientService _clientService;
     private readonly IUserManagerService _userManagerService;
+    private readonly ILogger<UserInfoService> _logger;
 
     public UserInfoService(IHttpContextAccessor httpContextAccessor,
          IBearerTokenUsageTypeValidation bearerTokenUsageTypeValidation,
          IOptionsMonitor<OAuthServerOptions> optionsMonitor,
          IClientService clientService,
-         IUserManagerService userManagerService)
+         IUserManagerService userManagerService,
+         ILogger<UserInfoService> logger)
     {
         _httpContextAccessor = httpContextAccessor;
         _bearerTokenUsageTypeValidation = bearerTokenUsageTypeValidation;
         _optionsMonitor = optionsMonitor.CurrentValue ?? new OAuthServerOptions();
         _clientService = clientService;
         _userManagerService = userManagerService;
+        _logger = logger;
     }
 
     public async Task<UserInfoResponse> GetUserInfoAsync()
@@ -113,6 +114,10 @@ public async Task<UserInfoResponse> GetUserInfoAsync()
 
                     string scope = (tokenValidationReslt.Claims.FirstOrDefault(x => x.Key == "scope").Value).ToString();
 
+                    response.Sub = userId;
+                    response.EmailVerified = user.EmailConfirmed;
+                    response.Email = user.Email;
+                    response.Name = user.Email;
 
                     //response.Active = true;
                     //response.TokenType = "access_token";
@@ -126,6 +131,7 @@ public async Task<UserInfoResponse> GetUserInfoAsync()
             }
             catch (Exception ex) // maybe SecurityTokenException
             {
+                _logger.LogCritical("There is an exception during fetching the user info, {exception}", ex);
                 response.Claims = null;
                 response.Succeeded = false;
                 response.Error = "invalid_token";