Skip to content

Commit 4a47463

Browse files
damienboddamienbod
authored
Merge pull request #35 from damienbod/net9
Update .NET 9
2 parents a77fd87 + eb03c1e commit 4a47463

22 files changed

+344
-206
lines changed

‎TokenManagement/AadTokenPolicies/PolicyAssignedApplicationsDto.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
namespace TokenManagement;
1+
namespace TokenManagement.AadTokenPolicies;
22

33
public class PolicyAssignedApplicationsDto
44
{
5-
public string Id { get; set; }
6-
public string AppId { get; set; }
7-
public string DisplayName { get; set; }
5+
public string Id { get; set; } = string.Empty;
6+
public string AppId { get; set; } = string.Empty;
7+
public string DisplayName { get; set; } = string.Empty;
88

99
/// <summary>
1010
/// only "AzureADMyOrg" and "AzureADMultipleOrgs" can be assigned a policy
1111
/// </summary>
12-
public string SignInAudience { get; set; }
12+
public string SignInAudience { get; set; } = string.Empty;
1313

14-
public string PolicyAssigned { get; set; }
14+
public string PolicyAssigned { get; set; } = string.Empty;
1515
}

‎TokenManagement/AadTokenPolicies/TokenLifetimePolicyDto.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using System.ComponentModel.DataAnnotations;
22

3-
namespace TokenManagement;
3+
namespace TokenManagement.AadTokenPolicies;
44

55
public class TokenLifetimePolicyDto
66
{
7-
public string Id { get; set; }
7+
public string Id { get; set; } = string.Empty;
88
[Required]
9-
public string Definition { get; set; }
9+
public string Definition { get; set; } = string.Empty;
1010
[Required]
11-
public string DisplayName { get; set; }
11+
public string DisplayName { get; set; } = string.Empty;
1212
public bool IsOrganizationDefault { get; set; }
1313
}

‎TokenManagement/Pages/AadTokenPolicies/AssignNewApplicationToPolicy.cshtml.cs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
using Microsoft.AspNetCore.Mvc.RazorPages;
33
using Microsoft.AspNetCore.Mvc.Rendering;
44
using Microsoft.Identity.Web;
5+
using TokenManagement.AadTokenPolicies;
56

67
namespace TokenManagement.Pages;
78

