From d50366ce4ad3385a3f00bb0bbdc880f5168ad0c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Wed, 13 Jan 2021 05:56:24 +0100 Subject: [PATCH] Update the samples to use the non-generic OpenIddict managers --- .../Controllers/AuthorizationController.cs | 6 ++---- .../Controllers/ResourceController.cs | 13 +++++-------- samples/Aridka/Aridka.Server/Worker.cs | 4 +--- .../Controllers/AuthorizationController.cs | 14 ++++++-------- samples/Balosar/Balosar.Server/Worker.cs | 4 +--- .../Controllers/AuthorizationController.cs | 14 ++++++-------- samples/Velusia/Velusia.Server/Worker.cs | 4 +--- .../Controllers/AuthorizationController.cs | 6 ++---- samples/Zirku/Zirku.Server/Worker.cs | 6 ++---- 9 files changed, 26 insertions(+), 45 deletions(-) diff --git a/samples/Aridka/Aridka.Server/Controllers/AuthorizationController.cs b/samples/Aridka/Aridka.Server/Controllers/AuthorizationController.cs index 0c099133a..62645b6bc 100644 --- a/samples/Aridka/Aridka.Server/Controllers/AuthorizationController.cs +++ b/samples/Aridka/Aridka.Server/Controllers/AuthorizationController.cs @@ -11,8 +11,6 @@ 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; @@ -20,9 +18,9 @@ namespace Aridka.Server.Controllers { public class AuthorizationController : Controller { - private readonly OpenIddictApplicationManager _applicationManager; + private readonly IOpenIddictApplicationManager _applicationManager; - public AuthorizationController(OpenIddictApplicationManager 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 index 40c6b1978..c081a4f4e 100644 --- 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 _applicationManager; + private readonly IOpenIddictApplicationManager _applicationManager; - public ResourceController(OpenIddictApplicationManager applicationManager) - { - _applicationManager = applicationManager; - } + public ResourceController(IOpenIddictApplicationManager applicationManager) + => _applicationManager = applicationManager; [Authorize(AuthenticationSchemes = OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme)] [HttpGet("message")] @@ -34,7 +31,7 @@ public async Task GetMessage() return BadRequest(); } - return Content($"{application.DisplayName} has been successfully authenticated."); + return Content($"{await _applicationManager.GetDisplayNameAsync(application)} has been successfully authenticated."); } } } \ No newline at end of file diff --git a/samples/Aridka/Aridka.Server/Worker.cs b/samples/Aridka/Aridka.Server/Worker.cs index 40cc3e392..9126741bb 100644 --- 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(); await context.Database.EnsureCreatedAsync(); - var manager = scope.ServiceProvider.GetRequiredService>(); + var manager = scope.ServiceProvider.GetRequiredService(); if (await manager.FindByClientIdAsync("console") == null) { diff --git a/samples/Balosar/Balosar.Server/Controllers/AuthorizationController.cs b/samples/Balosar/Balosar.Server/Controllers/AuthorizationController.cs index 5315c77a2..180a723bf 100644 --- a/samples/Balosar/Balosar.Server/Controllers/AuthorizationController.cs +++ b/samples/Balosar/Balosar.Server/Controllers/AuthorizationController.cs @@ -14,8 +14,6 @@ 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; @@ -23,16 +21,16 @@ namespace Balosar.Server.Controllers { public class AuthorizationController : Controller { - private readonly OpenIddictApplicationManager _applicationManager; - private readonly OpenIddictAuthorizationManager _authorizationManager; - private readonly OpenIddictScopeManager _scopeManager; + private readonly IOpenIddictApplicationManager _applicationManager; + private readonly IOpenIddictAuthorizationManager _authorizationManager; + private readonly IOpenIddictScopeManager _scopeManager; private readonly SignInManager _signInManager; private readonly UserManager _userManager; public AuthorizationController( - OpenIddictApplicationManager applicationManager, - OpenIddictAuthorizationManager authorizationManager, - OpenIddictScopeManager scopeManager, + IOpenIddictApplicationManager applicationManager, + IOpenIddictAuthorizationManager authorizationManager, + IOpenIddictScopeManager scopeManager, SignInManager signInManager, UserManager userManager) { diff --git a/samples/Balosar/Balosar.Server/Worker.cs b/samples/Balosar/Balosar.Server/Worker.cs index 97d9bf0af..2cd999977 100644 --- 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(); await context.Database.EnsureCreatedAsync(); - var manager = scope.ServiceProvider.GetRequiredService>(); + var manager = scope.ServiceProvider.GetRequiredService(); 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 index 1fa1d471a..b19eecfa3 100644 --- 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 _applicationManager; - private readonly OpenIddictAuthorizationManager _authorizationManager; - private readonly OpenIddictScopeManager _scopeManager; + private readonly IOpenIddictApplicationManager _applicationManager; + private readonly IOpenIddictAuthorizationManager _authorizationManager; + private readonly IOpenIddictScopeManager _scopeManager; private readonly SignInManager _signInManager; private readonly UserManager _userManager; public AuthorizationController( - OpenIddictApplicationManager applicationManager, - OpenIddictAuthorizationManager authorizationManager, - OpenIddictScopeManager scopeManager, + IOpenIddictApplicationManager applicationManager, + IOpenIddictAuthorizationManager authorizationManager, + IOpenIddictScopeManager scopeManager, SignInManager signInManager, UserManager userManager) { diff --git a/samples/Velusia/Velusia.Server/Worker.cs b/samples/Velusia/Velusia.Server/Worker.cs index 29cc554a4..6155301f8 100644 --- 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(); await context.Database.EnsureCreatedAsync(); - var manager = scope.ServiceProvider.GetRequiredService>(); + var manager = scope.ServiceProvider.GetRequiredService(); if (await manager.FindByClientIdAsync("mvc") == null) { diff --git a/samples/Zirku/Zirku.Server/Controllers/AuthorizationController.cs b/samples/Zirku/Zirku.Server/Controllers/AuthorizationController.cs index 7d215ca89..5418eb3d0 100644 --- 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 _scopeManager; + private readonly IOpenIddictScopeManager _scopeManager; private readonly SignInManager _signInManager; private readonly UserManager _userManager; public AuthorizationController( - OpenIddictScopeManager scopeManager, + IOpenIddictScopeManager scopeManager, SignInManager signInManager, UserManager userManager) { diff --git a/samples/Zirku/Zirku.Server/Worker.cs b/samples/Zirku/Zirku.Server/Worker.cs index f1ccb2fe5..66989135a 100644 --- 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>(); + var manager = scope.ServiceProvider.GetRequiredService(); if (await manager.FindByClientIdAsync("aurelia") == null) { @@ -86,7 +84,7 @@ async Task CreateApplicationsAsync() async Task CreateScopesAsync() { - var manager = scope.ServiceProvider.GetRequiredService>(); + var manager = scope.ServiceProvider.GetRequiredService(); if (await manager.FindByNameAsync("api1") == null) {