Program.cs refactor

tibitoth · tibitoth · commit 5d89557173ac · 2025-07-18T10:26:15.000+02:00
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Auth/AdminAuthorizationHandler.cs b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Auth/AdminAuthorizationHandler.cs
@@ -2,7 +2,7 @@
 
 using Microsoft.AspNetCore.Authorization;
 
-namespace Ahk.GradeManagement.Client.Policies;
+namespace Ahk.GradeManagement.Client.Auth;
 
 public class UserTypeAuthorizationHandler(UserClient userClient) : AuthorizationHandler<UserTypeRequirement>
 {
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Auth/AuthenticationExtensions.cs b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Auth/AuthenticationExtensions.cs
@@ -0,0 +1,30 @@
+using Ahk.GradeManagement.Shared.Enums;
+
+using Microsoft.AspNetCore.Authorization;
+
+namespace Ahk.GradeManagement.Client.Auth;
+
+public static class AuthenticationExtensions
+{
+    public static IServiceCollection AddGradeManagementAuthentication(this IServiceCollection services, IConfiguration configuration)
+    {
+        services.AddMsalAuthentication(options =>
+        {
+            configuration.Bind("AzureAd", options.ProviderOptions.Authentication);
+            foreach (var config in configuration.GetSection("AzureAd:DefaultAccessTokenScopes").AsEnumerable())
+            {
+                if (!string.IsNullOrWhiteSpace(config.Value) && !options.ProviderOptions.DefaultAccessTokenScopes.Contains(config.Value))
+                {
+                    options.ProviderOptions.DefaultAccessTokenScopes.Add(config.Value);
+                }
+            }
+        });
+        services.AddScoped<IAuthorizationHandler, UserTypeAuthorizationHandler>();
+        services.AddAuthorizationCore(options =>
+        {
+            options.AddPolicy(Policy.RequireAdmin, policy => policy.Requirements.Add(new UserTypeRequirement([UserType.Admin])));
+            options.AddPolicy(Policy.RequireTeacher, policy => policy.Requirements.Add(new UserTypeRequirement([UserType.Teacher, UserType.Admin])));
+        });
+        return services;
+    }
+}
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Auth/Policy.cs b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Auth/Policy.cs
@@ -1,4 +1,4 @@
-namespace Ahk.GradeManagement.Client.Policies;
+namespace Ahk.GradeManagement.Client.Auth;
 
 public static class Policy
 {
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Auth/UserTypeRequirement.cs b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Auth/UserTypeRequirement.cs
@@ -2,7 +2,7 @@
 
 using Microsoft.AspNetCore.Authorization;
 
-namespace Ahk.GradeManagement.Client.Policies;
+namespace Ahk.GradeManagement.Client.Auth;
 
 public class UserTypeRequirement(UserType[] type) : IAuthorizationRequirement
 {
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Layout/NavMenu.razor b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Layout/NavMenu.razor
@@ -1,4 +1,4 @@
-@using GradeManagement.Client.Policies
+@using Ahk.GradeManagement.Client.Auth
 <MudNavMenu>
     <MudNavLink Href="/" Match="NavLinkMatch.All">Dashboard</MudNavLink>
     <AuthorizeView Policy="@Policy.RequireTeacher">
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Network/HttpClientExtensions.cs b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Network/HttpClientExtensions.cs
@@ -0,0 +1,30 @@
+namespace Ahk.GradeManagement.Client.Network;
+
+public static class HttpClientExtensions
+{
+    public static IServiceCollection AddGradeManagementHttpClients(this IServiceCollection services, string baseAddress)
+    {
+        services.AddTransient<AuthorizationMessageHandler>();
+        services.AddTransient<ExceptionMessageHandler>();
+        services.AddTransient<SubjectHeaderHandler>();
+
+        services.ConfigureHttpClientDefaults(b => b
+            .AddHttpMessageHandler<AuthorizationMessageHandler>()
+            .AddHttpMessageHandler<ExceptionMessageHandler>()
+            .AddHttpMessageHandler<SubjectHeaderHandler>()
+            .ConfigureHttpClient(client => client.BaseAddress = new Uri(baseAddress)));
+
+        services.AddHttpClient<SubjectClient>();
+        services.AddHttpClient<CourseClient>();
+        services.AddHttpClient<SemesterClient>();
+        services.AddHttpClient<LanguageClient>();
+        services.AddHttpClient<UserClient>();
+        services.AddHttpClient<GroupClient>();
+        services.AddHttpClient<ExerciseClient>();
+        services.AddHttpClient<AssignmentClient>();
+        services.AddHttpClient<StudentClient>();
+        services.AddHttpClient<DashboardClient>();
+
+        return services;
+    }
+}
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Network/MockClient.cs b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Network/MockClient.cs
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Courses.razor b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Courses.razor
@@ -1,6 +1,7 @@
-﻿@page "/courses"
+@page "/courses"
 @layout AuthenticatedLayout
 
+@using Ahk.GradeManagement.Client.Auth
 @using GradeManagement.Client.Components.NewDialogs
 @implements IDisposable
 @inject IDialogService DialogService
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/CreationWizard.razor b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/CreationWizard.razor
@@ -1,5 +1,6 @@
-﻿@page "/wizard"
+@page "/wizard"
 @using System.Text.Json
+@using Ahk.GradeManagement.Client.Auth
 @using GradeManagement.Client.Components.NewDialogs
 @using GradeManagement.Shared.Dtos.GitHubManifest
 @using MudExtensions
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Languages.razor b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Languages.razor
@@ -1,4 +1,5 @@
-﻿@page "/languages"
+@page "/languages"
+@using Ahk.GradeManagement.Client.Auth
 @using GradeManagement.Client.Components.NewDialogs
 @layout AuthenticatedLayout
 
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Semesters.razor b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Semesters.razor
@@ -1,4 +1,5 @@
-﻿@page "/semesters"
+@page "/semesters"
+@using Ahk.GradeManagement.Client.Auth
 @using GradeManagement.Client.Components.NewDialogs
 @layout AuthenticatedLayout
 
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/SingleCourse.razor b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/SingleCourse.razor
@@ -1,4 +1,5 @@
-﻿@page "/courses/{Id:int}"
+@page "/courses/{Id:int}"
+@using Ahk.GradeManagement.Client.Auth
 @using GradeManagement.Client.Components.NewDialogs
 @layout AuthenticatedLayout
 
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Students.razor b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Students.razor
@@ -1,4 +1,5 @@
-﻿@page "/students"
+@page "/students"
+@using Ahk.GradeManagement.Client.Auth
 @using GradeManagement.Client.Components.NewDialogs
 @layout AuthenticatedLayout
 
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Subjects.razor b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Subjects.razor
@@ -1,4 +1,5 @@
-﻿@page "/subjects"
+@page "/subjects"
+@using Ahk.GradeManagement.Client.Auth
 @using GradeManagement.Client.Components.NewDialogs
 @layout AuthenticatedLayout
 @inject IDialogService DialogService
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Teachers.razor b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Pages/Teachers.razor
@@ -1,4 +1,5 @@
-﻿@page "/teachers"
+@page "/teachers"
+@using Ahk.GradeManagement.Client.Auth
 @using GradeManagement.Client.Components.NewDialogs
 @layout AuthenticatedLayout
 
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Program.cs b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Program.cs
@@ -1,9 +1,7 @@
+using Ahk.GradeManagement.Client.Auth;
 using Ahk.GradeManagement.Client.Network;
-using Ahk.GradeManagement.Client.Policies;
 using Ahk.GradeManagement.Client.Services;
-using Ahk.GradeManagement.Shared.Enums;
 
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
@@ -15,53 +13,21 @@ namespace Ahk.GradeManagement.Client;
 
 public class Program
 {
-    public const string ServerApi = "ServerAPI";
-
     public static async Task Main(string[] args)
     {
         var builder = WebAssemblyHostBuilder.CreateDefault(args);
         builder.RootComponents.Add<App>("#app");
         builder.RootComponents.Add<HeadOutlet>("head::after");
 
-        builder.Services.AddMsalAuthentication(options =>
-        {
-            builder.Configuration.Bind("AzureAd", options.ProviderOptions.Authentication);
-            options.ProviderOptions.DefaultAccessTokenScopes.Add("api://0ff49368-7e23-4e6a-9c57-973a6cac8bbd/AHK2.API");
-            //Add scope for email
-        });
-        builder.Services.AddScoped<IAuthorizationHandler, UserTypeAuthorizationHandler>();
-        builder.Services.AddAuthorizationCore(options =>
-        {
-            options.AddPolicy(Policy.RequireAdmin, policy => policy.Requirements.Add(new UserTypeRequirement([UserType.Admin])));
-            options.AddPolicy(Policy.RequireTeacher, policy => policy.Requirements.Add(new UserTypeRequirement([UserType.Teacher, UserType.Admin])));
-        });
+        builder.Services.AddGradeManagementAuthentication(builder.Configuration);
+
+        builder.Services.AddGradeManagementHttpClients(builder.HostEnvironment.BaseAddress);
 
         builder.Services.AddScoped<CrudSnackbarService>();
         builder.Services.AddScoped<SubjectService>();
         builder.Services.AddSingleton<SelectedSubjectService>();
         builder.Services.AddSingleton<CurrentUserService>();
 
-        builder.Services.AddTransient<AuthorizationMessageHandler>();
-        builder.Services.AddTransient<ExceptionMessageHandler>();
-        builder.Services.AddTransient<SubjectHeaderHandler>();
-
-        builder.Services.ConfigureHttpClientDefaults(b => b
-            .AddHttpMessageHandler<AuthorizationMessageHandler>()
-            .AddHttpMessageHandler<ExceptionMessageHandler>()
-            .AddHttpMessageHandler<SubjectHeaderHandler>()
-            .ConfigureHttpClient(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)));
-
-        builder.Services.AddHttpClient<SubjectClient>();
-        builder.Services.AddHttpClient<CourseClient>();
-        builder.Services.AddHttpClient<SemesterClient>();
-        builder.Services.AddHttpClient<LanguageClient>();
-        builder.Services.AddHttpClient<UserClient>();
-        builder.Services.AddHttpClient<GroupClient>();
-        builder.Services.AddHttpClient<ExerciseClient>();
-        builder.Services.AddHttpClient<AssignmentClient>();
-        builder.Services.AddHttpClient<StudentClient>();
-        builder.Services.AddHttpClient<DashboardClient>();
-
         builder.Services.AddMudServices();
         builder.Services.AddMudExtensions();
 
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Properties/launchSettings.json b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Properties/launchSettings.json
@@ -24,7 +24,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:7079;http://localhost:5238",
+      "applicationUrl": "https://localhost:7111;http://localhost:5268",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/_Imports.razor b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/_Imports.razor
@@ -21,5 +21,5 @@
 @using Ahk.GradeManagement.Shared.Dtos.Response;
 @using Ahk.GradeManagement.Shared.Enums;
 
-@using Ahk.GradeManagement.Client.Policies
+@using Ahk.GradeManagement.Client.Auth;
 @using Microsoft.AspNetCore.Authorization
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/wwwroot/appsettings.json b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/wwwroot/appsettings.json
@@ -2,6 +2,9 @@
   "AzureAd": {
     "ClientId": "1595302c-3041-44e0-b1f5-cabfe7d6773f",
     "Authority": "https://login.microsoftonline.com/m365.bme.hu",
-    "ValidateAuthority": true
+    "ValidateAuthority": true,
+    "DefaultAccessTokenScopes": [
+      "api://0ff49368-7e23-4e6a-9c57-973a6cac8bbd/AHK2.API"
+    ]
   }
 }
diff --git a/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/wwwroot/index.html b/src/Ahk.GradeManagement/Ahk.GradeManagement.Client/wwwroot/index.html
@@ -11,7 +11,8 @@
   <link href="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.css" rel="stylesheet"/>
   <link rel="stylesheet" href="css/app.css"/>
   <link rel="icon" type="image/png" href="favicon.png"/>
-  <link href="GradeManagement.Client.styles.css" rel="stylesheet"/>
+  <!-- TODO ezt ki rakta ide?? -->
+  <!--<link href="GradeManagement.Client.styles.css" rel="stylesheet"/>-->
 </head>
 
 <body>

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`using Microsoft.AspNetCore.Authorization;`
`4`	`4`
`5`		`-namespace Ahk.GradeManagement.Client.Policies;`
	`5`	`+namespace Ahk.GradeManagement.Client.Auth;`
`6`	`6`
`7`	`7`	`public class UserTypeAuthorizationHandler(UserClient userClient) : AuthorizationHandler<UserTypeRequirement>`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Ahk.GradeManagement.Client.Policies;`
	`1`	`+namespace Ahk.GradeManagement.Client.Auth;`
`2`	`2`
`3`	`3`	`public static class Policy`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@using GradeManagement.Client.Policies`
	`1`	`+@using Ahk.GradeManagement.Client.Auth`
`2`	`2`	`<MudNavMenu>`
`3`	`3`	`<MudNavLink Href="/" Match="NavLinkMatch.All">Dashboard</MudNavLink>`
`4`	`4`	`<AuthorizeView Policy="@Policy.RequireTeacher">`