8-
[AuthorizeForScopes(Scopes = new string[] { "Policy.Read.All", "Policy.ReadWrite.ApplicationConfiguration", "Application.ReadWrite.All" })]
9+
[AuthorizeForScopes(Scopes = ["Policy.Read.All", "Policy.ReadWrite.ApplicationConfiguration", "Application.ReadWrite.All"])]
910
public class AssignNewApplicationToPolicyModel : PageModel
1011
{
1112
private readonly TokenLifetimePolicyGraphApiService _tokenLifetimePolicyGraphApiService;
@@ -15,10 +16,9 @@ public AssignNewApplicationToPolicyModel(TokenLifetimePolicyGraphApiService toke
1516
_tokenLifetimePolicyGraphApiService = tokenLifetimePolicyGraphApiService;
1617
}
1718

18-
public TokenLifetimePolicyDto TokenLifetimePolicyDto { get; set; }
19-
20-
public string ApplicationGraphId { get; set; }
21-
public List<SelectListItem> ApplicationOptions { get; set; }
19+
public TokenLifetimePolicyDto TokenLifetimePolicyDto { get; set; } = new();
20+
public string ApplicationGraphId { get; set; } = string.Empty;
21+
public List<SelectListItem> ApplicationOptions { get; set; } = [];
2222

2323
public async Task<IActionResult> OnGetAsync(string id)
2424
{
@@ -30,7 +30,7 @@ public async Task<IActionResult> OnGetAsync(string id)
3030
var policy = await _tokenLifetimePolicyGraphApiService.GetPolicy(id);
3131
TokenLifetimePolicyDto = new TokenLifetimePolicyDto
3232
{
33-
Definition = policy.Definition.FirstOrDefault(),
33+
Definition = policy.Definition.FirstOrDefault()!,
3434
DisplayName = policy.DisplayName,
3535
IsOrganizationDefault = policy.IsOrganizationDefault.GetValueOrDefault(),
3636
Id = policy.Id
@@ -57,8 +57,9 @@ public async Task<IActionResult> OnGetAsync(string id)
5757

5858
public async Task<IActionResult> OnPostAsync()
5959
{
60-
var applicationGraphId = Request.Form["ApplicationGraphId"];
61-
var policyId = Request.Form["TokenLifetimePolicyDto.Id"];
60+
string? applicationGraphId = Request.Form["ApplicationGraphId"]!;
61+
string? policyId = Request.Form["TokenLifetimePolicyDto.Id"]!;
62+
6263
if (!ModelState.IsValid)
6364
{
6465
return Page();

‎TokenManagement/Pages/AadTokenPolicies/Create.cshtml.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
using Microsoft.AspNetCore.Mvc.RazorPages;
33
using Microsoft.Graph;
44
using Microsoft.Identity.Web;
5+
using TokenManagement.AadTokenPolicies;
56

67
namespace TokenManagement.Pages.AadTokenPolicies;
78

8-
[AuthorizeForScopes(Scopes = new string[] { "Policy.Read.All", "Policy.ReadWrite.ApplicationConfiguration" })]
9+
[AuthorizeForScopes(Scopes = ["Policy.Read.All", "Policy.ReadWrite.ApplicationConfiguration"])]
910
public class CreateModel : PageModel
1011
{
1112
private readonly TokenLifetimePolicyGraphApiService _tokenLifetimePolicyGraphApiService;
@@ -15,6 +16,10 @@ public CreateModel(TokenLifetimePolicyGraphApiService tokenLifetimePolicyGraphAp
1516
_tokenLifetimePolicyGraphApiService = tokenLifetimePolicyGraphApiService;
1617
}
1718

19+
20+
[BindProperty]
21+
public TokenLifetimePolicyDto TokenLifetimePolicyDto { get; set; } = new();
22+
1823
public IActionResult OnGet()
1924
{
2025
TokenLifetimePolicyDto = new TokenLifetimePolicyDto
@@ -25,9 +30,6 @@ public IActionResult OnGet()
2530
return Page();
2631
}
2732

28-
[BindProperty]
29-
public TokenLifetimePolicyDto TokenLifetimePolicyDto { get; set; }
30-
3133
// To protect from overposting attacks, see https://aka.ms/RazorPagesCRUD
3234
public async Task<IActionResult> OnPostAsync()
3335
{

‎TokenManagement/Pages/AadTokenPolicies/Delete.cshtml.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
using Microsoft.AspNetCore.Mvc;
22
using Microsoft.AspNetCore.Mvc.RazorPages;
33
using Microsoft.Identity.Web;
4+
using TokenManagement.AadTokenPolicies;
45

56
namespace TokenManagement.Pages.AadTokenPolicies;
67

7-
[AuthorizeForScopes(Scopes = new string[] { "Policy.Read.All", "Policy.ReadWrite.ApplicationConfiguration" })]
8+
[AuthorizeForScopes(Scopes = ["Policy.Read.All", "Policy.ReadWrite.ApplicationConfiguration"])]
89
public class DeleteModel : PageModel
910
{
1011
private readonly TokenLifetimePolicyGraphApiService _tokenLifetimePolicyGraphApiService;
@@ -15,7 +16,7 @@ public DeleteModel(TokenLifetimePolicyGraphApiService tokenLifetimePolicyGraphAp
1516
}
1617

1718
[BindProperty]
18-
public TokenLifetimePolicyDto TokenLifetimePolicyDto { get; set; }
19+
public TokenLifetimePolicyDto TokenLifetimePolicyDto { get; set; } = new();
1920

2021
public async Task<IActionResult> OnGetAsync(string id)
2122
{
@@ -27,7 +28,7 @@ public async Task<IActionResult> OnGetAsync(string id)
2728
var policy = await _tokenLifetimePolicyGraphApiService.GetPolicy(id);
2829
TokenLifetimePolicyDto = new TokenLifetimePolicyDto
2930
{
30-
Definition = policy.Definition.FirstOrDefault(),
31+
Definition = policy.Definition.FirstOrDefault()!,
3132
DisplayName = policy.DisplayName,
3233
IsOrganizationDefault = policy.IsOrganizationDefault.GetValueOrDefault(),
3334
Id = policy.Id

‎TokenManagement/Pages/AadTokenPolicies/Details.cshtml.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
using Microsoft.AspNetCore.Mvc;
22
using Microsoft.AspNetCore.Mvc.RazorPages;
33
using Microsoft.Identity.Web;
4+
using TokenManagement.AadTokenPolicies;
45

56
namespace TokenManagement.Pages.AadTokenPolicies;
67

7-
[AuthorizeForScopes(Scopes = new string[] { "Policy.Read.All", "Policy.ReadWrite.ApplicationConfiguration", "Application.ReadWrite.All" })]
8+
[AuthorizeForScopes(Scopes = ["Policy.Read.All", "Policy.ReadWrite.ApplicationConfiguration", "Application.ReadWrite.All"])]
89
public class DetailsModel : PageModel
910
{
1011
private readonly TokenLifetimePolicyGraphApiService _tokenLifetimePolicyGraphApiService;
@@ -14,9 +15,8 @@ public DetailsModel(TokenLifetimePolicyGraphApiService tokenLifetimePolicyGraphA
1415
_tokenLifetimePolicyGraphApiService = tokenLifetimePolicyGraphApiService;
1516
}
1617

17-
public TokenLifetimePolicyDto TokenLifetimePolicyDto { get; set; }
18-
19-
public List<PolicyAssignedApplicationsDto> PolicyAssignedApplications { get; set; }
18+
public TokenLifetimePolicyDto TokenLifetimePolicyDto { get; set; } = new();
19+
public List<PolicyAssignedApplicationsDto> PolicyAssignedApplications { get; set; } = [];
2020

2121
public async Task<IActionResult> OnGetAsync(string id)
2222
{
@@ -28,7 +28,7 @@ public async Task<IActionResult> OnGetAsync(string id)
2828
var policy = await _tokenLifetimePolicyGraphApiService.GetPolicy(id);
2929
TokenLifetimePolicyDto = new TokenLifetimePolicyDto
3030
{
31-
Definition = policy.Definition.FirstOrDefault(),
31+
Definition = policy.Definition.FirstOrDefault()!,
3232
DisplayName = policy.DisplayName,
3333
IsOrganizationDefault = policy.IsOrganizationDefault.GetValueOrDefault(),
3434
Id = policy.Id
@@ -43,18 +43,18 @@ public async Task<IActionResult> OnGetAsync(string id)
4343
PolicyAssignedApplications = applications.CurrentPage.Select(app => new PolicyAssignedApplicationsDto
4444
{
4545
Id = app.Id,
46-
DisplayName = (app as Microsoft.Graph.Application).DisplayName,
47-
AppId = (app as Microsoft.Graph.Application).AppId,
48-
SignInAudience = (app as Microsoft.Graph.Application).SignInAudience
46+
DisplayName = (app as Microsoft.Graph.Application)!.DisplayName,
47+
AppId = (app as Microsoft.Graph.Application)!.AppId,
48+
SignInAudience = (app as Microsoft.Graph.Application)!.SignInAudience
4949

5050
}).ToList();
5151
return Page();
5252
}
5353

5454
public async Task<IActionResult> OnPostAsync()
5555
{
56-
string? appId = Request.Form["item.AppId"];
57-
string? policyId = Request.Form["TokenLifetimePolicyDto.Id"];
56+
string? appId = Request.Form["item.AppId"]!;
57+
string? policyId = Request.Form["TokenLifetimePolicyDto.Id"]!;
5858

5959
if (!ModelState.IsValid)
6060
{

‎TokenManagement/Pages/AadTokenPolicies/Edit.cshtml.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Microsoft.AspNetCore.Mvc.RazorPages;
33
using Microsoft.Graph;
44
using Microsoft.Identity.Web;
5+
using TokenManagement.AadTokenPolicies;
56

67
namespace TokenManagement.Pages.AadTokenPolicies;
78

@@ -16,7 +17,7 @@ public EditModel(TokenLifetimePolicyGraphApiService tokenLifetimePolicyGraphApiS
1617
}
1718

1819
[BindProperty]
19-
public TokenLifetimePolicyDto TokenLifetimePolicyDto { get; set; }
20+
public TokenLifetimePolicyDto TokenLifetimePolicyDto { get; set; } = new();
2021

2122
public async Task<IActionResult> OnGetAsync(string id)
2223
{
@@ -28,7 +29,7 @@ public async Task<IActionResult> OnGetAsync(string id)
2829
var policy = await _tokenLifetimePolicyGraphApiService.GetPolicy(id);
2930
TokenLifetimePolicyDto = new TokenLifetimePolicyDto
3031
{
31-
Definition = policy.Definition.FirstOrDefault(),
32+
Definition = policy.Definition.FirstOrDefault()!,
3233
DisplayName = policy.DisplayName,
3334
IsOrganizationDefault = policy.IsOrganizationDefault.GetValueOrDefault(),
3435
Id = policy.Id

‎TokenManagement/Pages/AadTokenPolicies/Index.cshtml.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Microsoft.AspNetCore.Mvc.RazorPages;
22
using Microsoft.Identity.Web;
3+
using TokenManagement.AadTokenPolicies;
34

45
namespace TokenManagement.Pages.AadTokenPolicies;
56

@@ -13,14 +14,14 @@ public IndexModel(TokenLifetimePolicyGraphApiService tokenLifetimePolicyGraphApi
1314
_tokenLifetimePolicyGraphApiService = tokenLifetimePolicyGraphApiService;
1415
}
1516

16-
public List<TokenLifetimePolicyDto> TokenLifetimePolicyDto { get; set; }
17+
public List<TokenLifetimePolicyDto> TokenLifetimePolicyDto { get; set; } = [];
1718

1819
public async Task OnGetAsync()
1920
{
2021
var policies = await _tokenLifetimePolicyGraphApiService.GetPolicies();
2122
TokenLifetimePolicyDto = policies.CurrentPage.Select(policy => new TokenLifetimePolicyDto
2223
{
23-
Definition = policy.Definition.FirstOrDefault(),
24+
Definition = policy.Definition.FirstOrDefault()!,
2425
DisplayName = policy.DisplayName,
2526
IsOrganizationDefault = policy.IsOrganizationDefault.GetValueOrDefault(),
2627
Id = policy.Id

‎TokenManagement/Pages/AzureAppRegistrations.cshtml.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Microsoft.AspNetCore.Mvc;
22
using Microsoft.AspNetCore.Mvc.RazorPages;
33
using Microsoft.Identity.Web;
4+
using TokenManagement.AadTokenPolicies;
45

56
namespace TokenManagement.Pages;
67

@@ -14,7 +15,7 @@ public ApplicationsModel(TokenLifetimePolicyGraphApiService tokenLifetimePolicyG
1415
_tokenLifetimePolicyGraphApiService = tokenLifetimePolicyGraphApiService;
1516
}
1617

17-
public List<PolicyAssignedApplicationsDto> AllApplications { get; set; }
18+
public List<PolicyAssignedApplicationsDto> AllApplications { get; set; } = [];
1819

1920
public async Task<IActionResult> OnGetAsync()
2021
{

‎TokenManagement/Pages/Error.cshtml.cs‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
1-
using System.Diagnostics;
21
using Microsoft.AspNetCore.Mvc;
32
using Microsoft.AspNetCore.Mvc.RazorPages;
3+
using System.Diagnostics;
44

55
namespace TokenManagement.Pages;
66

77
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
88
public class ErrorModel : PageModel
99
{
10-
public string RequestId { get; set; }
10+
public string RequestId { get; set; } = string.Empty;
1111

1212
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
1313

14-
private readonly ILogger<ErrorModel> _logger;
15-
16-
public ErrorModel(ILogger<ErrorModel> logger)
17-
{
18-
_logger = logger;
19-
}
20-
2114
public void OnGet()
2215
{
2316
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;

0 commit comments

Comments
 (0)