Update the samples to use the non-generic OpenIddict managers

ekomsctr · Jan 13, 2021 · d50366c · d50366c
1 parent 8fee0c0
commit d50366c
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 45 deletions.
diff --git a/samples/Aridka/Aridka.Server/Controllers/AuthorizationController.cs b/samples/Aridka/Aridka.Server/Controllers/AuthorizationController.cs
@@ -11,18 +11,16 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.IdentityModel.Tokens;
 using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.EntityFrameworkCore.Models;
 using OpenIddict.Server.AspNetCore;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
 namespace Aridka.Server.Controllers
 {
     public class AuthorizationController : Controller
     {
-        private readonly OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication> _applicationManager;
+        private readonly IOpenIddictApplicationManager _applicationManager;
 
-        public AuthorizationController(OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication> applicationManager)
+        public AuthorizationController(IOpenIddictApplicationManager applicationManager)
             => _applicationManager = applicationManager;
 
         [HttpPost("~/connect/token"), Produces("application/json")]

diff --git a/samples/Aridka/Aridka.Server/Controllers/ResourceController.cs b/samples/Aridka/Aridka.Server/Controllers/ResourceController.cs
@@ -1,8 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using OpenIddict.Core;
-using OpenIddict.EntityFrameworkCore.Models;
+using OpenIddict.Abstractions;
 using OpenIddict.Validation.AspNetCore;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
@@ -11,12 +10,10 @@ namespace Aridka.Server.Controllers
     [Route("api")]
     public class ResourceController : Controller
     {
-        private readonly OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication> _applicationManager;
+        private readonly IOpenIddictApplicationManager _applicationManager;
 
-        public ResourceController(OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication> applicationManager)
-        {
-            _applicationManager = applicationManager;
-        }
+        public ResourceController(IOpenIddictApplicationManager applicationManager)
+            => _applicationManager = applicationManager;
 
         [Authorize(AuthenticationSchemes = OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme)]
         [HttpGet("message")]
@@ -34,7 +31,7 @@ public async Task<IActionResult> GetMessage()
                 return BadRequest();
             }
 
-            return Content($"{application.DisplayName} has been successfully authenticated.");
+            return Content($"{await _applicationManager.GetDisplayNameAsync(application)} has been successfully authenticated.");
         }
     }
 }
diff --git a/samples/Aridka/Aridka.Server/Worker.cs b/samples/Aridka/Aridka.Server/Worker.cs
@@ -5,8 +5,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.EntityFrameworkCore.Models;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
 namespace Aridka.Server
@@ -25,7 +23,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
             var context = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
             await context.Database.EnsureCreatedAsync();
 
