refactor: authorization

Gzozo · Gzozo · commit 4c8312bd0e8c · 2024-05-24T23:23:58.000+02:00
diff --git a/grade-management-new/GradeManagement.Client/Authorization/Handlers/TeacherRequirementHandler.cs b/grade-management-new/GradeManagement.Client/Authorization/Handlers/TeacherRequirementHandler.cs
diff --git a/grade-management-new/GradeManagement.Client/Layout/NavMenu.razor b/grade-management-new/GradeManagement.Client/Layout/NavMenu.razor
@@ -1,14 +1,14 @@
-﻿@using GradeManagement.Client.Authorization.Policies
+﻿@using GradeManagement.Shared.Authorization.Policies
 <MudNavMenu>
     <MudNavLink Href="/" Match="NavLinkMatch.All">Dashboard</MudNavLink>
-    <MudNavGroup Title="Data" Expanded="true">
-        <MudNavLink Href="/courses" Match="NavLinkMatch.Prefix">Courses</MudNavLink>
-        <MudNavLink Href="/semesters" Match="NavLinkMatch.Prefix">Semesters</MudNavLink>
-        <MudNavLink Href="/languages" Match="NavLinkMatch.Prefix">Languages</MudNavLink>
-        <MudNavLink Href="/teachers" Match="NavLinkMatch.Prefix">Teachers</MudNavLink>
-    </MudNavGroup>
     <AuthorizeView Policy="@TeacherRequirement.PolicyName">
         <Authorized>
+            <MudNavGroup Title="Data" Expanded="true">
+                <MudNavLink Href="/courses" Match="NavLinkMatch.Prefix">Courses</MudNavLink>
+                <MudNavLink Href="/semesters" Match="NavLinkMatch.Prefix">Semesters</MudNavLink>
+                <MudNavLink Href="/languages" Match="NavLinkMatch.Prefix">Languages</MudNavLink>
+                <MudNavLink Href="/teachers" Match="NavLinkMatch.Prefix">Teachers</MudNavLink>
+            </MudNavGroup>
             <MudNavGroup Title="Admin" Expanded="false">
                 <MudNavLink Href="/subjects" Match="NavLinkMatch.Prefix">Subjects</MudNavLink>
                 <MudNavLink Href="/students" Match="NavLinkMatch.Prefix">Students</MudNavLink>
diff --git a/grade-management-new/GradeManagement.Client/Pages/Main.razor b/grade-management-new/GradeManagement.Client/Pages/Main.razor
@@ -95,7 +95,9 @@
 // }
 
     #endregion
-
+    //Van e assignolt teacher?
+    //Mikor pontoztak? Tooltip
+    //PR status - closed szűrve
     private LoadingComponent loadingRef;
 
     private Subject? _selectedSubject = null;
diff --git a/grade-management-new/GradeManagement.Client/Pages/Subjects.razor b/grade-management-new/GradeManagement.Client/Pages/Subjects.razor
@@ -1,6 +1,6 @@
 ﻿@page "/subjects"
-@using GradeManagement.Client.Authorization.Policies
 @using GradeManagement.Client.Components.NewDialogs
+@using GradeManagement.Shared.Authorization.Policies
 @layout AuthenticatedLayout
 @inject IDialogService DialogService
 @inject CrudSnackbarService SnackbarService
diff --git a/grade-management-new/GradeManagement.Client/Program.cs b/grade-management-new/GradeManagement.Client/Program.cs
@@ -1,7 +1,7 @@
-using GradeManagement.Client.Authorization.Handlers;
-using GradeManagement.Client.Authorization.Policies;
 using GradeManagement.Client.Network;
 using GradeManagement.Client.Services;
+using GradeManagement.Shared.Authorization.Handlers;
+using GradeManagement.Shared.Authorization.Policies;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components.Web;
diff --git a/grade-management-new/GradeManagement.Server/Authorization/Policies/TeacherRequirement.cs b/grade-management-new/GradeManagement.Server/Authorization/Policies/TeacherRequirement.cs
diff --git a/grade-management-new/GradeManagement.Server/Controllers/SubjectController.cs b/grade-management-new/GradeManagement.Server/Controllers/SubjectController.cs
@@ -1,6 +1,6 @@
 using GradeManagement.Bll;
-using GradeManagement.Server.Authorization.Policies;
 using GradeManagement.Server.Controllers.BaseControllers;
