Cleaned up accessor usage

Author: scottbrady91

src/IdentityManager2/Api/Controllers/UsersController.cs

@@ -9,8 +9,6 @@
 using IdentityManager2.Resources;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Mvc.Routing;
 using static System.String;
 
 namespace IdentityManager2.Api.Controllers
@@ -21,15 +19,11 @@ namespace IdentityManager2.Api.Controllers
     public class UsersController : Controller
     {
         private readonly IIdentityManagerService service;
-        private readonly IUrlHelperFactory urlHelperFactory;
-        private readonly IActionContextAccessor actionContextAccessor;
         private IdentityManagerMetadata metadata;
 
-        public UsersController(IIdentityManagerService service, IUrlHelperFactory urlHelperFactory, IActionContextAccessor actionContextAccessor)
+        public UsersController(IIdentityManagerService service)
         {
             this.service = service ?? throw new ArgumentNullException(nameof(service));
-            this.urlHelperFactory = urlHelperFactory ?? throw new ArgumentNullException(nameof(urlHelperFactory));
-            this.actionContextAccessor = actionContextAccessor ?? throw new ArgumentNullException(nameof(actionContextAccessor));
         }
 
         public async Task<IdentityManagerMetadata> GetMetadataAsync()
@@ -52,9 +46,7 @@ public async Task<IActionResult> GetUsersAsync(string filter = null, int start =
             {
                 var meta = await GetMetadataAsync();
 
-                var resource = new UserQueryResultResource(result.Result,
-                    urlHelperFactory.GetUrlHelper(actionContextAccessor.ActionContext),
-                    meta.UserMetadata);
+                var resource = new UserQueryResultResource(result.Result, Url, meta.UserMetadata);
                 return Ok(resource);
             }
 
@@ -82,13 +74,11 @@ public async Task<IActionResult> CreateUserAsync([FromBody] PropertyValue[] prop
                 var result = await service.CreateUserAsync(properties);
                 if (result.IsSuccess)
                 {
-                    var urlHelper = urlHelperFactory.GetUrlHelper(actionContextAccessor.ActionContext);
-
-                    var url = urlHelper.Link(IdentityManagerConstants.RouteNames.GetUser, new { subject = result.Result.Subject });
+                    var url = Url.Link(IdentityManagerConstants.RouteNames.GetUser, new {subject = result.Result.Subject});
                     var resource = new
                     {
-                        Data = new { subject = result.Result.Subject },
-                        Links = new { detail = url }
+                        Data = new {subject = result.Result.Subject},
+                        Links = new {detail = url}
                     };
 
                     return Created(url, resource);

src/IdentityManager2/Configuration/DependencyInjection/IdentityManagerServiceCollectionExtensions.cs

@@ -3,10 +3,6 @@
 using IdentityManager2;
 using IdentityManager2.Configuration;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Mvc.Routing;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -19,18 +15,10 @@ public static IIdentityManagerBuilder AddIdentityManager(this IServiceCollection
 
             var identityManagerOptions = services.BuildServiceProvider().GetRequiredService<IOptions<IdentityManagerOptions>>().Value;
             identityManagerOptions.Validate();
-            
+
             services.AddControllersWithViews()
                 .AddNewtonsoftJson();
 
-            services.AddHttpContextAccessor();
-            services.TryAddSingleton<IActionContextAccessor, ActionContextAccessor>();
-            services.TryAddSingleton<IUrlHelper>(x =>
-            {
-                var actionContext = x.GetService<IActionContextAccessor>().ActionContext;
-                return new UrlHelper(actionContext);
-            });
-            
             // IdentityManager API authentication scheme
             services.AddAuthentication()
                 .AddCookie(IdentityManagerConstants.LocalApiScheme, options =>
@@ -44,7 +32,6 @@ public static IIdentityManagerBuilder AddIdentityManager(this IServiceCollection
                     // TODO: API Cookie: SlidingExpiration
                     // TODO: API Cookie: ExpireTimeSpan
 
-                    //options.ForwardChallenge = identityManagerOptions.SecurityConfiguration.HostChallengeType;
                     options.LoginPath = "/api/login";
 
                     options.Events.OnRedirectToLogin = context =>