diff --git a/samples/SamplePermissions/InvoicesDbContext.cs b/samples/SamplePermissions/InvoicesDbContext.cs index 43d0b02..eccd84c 100644 --- a/samples/SamplePermissions/InvoicesDbContext.cs +++ b/samples/SamplePermissions/InvoicesDbContext.cs @@ -1,5 +1,6 @@ namespace SamplePermissions { + using System; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ValueGeneration; using SamplePermissions.Model; diff --git a/samples/SamplePermissions/Model/Invoice.cs b/samples/SamplePermissions/Model/Invoice.cs index 654c06c..e488d1a 100644 --- a/samples/SamplePermissions/Model/Invoice.cs +++ b/samples/SamplePermissions/Model/Invoice.cs @@ -1,5 +1,7 @@ namespace SamplePermissions.Model { + using System; + public class Invoice { public Guid Id { get; set; } diff --git a/samples/SamplePermissions/Pages/Error.cshtml.cs b/samples/SamplePermissions/Pages/Error.cshtml.cs index 7eae98d..c71863d 100644 --- a/samples/SamplePermissions/Pages/Error.cshtml.cs +++ b/samples/SamplePermissions/Pages/Error.cshtml.cs @@ -3,19 +3,20 @@ namespace SamplePermissions.Pages using System.Diagnostics; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] [IgnoreAntiforgeryToken] public class ErrorModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public ErrorModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } - public string? RequestId { get; set; } + public string RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(this.RequestId); diff --git a/samples/SamplePermissions/Pages/Index.cshtml.cs b/samples/SamplePermissions/Pages/Index.cshtml.cs index ce78c19..c10dc7e 100644 --- a/samples/SamplePermissions/Pages/Index.cshtml.cs +++ b/samples/SamplePermissions/Pages/Index.cshtml.cs @@ -1,14 +1,15 @@ namespace SamplePermissions.Pages { using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; public class IndexModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public IndexModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SamplePermissions/Pages/InvoiceDelete.cshtml.cs b/samples/SamplePermissions/Pages/InvoiceDelete.cshtml.cs index 1e740cc..73f514a 100644 --- a/samples/SamplePermissions/Pages/InvoiceDelete.cshtml.cs +++ b/samples/SamplePermissions/Pages/InvoiceDelete.cshtml.cs @@ -1,17 +1,20 @@ namespace SamplePermissions.Pages { + using System; + using System.Linq; using AspNetCore.Authorization.Permissions; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; using SamplePermissions.Model; [HasPermission("Invoice.Delete")] public class InvoiceDeleteModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoiceDeleteModel(ILogger logger, InvoicesDbContext context) { - this._logger = logger; + this.logger = logger; this.Context = context; } diff --git a/samples/SamplePermissions/Pages/InvoicePayment.cshtml.cs b/samples/SamplePermissions/Pages/InvoicePayment.cshtml.cs index 4db6701..44fb5a8 100644 --- a/samples/SamplePermissions/Pages/InvoicePayment.cshtml.cs +++ b/samples/SamplePermissions/Pages/InvoicePayment.cshtml.cs @@ -2,15 +2,16 @@ { using AspNetCore.Authorization.Permissions; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [HasPermission("Invoice.Payment")] public class InvoicePaymentModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoicePaymentModel(ILogger logger, ApplicationDbContext context) { - this._logger = logger; + this.logger = logger; this.Context = context; } diff --git a/samples/SamplePermissions/Pages/InvoiceRead.cshtml.cs b/samples/SamplePermissions/Pages/InvoiceRead.cshtml.cs index f973357..6f8e02a 100644 --- a/samples/SamplePermissions/Pages/InvoiceRead.cshtml.cs +++ b/samples/SamplePermissions/Pages/InvoiceRead.cshtml.cs @@ -1,18 +1,18 @@ namespace SamplePermissions.Pages { using AspNetCore.Authorization.Permissions.Abstractions; - using Fluxera.Utilities.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; // [HasPermission("Invoice.Read")] public class InvoiceReadModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoiceReadModel(ILogger logger, InvoicesDbContext context) { - this._logger = logger; + this.logger = logger; this.Context = context; } @@ -22,7 +22,7 @@ public IActionResult OnGet() { if(!this.User.HasPermission("Invoice.Read")) { - if(this.User.IsAuthenticated()) + if(this.User.Identity != null && this.User.Identity.IsAuthenticated) { return this.Forbid(); } diff --git a/samples/SamplePermissions/Pages/InvoiceSend.cshtml.cs b/samples/SamplePermissions/Pages/InvoiceSend.cshtml.cs index 5b4826a..e21d337 100644 --- a/samples/SamplePermissions/Pages/InvoiceSend.cshtml.cs +++ b/samples/SamplePermissions/Pages/InvoiceSend.cshtml.cs @@ -2,15 +2,16 @@ { using AspNetCore.Authorization.Permissions; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [HasPermission("Invoice.Send")] public class InvoiceSendModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoiceSendModel(ILogger logger, ApplicationDbContext context) { - this._logger = logger; + this.logger = logger; this.Context = context; } diff --git a/samples/SamplePermissions/Pages/InvoiceWrite.cshtml.cs b/samples/SamplePermissions/Pages/InvoiceWrite.cshtml.cs index c883654..7b93a3f 100644 --- a/samples/SamplePermissions/Pages/InvoiceWrite.cshtml.cs +++ b/samples/SamplePermissions/Pages/InvoiceWrite.cshtml.cs @@ -2,16 +2,17 @@ { using AspNetCore.Authorization.Permissions; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; using SamplePermissions.Model; [HasPermission("Invoice.Write")] public class InvoiceWriteModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoiceWriteModel(ILogger logger, InvoicesDbContext context) { - this._logger = logger; + this.logger = logger; this.Context = context; } diff --git a/samples/SamplePermissions/Pages/Invoices.cshtml.cs b/samples/SamplePermissions/Pages/Invoices.cshtml.cs index b09edcc..1e40e95 100644 --- a/samples/SamplePermissions/Pages/Invoices.cshtml.cs +++ b/samples/SamplePermissions/Pages/Invoices.cshtml.cs @@ -2,15 +2,16 @@ { using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [Authorize] public class InvoicesModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoicesModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SamplePermissions/Pages/Permissions.cshtml.cs b/samples/SamplePermissions/Pages/Permissions.cshtml.cs index 4e09d49..719afe5 100644 --- a/samples/SamplePermissions/Pages/Permissions.cshtml.cs +++ b/samples/SamplePermissions/Pages/Permissions.cshtml.cs @@ -2,15 +2,16 @@ { using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [Authorize] public class PermissionsModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public PermissionsModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SamplePermissions/Pages/Shared/_Layout.cshtml b/samples/SamplePermissions/Pages/Shared/_Layout.cshtml index d34c783..0410a6d 100644 --- a/samples/SamplePermissions/Pages/Shared/_Layout.cshtml +++ b/samples/SamplePermissions/Pages/Shared/_Layout.cshtml @@ -1,5 +1,4 @@ -@using Fluxera.Utilities.Extensions - + @@ -23,7 +22,7 @@
  • Home
    • - @if(this.User.IsAuthenticated()) + @if (this.User.Identity != null && this.User.Identity.IsAuthenticated) {
  • Invoices diff --git a/samples/SamplePermissions/Pages/Shared/_LoginPartial.cshtml b/samples/SamplePermissions/Pages/Shared/_LoginPartial.cshtml index 8e0a723..33662e9 100644 --- a/samples/SamplePermissions/Pages/Shared/_LoginPartial.cshtml +++ b/samples/SamplePermissions/Pages/Shared/_LoginPartial.cshtml @@ -1,10 +1,10 @@ @using AspNetCore.Authorization.Permissions.Identity @using Microsoft.AspNetCore.Identity -@inject SignInManager SignInManager -@inject UserManager UserManager +@inject SignInManager signInManager +@inject UserManager userManager
      -@if (SignInManager.IsSignedIn(User)) +@if (signInManager.IsSignedIn(User)) {
    • Hello @User.Identity?.Name! diff --git a/samples/SamplePermissions/Program.cs b/samples/SamplePermissions/Program.cs index 575e413..252b6e9 100644 --- a/samples/SamplePermissions/Program.cs +++ b/samples/SamplePermissions/Program.cs @@ -1,8 +1,10 @@ using AspNetCore.Authorization.Permissions; using AspNetCore.Authorization.Permissions.Identity; using AspNetCore.Authorization.Permissions.Identity.EntityFrameworkCore; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using SamplePermissions; WebApplicationBuilder builder = WebApplication.CreateBuilder(args); diff --git a/samples/SamplePermissions/SamplePermissions.csproj b/samples/SamplePermissions/SamplePermissions.csproj index dfa34ba..7777a24 100644 --- a/samples/SamplePermissions/SamplePermissions.csproj +++ b/samples/SamplePermissions/SamplePermissions.csproj @@ -1,33 +1,33 @@ - + - - net6.0 - disable - enable - + + net6.0 + latest + disable + disable + - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - - - - - - - - - + + + + + - + \ No newline at end of file diff --git a/samples/SampleTenant/InvoicesDbContext.cs b/samples/SampleTenant/InvoicesDbContext.cs index fd16df6..8679475 100644 --- a/samples/SampleTenant/InvoicesDbContext.cs +++ b/samples/SampleTenant/InvoicesDbContext.cs @@ -1,5 +1,6 @@ namespace SampleTenant { + using System; using AspNetCore.Authorization.Permissions.Abstractions; using AspNetCore.Authorization.Permissions.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; diff --git a/samples/SampleTenant/Model/Invoice.cs b/samples/SampleTenant/Model/Invoice.cs index c857cae..f652df2 100644 --- a/samples/SampleTenant/Model/Invoice.cs +++ b/samples/SampleTenant/Model/Invoice.cs @@ -1,5 +1,6 @@ namespace SampleTenant.Model { + using System; using AspNetCore.Authorization.Permissions.Abstractions; public class Invoice : ITenantObject diff --git a/samples/SampleTenant/Pages/Error.cshtml.cs b/samples/SampleTenant/Pages/Error.cshtml.cs index 1aa5f04..aa929a5 100644 --- a/samples/SampleTenant/Pages/Error.cshtml.cs +++ b/samples/SampleTenant/Pages/Error.cshtml.cs @@ -3,19 +3,20 @@ namespace SampleTenant.Pages using System.Diagnostics; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] [IgnoreAntiforgeryToken] public class ErrorModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public ErrorModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } - public string? RequestId { get; set; } + public string RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(this.RequestId); diff --git a/samples/SampleTenant/Pages/Index.cshtml.cs b/samples/SampleTenant/Pages/Index.cshtml.cs index f456e85..4d81888 100644 --- a/samples/SampleTenant/Pages/Index.cshtml.cs +++ b/samples/SampleTenant/Pages/Index.cshtml.cs @@ -1,14 +1,15 @@ namespace SampleTenant.Pages { using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; public class IndexModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public IndexModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SampleTenant/Pages/InvoiceDelete.cshtml.cs b/samples/SampleTenant/Pages/InvoiceDelete.cshtml.cs index 3497fc2..f1f2895 100644 --- a/samples/SampleTenant/Pages/InvoiceDelete.cshtml.cs +++ b/samples/SampleTenant/Pages/InvoiceDelete.cshtml.cs @@ -1,18 +1,21 @@ namespace SampleTenant.Pages { + using System; + using System.Linq; using AspNetCore.Authorization.Permissions; using AspNetCore.Authorization.Permissions.Abstractions; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; using SampleTenant.Model; [HasPermission("Invoice.Delete")] public class InvoiceDeleteModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoiceDeleteModel(ILogger logger, InvoicesDbContext context) { - this._logger = logger; + this.logger = logger; this.Context = context; } diff --git a/samples/SampleTenant/Pages/InvoicePayment.cshtml.cs b/samples/SampleTenant/Pages/InvoicePayment.cshtml.cs index 09c1aa3..8477693 100644 --- a/samples/SampleTenant/Pages/InvoicePayment.cshtml.cs +++ b/samples/SampleTenant/Pages/InvoicePayment.cshtml.cs @@ -2,15 +2,16 @@ { using AspNetCore.Authorization.Permissions; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [HasPermission("Invoice.Payment")] public class InvoicePaymentModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoicePaymentModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SampleTenant/Pages/InvoiceRead.cshtml.cs b/samples/SampleTenant/Pages/InvoiceRead.cshtml.cs index 4674533..1cc6d86 100644 --- a/samples/SampleTenant/Pages/InvoiceRead.cshtml.cs +++ b/samples/SampleTenant/Pages/InvoiceRead.cshtml.cs @@ -1,18 +1,18 @@ namespace SampleTenant.Pages { using AspNetCore.Authorization.Permissions.Abstractions; - using Fluxera.Utilities.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; // [HasPermission("Invoice.Read")] public class InvoiceReadModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoiceReadModel(ILogger logger, InvoicesDbContext context) { - this._logger = logger; + this.logger = logger; this.Context = context; } @@ -22,7 +22,7 @@ public IActionResult OnGet() { if(!this.User.HasPermission("Invoice.Read")) { - if(this.User.IsAuthenticated()) + if(this.User.Identity != null && this.User.Identity.IsAuthenticated) { return this.Forbid(); } diff --git a/samples/SampleTenant/Pages/InvoiceSend.cshtml.cs b/samples/SampleTenant/Pages/InvoiceSend.cshtml.cs index 9845456..1567425 100644 --- a/samples/SampleTenant/Pages/InvoiceSend.cshtml.cs +++ b/samples/SampleTenant/Pages/InvoiceSend.cshtml.cs @@ -2,15 +2,16 @@ { using AspNetCore.Authorization.Permissions; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [HasPermission("Invoice.Send")] public class InvoiceSendModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoiceSendModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SampleTenant/Pages/InvoiceStatistics.cshtml.cs b/samples/SampleTenant/Pages/InvoiceStatistics.cshtml.cs index 5de58ed..ffb3186 100644 --- a/samples/SampleTenant/Pages/InvoiceStatistics.cshtml.cs +++ b/samples/SampleTenant/Pages/InvoiceStatistics.cshtml.cs @@ -2,15 +2,16 @@ { using AspNetCore.Authorization.Permissions; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [HasPermission("Invoice.Statistics")] public class InvoiceStatisticsModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoiceStatisticsModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SampleTenant/Pages/InvoiceTaxExport.cshtml.cs b/samples/SampleTenant/Pages/InvoiceTaxExport.cshtml.cs index 188408b..cf9cb15 100644 --- a/samples/SampleTenant/Pages/InvoiceTaxExport.cshtml.cs +++ b/samples/SampleTenant/Pages/InvoiceTaxExport.cshtml.cs @@ -2,15 +2,16 @@ { using AspNetCore.Authorization.Permissions; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [HasPermission("Invoice.TaxExport")] public class InvoiceTaxExportModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoiceTaxExportModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SampleTenant/Pages/InvoiceWrite.cshtml.cs b/samples/SampleTenant/Pages/InvoiceWrite.cshtml.cs index bece1d2..f88d3a1 100644 --- a/samples/SampleTenant/Pages/InvoiceWrite.cshtml.cs +++ b/samples/SampleTenant/Pages/InvoiceWrite.cshtml.cs @@ -2,16 +2,17 @@ { using AspNetCore.Authorization.Permissions; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; using SampleTenant.Model; [HasPermission("Invoice.Write")] public class InvoiceWriteModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoiceWriteModel(ILogger logger, InvoicesDbContext context) { - this._logger = logger; + this.logger = logger; this.Context = context; } diff --git a/samples/SampleTenant/Pages/Invoices.cshtml.cs b/samples/SampleTenant/Pages/Invoices.cshtml.cs index 6da3348..e2ccdd6 100644 --- a/samples/SampleTenant/Pages/Invoices.cshtml.cs +++ b/samples/SampleTenant/Pages/Invoices.cshtml.cs @@ -2,15 +2,16 @@ { using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [Authorize] public class InvoicesModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public InvoicesModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SampleTenant/Pages/Permissions.cshtml.cs b/samples/SampleTenant/Pages/Permissions.cshtml.cs index 7c5e72b..5f70cad 100644 --- a/samples/SampleTenant/Pages/Permissions.cshtml.cs +++ b/samples/SampleTenant/Pages/Permissions.cshtml.cs @@ -2,15 +2,16 @@ { using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [Authorize] public class PermissionsModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public PermissionsModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SampleTenant/Pages/Privacy.cshtml.cs b/samples/SampleTenant/Pages/Privacy.cshtml.cs index 94f28d2..89159a6 100644 --- a/samples/SampleTenant/Pages/Privacy.cshtml.cs +++ b/samples/SampleTenant/Pages/Privacy.cshtml.cs @@ -1,14 +1,15 @@ namespace SampleTenant.Pages { using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; public class PrivacyModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public PrivacyModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SampleTenant/Pages/Shared/_Layout.cshtml b/samples/SampleTenant/Pages/Shared/_Layout.cshtml index 075ac49..705031d 100644 --- a/samples/SampleTenant/Pages/Shared/_Layout.cshtml +++ b/samples/SampleTenant/Pages/Shared/_Layout.cshtml @@ -1,5 +1,4 @@ -@using Fluxera.Utilities.Extensions - + @@ -23,7 +22,7 @@
    • Home
      • - @if(this.User.IsAuthenticated()) + @if (this.User.Identity != null && this.User.Identity.IsAuthenticated) {
    • Invoices diff --git a/samples/SampleTenant/Pages/Shared/_LoginPartial.cshtml b/samples/SampleTenant/Pages/Shared/_LoginPartial.cshtml index 8e0a723..33662e9 100644 --- a/samples/SampleTenant/Pages/Shared/_LoginPartial.cshtml +++ b/samples/SampleTenant/Pages/Shared/_LoginPartial.cshtml @@ -1,10 +1,10 @@ @using AspNetCore.Authorization.Permissions.Identity @using Microsoft.AspNetCore.Identity -@inject SignInManager SignInManager -@inject UserManager UserManager +@inject SignInManager signInManager +@inject UserManager userManager
        -@if (SignInManager.IsSignedIn(User)) +@if (signInManager.IsSignedIn(User)) {
      • Hello @User.Identity?.Name! diff --git a/samples/SampleTenant/Pages/Tenant.cshtml.cs b/samples/SampleTenant/Pages/Tenant.cshtml.cs index c3c422e..f206eac 100644 --- a/samples/SampleTenant/Pages/Tenant.cshtml.cs +++ b/samples/SampleTenant/Pages/Tenant.cshtml.cs @@ -2,15 +2,16 @@ { using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; + using Microsoft.Extensions.Logging; [Authorize] public class TenantModel : PageModel { - private readonly ILogger _logger; + private readonly ILogger logger; public TenantModel(ILogger logger) { - this._logger = logger; + this.logger = logger; } public void OnGet() diff --git a/samples/SampleTenant/Program.cs b/samples/SampleTenant/Program.cs index a657ac7..3d8f50c 100644 --- a/samples/SampleTenant/Program.cs +++ b/samples/SampleTenant/Program.cs @@ -1,8 +1,10 @@ using AspNetCore.Authorization.Permissions; using AspNetCore.Authorization.Permissions.Identity; using AspNetCore.Authorization.Permissions.Identity.EntityFrameworkCore; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using SampleTenant; WebApplicationBuilder builder = WebApplication.CreateBuilder(args); diff --git a/samples/SampleTenant/SampleTenant.csproj b/samples/SampleTenant/SampleTenant.csproj index 121d561..35ede6f 100644 --- a/samples/SampleTenant/SampleTenant.csproj +++ b/samples/SampleTenant/SampleTenant.csproj @@ -2,22 +2,23 @@ net6.0 + latest disable - enable + disable - + - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -26,11 +27,6 @@ - - - - - true diff --git a/src/AspNetCore.Authorization.Permissions.Abstractions/AspNetCore.Authorization.Permissions.Abstractions.csproj b/src/AspNetCore.Authorization.Permissions.Abstractions/AspNetCore.Authorization.Permissions.Abstractions.csproj index 4239745..8f2fd0f 100644 --- a/src/AspNetCore.Authorization.Permissions.Abstractions/AspNetCore.Authorization.Permissions.Abstractions.csproj +++ b/src/AspNetCore.Authorization.Permissions.Abstractions/AspNetCore.Authorization.Permissions.Abstractions.csproj @@ -12,9 +12,9 @@ MadEyeMatt.$(AssemblyName) false Copyright © 2022 Matthias Gernand. All rights reserved. - 6.0.4 - 6.0.4 - 6.0.4 + 6.1.0 + 6.1.0 + 6.1.0 Matthias Gernand A libary that adds permission-based authorization. en @@ -40,8 +40,6 @@ - - diff --git a/src/AspNetCore.Authorization.Permissions.Abstractions/ClaimsEnumerableExtensions.cs b/src/AspNetCore.Authorization.Permissions.Abstractions/ClaimsEnumerableExtensions.cs index 414d4eb..71458f3 100644 --- a/src/AspNetCore.Authorization.Permissions.Abstractions/ClaimsEnumerableExtensions.cs +++ b/src/AspNetCore.Authorization.Permissions.Abstractions/ClaimsEnumerableExtensions.cs @@ -4,9 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Security.Claims; - using Fluxera.Utilities.Extensions; using JetBrains.Annotations; + /// + /// Extension methods for where T is . + /// [PublicAPI] public static class ClaimsEnumerableExtensions { @@ -20,6 +22,7 @@ public static IReadOnlyCollection GetPermissions(this IEnumerable return claims .Where(x => x.Type == PermissionClaimTypes.PermissionClaimType) .Select(x => x.Value) + .ToList() .AsReadOnly(); } diff --git a/src/AspNetCore.Authorization.Permissions.Abstractions/ClaimsPrincipalExtensions.cs b/src/AspNetCore.Authorization.Permissions.Abstractions/ClaimsPrincipalExtensions.cs index 46e1dc8..bd2611a 100644 --- a/src/AspNetCore.Authorization.Permissions.Abstractions/ClaimsPrincipalExtensions.cs +++ b/src/AspNetCore.Authorization.Permissions.Abstractions/ClaimsPrincipalExtensions.cs @@ -4,6 +4,9 @@ using System.Security.Claims; using JetBrains.Annotations; + /// + /// Extension methods for the type. + /// [PublicAPI] public static class ClaimsPrincipalExtensions { diff --git a/src/AspNetCore.Authorization.Permissions.Identity.EntityFrameworkCore/AspNetCore.Authorization.Permissions.Identity.EntityFrameworkCore.csproj b/src/AspNetCore.Authorization.Permissions.Identity.EntityFrameworkCore/AspNetCore.Authorization.Permissions.Identity.EntityFrameworkCore.csproj index 3ad29a4..b62f70b 100644 --- a/src/AspNetCore.Authorization.Permissions.Identity.EntityFrameworkCore/AspNetCore.Authorization.Permissions.Identity.EntityFrameworkCore.csproj +++ b/src/AspNetCore.Authorization.Permissions.Identity.EntityFrameworkCore/AspNetCore.Authorization.Permissions.Identity.EntityFrameworkCore.csproj @@ -12,9 +12,9 @@ MadEyeMatt.$(AssemblyName) false Copyright © 2022 Matthias Gernand. All rights reserved. - 6.0.4 - 6.0.4 - 6.0.4 + 6.1.0 + 6.1.0 + 6.1.0 Matthias Gernand A libary that adds permission-based authorization. en @@ -44,10 +44,9 @@ - - - + + diff --git a/src/AspNetCore.Authorization.Permissions.Identity/AspNetCore.Authorization.Permissions.Identity.csproj b/src/AspNetCore.Authorization.Permissions.Identity/AspNetCore.Authorization.Permissions.Identity.csproj index d8fb80b..616eb81 100644 --- a/src/AspNetCore.Authorization.Permissions.Identity/AspNetCore.Authorization.Permissions.Identity.csproj +++ b/src/AspNetCore.Authorization.Permissions.Identity/AspNetCore.Authorization.Permissions.Identity.csproj @@ -12,9 +12,9 @@ MadEyeMatt.$(AssemblyName) false Copyright © 2022 Matthias Gernand. All rights reserved. - 6.0.4 - 6.0.4 - 6.0.4 + 6.1.0 + 6.1.0 + 6.1.0 Matthias Gernand A libary that adds permission-based authorization. en @@ -44,9 +44,8 @@ - - + diff --git a/src/AspNetCore.Authorization.Permissions.Identity/ITenantRoleStore.cs b/src/AspNetCore.Authorization.Permissions.Identity/ITenantRoleStore.cs index f1d33ff..fa072f0 100644 --- a/src/AspNetCore.Authorization.Permissions.Identity/ITenantRoleStore.cs +++ b/src/AspNetCore.Authorization.Permissions.Identity/ITenantRoleStore.cs @@ -59,7 +59,7 @@ public interface ITenantRoleStore : ITenantStore /// /// /// The that represents the asynchronous operation, containing a flag indicating whether the - /// specified is + /// specified is /// a member of the named role. /// Task IsInRoleAsync(TTenant tenant, string roleName, CancellationToken cancellationToken); diff --git a/src/AspNetCore.Authorization.Permissions.Identity/IdentityClaimsProvider.cs b/src/AspNetCore.Authorization.Permissions.Identity/IdentityClaimsProvider.cs index efab7c5..1ace7af 100644 --- a/src/AspNetCore.Authorization.Permissions.Identity/IdentityClaimsProvider.cs +++ b/src/AspNetCore.Authorization.Permissions.Identity/IdentityClaimsProvider.cs @@ -4,7 +4,6 @@ using System.Security.Claims; using System.Threading.Tasks; using AspNetCore.Authorization.Permissions.Abstractions; - using Fluxera.Utilities.Extensions; using JetBrains.Annotations; [PublicAPI] @@ -36,7 +35,7 @@ public IdentityClaimsProvider( /// public async Task> GetPermissionClaimsForUserAsync(string userId) { - IList claims = new List(); + List claims = new List(); // Add the permission claims that com from user roles. TUser user = await this.userManager.FindByIdAsync(userId); diff --git a/src/AspNetCore.Authorization.Permissions.Identity/IdentityErrorDescriberExtensions.cs b/src/AspNetCore.Authorization.Permissions.Identity/IdentityErrorDescriberExtensions.cs index bc10dce..ca37f29 100644 --- a/src/AspNetCore.Authorization.Permissions.Identity/IdentityErrorDescriberExtensions.cs +++ b/src/AspNetCore.Authorization.Permissions.Identity/IdentityErrorDescriberExtensions.cs @@ -2,6 +2,9 @@ { using Microsoft.AspNetCore.Identity; + /// + /// Extensions for the type. + /// public static class IdentityErrorDescriberExtensions { /// diff --git a/src/AspNetCore.Authorization.Permissions.Identity/PermissionsUserStoreBase.cs b/src/AspNetCore.Authorization.Permissions.Identity/PermissionsUserStoreBase.cs index 5d3aedd..65bc8a5 100644 --- a/src/AspNetCore.Authorization.Permissions.Identity/PermissionsUserStoreBase.cs +++ b/src/AspNetCore.Authorization.Permissions.Identity/PermissionsUserStoreBase.cs @@ -24,11 +24,14 @@ public abstract class PermissionsUserStoreBase : IPermissionsUserSt /// Creates a new instance of the type. /// /// - public PermissionsUserStoreBase(IdentityErrorDescriber describer = null) + protected PermissionsUserStoreBase(IdentityErrorDescriber describer = null) { this.Describer = describer; } + /// + /// Gets the describer. + /// public IdentityErrorDescriber Describer { get; } /// diff --git a/src/AspNetCore.Authorization.Permissions/AspNetCore.Authorization.Permissions.csproj b/src/AspNetCore.Authorization.Permissions/AspNetCore.Authorization.Permissions.csproj index 2aff1d1..7b5031c 100644 --- a/src/AspNetCore.Authorization.Permissions/AspNetCore.Authorization.Permissions.csproj +++ b/src/AspNetCore.Authorization.Permissions/AspNetCore.Authorization.Permissions.csproj @@ -12,9 +12,9 @@ MadEyeMatt.$(AssemblyName) false Copyright © 2022 Matthias Gernand. All rights reserved. - 6.0.4 - 6.0.4 - 6.0.4 + 6.1.0 + 6.1.0 + 6.1.0 Matthias Gernand A libary that adds permission-based authorization. en @@ -44,8 +44,6 @@ - - diff --git a/src/AspNetCore.Authorization.Permissions/EnsureCorrectClaimsProvider.cs b/src/AspNetCore.Authorization.Permissions/EnsureCorrectClaimsProvider.cs index 9aa5843..8c7a2f2 100644 --- a/src/AspNetCore.Authorization.Permissions/EnsureCorrectClaimsProvider.cs +++ b/src/AspNetCore.Authorization.Permissions/EnsureCorrectClaimsProvider.cs @@ -5,7 +5,6 @@ using System.Security.Claims; using System.Threading.Tasks; using AspNetCore.Authorization.Permissions.Abstractions; - using Fluxera.Utilities.Extensions; using JetBrains.Annotations; [UsedImplicitly] @@ -23,7 +22,7 @@ public async Task> GetPermissionClaimsForUserAsync(st { IReadOnlyCollection claims = await this.innerClaimsProvider.GetPermissionClaimsForUserAsync(userId); - IList permissionClaims = new List(); + List permissionClaims = new List(); if(claims is not null && claims.Any()) { diff --git a/src/AspNetCore.Authorization.Permissions/HasPermissionAttribute.cs b/src/AspNetCore.Authorization.Permissions/HasPermissionAttribute.cs index e88b512..494cf30 100644 --- a/src/AspNetCore.Authorization.Permissions/HasPermissionAttribute.cs +++ b/src/AspNetCore.Authorization.Permissions/HasPermissionAttribute.cs @@ -1,7 +1,6 @@ namespace AspNetCore.Authorization.Permissions { using System; - using Fluxera.Guards; using JetBrains.Annotations; using Microsoft.AspNetCore.Authorization; @@ -21,7 +20,12 @@ public sealed class HasPermissionAttribute : Attribute, IAuthorizeData /// public HasPermissionAttribute(string permission) { - this.policy = Guard.Against.NullOrWhiteSpace(permission, nameof(permission)); + if(string.IsNullOrWhiteSpace(permission)) + { + throw new ArgumentNullException(nameof(permission)); + } + + this.policy = permission; } /// diff --git a/src/AspNetCore.Authorization.Permissions/PermissionRequirement.cs b/src/AspNetCore.Authorization.Permissions/PermissionRequirement.cs index f77f0d1..069ce6a 100644 --- a/src/AspNetCore.Authorization.Permissions/PermissionRequirement.cs +++ b/src/AspNetCore.Authorization.Permissions/PermissionRequirement.cs @@ -1,6 +1,6 @@ namespace AspNetCore.Authorization.Permissions { - using Fluxera.Guards; + using System; using Microsoft.AspNetCore.Authorization; internal sealed class PermissionRequirement : IAuthorizationRequirement @@ -11,7 +11,12 @@ internal sealed class PermissionRequirement : IAuthorizationRequirement /// public PermissionRequirement(string permission) { - this.Permission = Guard.Against.NullOrWhiteSpace(permission, nameof(permission)); + if(string.IsNullOrWhiteSpace(permission)) + { + throw new ArgumentNullException(nameof(permission)); + } + + this.Permission = permission; } /// diff --git a/src/AspNetCore.Authorization.Permissions/ServiceCollectionExtensions.cs b/src/AspNetCore.Authorization.Permissions/ServiceCollectionExtensions.cs index 84826d1..fe245e0 100644 --- a/src/AspNetCore.Authorization.Permissions/ServiceCollectionExtensions.cs +++ b/src/AspNetCore.Authorization.Permissions/ServiceCollectionExtensions.cs @@ -2,12 +2,10 @@ { using System; using AspNetCore.Authorization.Permissions.Abstractions; - using Fluxera.Extensions.DependencyInjection; - using Fluxera.Guards; - using Fluxera.Utilities.Extensions; using JetBrains.Annotations; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.DependencyInjection; + using Microsoft.Extensions.DependencyInjection.Extensions; /// /// Extensions methods for the type. @@ -44,9 +42,7 @@ public static IServiceCollection AddPermissionsAuthorization(this IServiceCollec public static IServiceCollection AddClaimsProvider(this IServiceCollection services) where TProvider : class, IClaimsProvider { - return services - .AddScoped() - .AddClaimsProviderDecorator(); + return services.AddClaimsProvider(typeof(TProvider)); } /// @@ -57,21 +53,21 @@ public static IServiceCollection AddClaimsProvider(this IServiceColle /// public static IServiceCollection AddClaimsProvider(this IServiceCollection services, Type claimsProviderType) { - Guard.Against.False(claimsProviderType.Implements(), nameof(claimsProviderType), - "The claims provider type must implement the IClaimsProvider contract."); + if(!claimsProviderType.IsAssignableTo(typeof(IClaimsProvider))) + { + throw new ArgumentException( + "The claims provider type must implement the IClaimsProvider contract.", + nameof(claimsProviderType)); + } - return services - .AddScoped(typeof(IClaimsProvider), claimsProviderType) - .AddClaimsProviderDecorator(); - } - - private static IServiceCollection AddClaimsProviderDecorator(this IServiceCollection services) - { - // Decorate the registered claims provider with an internal one - // that checks the provided claims for correctness. - services - .Decorate() - .With(); + services.TryAddScoped(claimsProviderType); + services.TryAddScoped(sp => + { + // Decorate the registered claims provider with an internal one + // that checks the provided claims for correctness. + IClaimsProvider claimsProvider = (IClaimsProvider)sp.GetRequiredService(claimsProviderType); + return new EnsureCorrectClaimsProvider(claimsProvider); + }); return services; } diff --git a/src/AspNetCore.Authorization.Permissions/TenantAccessorFromUser.cs b/src/AspNetCore.Authorization.Permissions/TenantAccessorFromUser.cs index c919418..b3581e1 100644 --- a/src/AspNetCore.Authorization.Permissions/TenantAccessorFromUser.cs +++ b/src/AspNetCore.Authorization.Permissions/TenantAccessorFromUser.cs @@ -1,7 +1,6 @@ namespace AspNetCore.Authorization.Permissions { using AspNetCore.Authorization.Permissions.Abstractions; - using Fluxera.Utilities.Extensions; using JetBrains.Annotations; using Microsoft.AspNetCore.Http; @@ -27,7 +26,7 @@ public string TenantId { get { - if(this.accessor.HttpContext != null && this.accessor.HttpContext.User.IsAuthenticated()) + if(this.accessor.HttpContext != null && this.accessor.HttpContext.User.Identity != null && this.accessor.HttpContext.User.Identity.IsAuthenticated) { return this.accessor.HttpContext?.User.GetTenantId(); } diff --git a/tests/AspNetCore.Authorization.Permissions.UnitTests/AspNetCore.Authorization.Permissions.UnitTests.csproj b/tests/AspNetCore.Authorization.Permissions.UnitTests/AspNetCore.Authorization.Permissions.UnitTests.csproj index a8e5567..0885a4d 100644 --- a/tests/AspNetCore.Authorization.Permissions.UnitTests/AspNetCore.Authorization.Permissions.UnitTests.csproj +++ b/tests/AspNetCore.Authorization.Permissions.UnitTests/AspNetCore.Authorization.Permissions.UnitTests.csproj @@ -1,25 +1,28 @@ - + - - net6.0 - enable + + net6.0 + latest + disable + disable + false + false + - false - + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + - - - - - + \ No newline at end of file diff --git a/tests/AspNetCore.Authorization.Permissions.UnitTests/PermissionAuthorizationPolicyTests.cs b/tests/AspNetCore.Authorization.Permissions.UnitTests/PermissionAuthorizationPolicyTests.cs index 3ad42e7..54f73a7 100644 --- a/tests/AspNetCore.Authorization.Permissions.UnitTests/PermissionAuthorizationPolicyTests.cs +++ b/tests/AspNetCore.Authorization.Permissions.UnitTests/PermissionAuthorizationPolicyTests.cs @@ -16,9 +16,9 @@ public class PermissionAuthorizationPolicyTests private class TestClaimsProvider : IClaimsProvider { /// - public async Task> GetPermissionClaimsForUserAsync(string userId) + public Task> GetPermissionClaimsForUserAsync(string userId) { - return Array.Empty(); + return Task.FromResult>(Array.Empty()); } } diff --git a/tests/AspNetCore.Authorization.Permissions.UnitTests/PermissionsClaimsProviderTests.cs b/tests/AspNetCore.Authorization.Permissions.UnitTests/PermissionsClaimsProviderTests.cs index 725e24f..7f209fc 100644 --- a/tests/AspNetCore.Authorization.Permissions.UnitTests/PermissionsClaimsProviderTests.cs +++ b/tests/AspNetCore.Authorization.Permissions.UnitTests/PermissionsClaimsProviderTests.cs @@ -16,61 +16,61 @@ public class PermissionsClaimsProviderTests private class TestClaimsProvider : IClaimsProvider { /// - public async Task> GetPermissionClaimsForUserAsync(string userId) + public Task> GetPermissionClaimsForUserAsync(string userId) { - return new Claim[] + return Task.FromResult>(new Claim[] { new Claim(PermissionClaimTypes.PermissionClaimType, "Invoices.Read"), new Claim(PermissionClaimTypes.PermissionClaimType, "Invoices.Write"), new Claim(PermissionClaimTypes.PermissionClaimType, "Invoices.Send") - }; + }); } } private class TestClaimsProviderWithDuplicatePermissions : IClaimsProvider { /// - public async Task> GetPermissionClaimsForUserAsync(string userId) + public Task> GetPermissionClaimsForUserAsync(string userId) { - return new Claim[] + return Task.FromResult>(new Claim[] { new Claim(PermissionClaimTypes.PermissionClaimType, "Invoices.Read"), new Claim(PermissionClaimTypes.PermissionClaimType, "Invoices.Write"), new Claim(PermissionClaimTypes.PermissionClaimType, "Invoices.Write"), new Claim(PermissionClaimTypes.PermissionClaimType, "Invoices.Send") - }; + }); } } private class TestClaimsProviderWithWrongClaimType : IClaimsProvider { /// - public async Task> GetPermissionClaimsForUserAsync(string userId) + public Task> GetPermissionClaimsForUserAsync(string userId) { - return new Claim[] + return Task.FromResult>(new Claim[] { new Claim(PermissionClaimTypes.PermissionClaimType, "Invoices.Read"), new Claim(ClaimTypes.Role, "Invoices.Write"), new Claim(PermissionClaimTypes.PermissionClaimType, "Invoices.Send") - }; + }); } } private class TestClaimsProviderWithNullResult : IClaimsProvider { /// - public async Task> GetPermissionClaimsForUserAsync(string userId) + public Task> GetPermissionClaimsForUserAsync(string userId) { - return null; + return Task.FromResult>(null); } } private class TestClaimsProviderWithTenant : IClaimsProvider { /// - public async Task> GetPermissionClaimsForUserAsync(string userId) + public Task> GetPermissionClaimsForUserAsync(string userId) { - return new Claim[] + return Task.FromResult>(new Claim[] { new Claim(PermissionClaimTypes.PermissionClaimType, "Invoices.Read"), new Claim(PermissionClaimTypes.PermissionClaimType, "Invoices.Write"), @@ -78,7 +78,7 @@ public async Task> GetPermissionClaimsForUserAsync(st new Claim(PermissionClaimTypes.TenantIdClaimType, "12345678"), new Claim(PermissionClaimTypes.TenantNameClaimType, "test-tenant"), new Claim(PermissionClaimTypes.TenantDisplayNameClaimType, "Test Tenant Inc.") - }; + }); } } diff --git a/tests/AspNetCore.Authorization.Permissions.UnitTests/UpperInvariantPermissionLookupNormalizerTests.cs b/tests/AspNetCore.Authorization.Permissions.UnitTests/UpperInvariantPermissionLookupNormalizerTests.cs index 6e53dff..ee781a4 100644 --- a/tests/AspNetCore.Authorization.Permissions.UnitTests/UpperInvariantPermissionLookupNormalizerTests.cs +++ b/tests/AspNetCore.Authorization.Permissions.UnitTests/UpperInvariantPermissionLookupNormalizerTests.cs @@ -15,9 +15,9 @@ public class UpperInvariantPermissionLookupNormalizerTests private class TestClaimsProvider : IClaimsProvider { /// - public async Task> GetPermissionClaimsForUserAsync(string userId) + public Task> GetPermissionClaimsForUserAsync(string userId) { - return Array.Empty(); + return Task.FromResult>(Array.Empty()); } } diff --git a/tests/AspNetCore.Authorization.Permissions.UnitTests/UserPermissionsServiceTests.cs b/tests/AspNetCore.Authorization.Permissions.UnitTests/UserPermissionsServiceTests.cs index b32575a..6bec9ed 100644 --- a/tests/AspNetCore.Authorization.Permissions.UnitTests/UserPermissionsServiceTests.cs +++ b/tests/AspNetCore.Authorization.Permissions.UnitTests/UserPermissionsServiceTests.cs @@ -15,9 +15,9 @@ public class UserPermissionsServiceTests private class TestClaimsProvider : IClaimsProvider { /// - public async Task> GetPermissionClaimsForUserAsync(string userId) + public Task> GetPermissionClaimsForUserAsync(string userId) { - return Array.Empty(); + return Task.FromResult>(Array.Empty()); } }