-            var manager = scope.ServiceProvider.GetRequiredService<OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication>>();
+            var manager = scope.ServiceProvider.GetRequiredService<IOpenIddictApplicationManager>();
 
             if (await manager.FindByClientIdAsync("console") == null)
             {

diff --git a/samples/Balosar/Balosar.Server/Controllers/AuthorizationController.cs b/samples/Balosar/Balosar.Server/Controllers/AuthorizationController.cs
@@ -14,25 +14,23 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.EntityFrameworkCore.Models;
 using OpenIddict.Server.AspNetCore;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
 namespace Balosar.Server.Controllers
 {
     public class AuthorizationController : Controller
     {
-        private readonly OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication> _applicationManager;
-        private readonly OpenIddictAuthorizationManager<OpenIddictEntityFrameworkCoreAuthorization> _authorizationManager;
-        private readonly OpenIddictScopeManager<OpenIddictEntityFrameworkCoreScope> _scopeManager;
+        private readonly IOpenIddictApplicationManager _applicationManager;
+        private readonly IOpenIddictAuthorizationManager _authorizationManager;
+        private readonly IOpenIddictScopeManager _scopeManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
         private readonly UserManager<ApplicationUser> _userManager;
 
         public AuthorizationController(
-            OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication> applicationManager,
-            OpenIddictAuthorizationManager<OpenIddictEntityFrameworkCoreAuthorization> authorizationManager,
-            OpenIddictScopeManager<OpenIddictEntityFrameworkCoreScope> scopeManager,
+            IOpenIddictApplicationManager applicationManager,
+            IOpenIddictAuthorizationManager authorizationManager,
+            IOpenIddictScopeManager scopeManager,
             SignInManager<ApplicationUser> signInManager,
             UserManager<ApplicationUser> userManager)
         {

diff --git a/samples/Balosar/Balosar.Server/Worker.cs b/samples/Balosar/Balosar.Server/Worker.cs
@@ -5,8 +5,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.EntityFrameworkCore.Models;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
 namespace Balosar.Server
@@ -25,7 +23,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
             var context = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
             await context.Database.EnsureCreatedAsync();
 
-            var manager = scope.ServiceProvider.GetRequiredService<OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication>>();
+            var manager = scope.ServiceProvider.GetRequiredService<IOpenIddictApplicationManager>();
 
             if (await manager.FindByClientIdAsync("balosar-blazor-client") is null)
             {

diff --git a/samples/Velusia/Velusia.Server/Controllers/AuthorizationController.cs b/samples/Velusia/Velusia.Server/Controllers/AuthorizationController.cs
@@ -17,8 +17,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.EntityFrameworkCore.Models;
 using OpenIddict.Server.AspNetCore;
 using Velusia.Server.Helpers;
 using Velusia.Server.Models;
@@ -29,16 +27,16 @@ namespace Velusia.Server.Controllers
 {
     public class AuthorizationController : Controller
     {
-        private readonly OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication> _applicationManager;
-        private readonly OpenIddictAuthorizationManager<OpenIddictEntityFrameworkCoreAuthorization> _authorizationManager;
-        private readonly OpenIddictScopeManager<OpenIddictEntityFrameworkCoreScope> _scopeManager;
+        private readonly IOpenIddictApplicationManager _applicationManager;
+        private readonly IOpenIddictAuthorizationManager _authorizationManager;
+        private readonly IOpenIddictScopeManager _scopeManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
         private readonly UserManager<ApplicationUser> _userManager;
 
         public AuthorizationController(
-            OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication> applicationManager,
-            OpenIddictAuthorizationManager<OpenIddictEntityFrameworkCoreAuthorization> authorizationManager,
-            OpenIddictScopeManager<OpenIddictEntityFrameworkCoreScope> scopeManager,
+            IOpenIddictApplicationManager applicationManager,
+            IOpenIddictAuthorizationManager authorizationManager,
+            IOpenIddictScopeManager scopeManager,
             SignInManager<ApplicationUser> signInManager,
             UserManager<ApplicationUser> userManager)
         {

diff --git a/samples/Velusia/Velusia.Server/Worker.cs b/samples/Velusia/Velusia.Server/Worker.cs
@@ -4,8 +4,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.EntityFrameworkCore.Models;
 using Velusia.Server.Models;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
@@ -25,7 +23,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
             var context = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
             await context.Database.EnsureCreatedAsync();
 
-            var manager = scope.ServiceProvider.GetRequiredService<OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication>>();
+            var manager = scope.ServiceProvider.GetRequiredService<IOpenIddictApplicationManager>();
 
             if (await manager.FindByClientIdAsync("mvc") == null)
             {

diff --git a/samples/Zirku/Zirku.Server/Controllers/AuthorizationController.cs b/samples/Zirku/Zirku.Server/Controllers/AuthorizationController.cs
@@ -13,8 +13,6 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.EntityFrameworkCore.Models;
 using OpenIddict.Server.AspNetCore;
 using Zirku.Server.Helpers;
 using Zirku.Server.Models;
@@ -24,12 +22,12 @@ namespace Zirku.Server.Controllers
 {
     public class AuthorizationController : Controller
     {
-        private readonly OpenIddictScopeManager<OpenIddictEntityFrameworkCoreScope> _scopeManager;
+        private readonly IOpenIddictScopeManager _scopeManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
         private readonly UserManager<ApplicationUser> _userManager;
 
         public AuthorizationController(
-            OpenIddictScopeManager<OpenIddictEntityFrameworkCoreScope> scopeManager,
+            IOpenIddictScopeManager scopeManager,
             SignInManager<ApplicationUser> signInManager,
             UserManager<ApplicationUser> userManager)
         {

diff --git a/samples/Zirku/Zirku.Server/Worker.cs b/samples/Zirku/Zirku.Server/Worker.cs
@@ -4,8 +4,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using OpenIddict.Abstractions;
-using OpenIddict.Core;
-using OpenIddict.EntityFrameworkCore.Models;
 using Zirku.Server.Models;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
@@ -30,7 +28,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
 
             async Task CreateApplicationsAsync()
             {
-                var manager = scope.ServiceProvider.GetRequiredService<OpenIddictApplicationManager<OpenIddictEntityFrameworkCoreApplication>>();
+                var manager = scope.ServiceProvider.GetRequiredService<IOpenIddictApplicationManager>();
 
                 if (await manager.FindByClientIdAsync("aurelia") == null)
                 {
@@ -86,7 +84,7 @@ async Task CreateApplicationsAsync()
 
             async Task CreateScopesAsync()
             {
-                var manager = scope.ServiceProvider.GetRequiredService<OpenIddictScopeManager<OpenIddictEntityFrameworkCoreScope>>();
+                var manager = scope.ServiceProvider.GetRequiredService<IOpenIddictScopeManager>();
 
                 if (await manager.FindByNameAsync("api1") == null)
                 {