+using GradeManagement.Shared.Authorization.Policies;
 using GradeManagement.Shared.Dtos;
 using GradeManagement.Shared.Dtos.Request;
 
diff --git a/grade-management-new/GradeManagement.Server/Program.cs b/grade-management-new/GradeManagement.Server/Program.cs
@@ -1,8 +1,8 @@
 using GradeManagement.Data.Data;
 using GradeManagement.Bll;
-using GradeManagement.Server.Authorization.Handlers;
-using GradeManagement.Server.Authorization.Policies;
 using GradeManagement.Server.ExceptionHandlers;
+using GradeManagement.Shared.Authorization.Handlers;
+using GradeManagement.Shared.Authorization.Policies;
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.AspNetCore.Authorization;
diff --git a/grade-management-new/GradeManagement.Shared/Authorization/Handlers/TeacherRequirementHandler.cs b/grade-management-new/GradeManagement.Shared/Authorization/Handlers/TeacherRequirementHandler.cs
@@ -1,10 +1,10 @@
-﻿using GradeManagement.Server.Authorization.Policies;
+﻿using GradeManagement.Shared.Authorization.Policies;
 
 using Microsoft.AspNetCore.Authorization;
 
 using System.Security.Claims;
 
-namespace GradeManagement.Server.Authorization.Handlers;
+namespace GradeManagement.Shared.Authorization.Handlers;
 
 public class TeacherRequirementHandler : AuthorizationHandler<TeacherRequirement>
 {
@@ -14,7 +14,7 @@ protected override Task HandleRequirementAsync(
         AuthorizationHandlerContext context, TeacherRequirement requirement)
     {
         //Here the email should be in Tenant or invited in by one meeting
-        var emailAddress = context.User.FindFirstValue(ClaimTypes.Email);
+        var emailAddress = context.User.FindFirst(ClaimTypes.Email)?.Value ?? context.User.FindFirst("email")?.Value;
         if (emailAddress is not null && (emailAddress.EndsWith("@vik.bme.hu") == true ||
                                          Whitelist.Contains(emailAddress)))
         {
diff --git a/grade-management-new/GradeManagement.Shared/Authorization/Policies/TeacherRequirement.cs b/grade-management-new/GradeManagement.Shared/Authorization/Policies/TeacherRequirement.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNetCore.Authorization;
 
-namespace GradeManagement.Client.Authorization.Policies;
+namespace GradeManagement.Shared.Authorization.Policies;
 
 public class TeacherRequirement : IAuthorizationRequirement
 {
diff --git a/grade-management-new/GradeManagement.Shared/GradeManagement.Shared.csproj b/grade-management-new/GradeManagement.Shared/GradeManagement.Shared.csproj
@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.2" />
+  </ItemGroup>
+
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-using GradeManagement.Server.Authorization.Policies;`
	`1`	`+using GradeManagement.Shared.Authorization.Policies;`
`2`	`2`
`3`	`3`	`using Microsoft.AspNetCore.Authorization;`
`4`	`4`
`5`	`5`	`using System.Security.Claims;`
`6`	`6`
`7`		`-namespace GradeManagement.Server.Authorization.Handlers;`
	`7`	`+namespace GradeManagement.Shared.Authorization.Handlers;`
`8`	`8`
`9`	`9`	`public class TeacherRequirementHandler : AuthorizationHandler<TeacherRequirement>`
`10`	`10`	`{`
`@@ -14,7 +14,7 @@ protected override Task HandleRequirementAsync(`
`14`	`14`	`AuthorizationHandlerContext context, TeacherRequirement requirement)`
`15`	`15`	`{`
`16`	`16`	`//Here the email should be in Tenant or invited in by one meeting`
`17`		`- var emailAddress = context.User.FindFirstValue(ClaimTypes.Email);`
	`17`	`+ var emailAddress = context.User.FindFirst(ClaimTypes.Email)?.Value ?? context.User.FindFirst("email")?.Value;`
`18`	`18`	`if (emailAddress is not null && (emailAddress.EndsWith("@vik.bme.hu") == true \|\|`
`19`	`19`	`Whitelist.Contains(emailAddress)))`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Microsoft.AspNetCore.Authorization;`
`2`	`2`
`3`		`-namespace GradeManagement.Client.Authorization.Policies;`
	`3`	`+namespace GradeManagement.Shared.Authorization.Policies;`
`4`	`4`
`5`	`5`	`public class TeacherRequirement : IAuthorizationRequirement`
`6`	`6`	`{`