Merge pull request #6 from Lan2Play/feature/AuthRework

Rework auth
Lan2Play · Apr 21, 2022 · 5f4da42 · 5f4da42
2 parents 40499e7 + 21eea00
commit 5f4da42
Show file tree

Hide file tree

Showing 93 changed files with 716 additions and 2,333 deletions.
diff --git a/NetEvent/Client/Models/User.cs b/NetEvent/Client/Models/User.cs
diff --git a/NetEvent/Client/NetEvent.Client.csproj b/NetEvent/Client/NetEvent.Client.csproj
@@ -28,8 +28,4 @@
 		<ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<Folder Include="Models\" />
-	</ItemGroup>
-
 </Project>
diff --git a/NetEvent/Client/Pages/Administration/Index.razor.cs b/NetEvent/Client/Pages/Administration/Index.razor.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Components;
-using NetEvent.Shared.Models;
+using NetEvent.Shared.Dto;
 
 namespace NetEvent.Client.Pages.Administration
 {
@@ -9,11 +9,11 @@ public partial class Index
         [Inject]
         public HttpClient HttpClient { get; set; }
 
-        public List<ApplicationUser>? Users { get; private set; }
+        public List<CurrentUser>? Users { get; private set; }
 
         protected override async Task OnInitializedAsync()
         {
-            Users = await Utils.Get<List<ApplicationUser>>(HttpClient, "users");
+            Users = await Utils.Get<List<CurrentUser>>(HttpClient, "users");
         }
 
     }

diff --git a/NetEvent/Client/Pages/Administration/Settings.razor b/NetEvent/Client/Pages/Administration/Settings.razor
@@ -1,6 +1,6 @@
 @page "/administration/settings"
 @using Microsoft.AspNetCore.Authorization
-@using NetEvent.Shared.Models;
+
 
 @attribute [Authorize(Roles = "Admin")]
 

diff --git a/NetEvent/Client/Pages/Administration/Settings.razor.cs b/NetEvent/Client/Pages/Administration/Settings.razor.cs
@@ -1,21 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using System.Net.Http;
-using System.Net.Http.Json;
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.Components.Web.Virtualization;
-using Microsoft.AspNetCore.Components.WebAssembly.Http;
-using Microsoft.JSInterop;
-using NetEvent.Client;
-using NetEvent.Client.Shared;
-using MudBlazor;
-using NetEvent.Shared.Models;
 
 namespace NetEvent.Client.Pages.Administration
 {

diff --git a/NetEvent/Client/Pages/Administration/Users.razor b/NetEvent/Client/Pages/Administration/Users.razor
@@ -1,13 +1,14 @@
 @page "/administration/users"
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Identity
-@using NetEvent.Shared.Models;
+@using NetEvent.Shared.Dto
+
 
 @attribute [Authorize(Roles = "Admin")]
 
 <MudTabs Elevation="1" Rounded="true">
     <MudTabPanel Text="User">
-        <MudDataGrid T="ApplicationUser"
+        <MudDataGrid T="CurrentUser"
                      MultiSelection="false"
                      Items="@AllUsers"
                      Sortable="true"
@@ -26,27 +27,27 @@
             </ToolBarContent>
             <Columns>
                 @*<SelectColumn T="ApplicationUser" />*@
-                <Column T="ApplicationUser" Field="UserName" Title="Username" />
-                <Column T="ApplicationUser" Field="FirstName" />
-                <Column T="ApplicationUser" Field="LastName" />
-                <Column T="ApplicationUser" Field="Email" />
-                <Column T="ApplicationUser" Field="PhoneNumber" Title="Molar mass" />
-                <Column T="ApplicationUser" Field="EmailConfirmed">
+                <Column T="CurrentUser" Field="UserName" Title="Username" />
+                <Column T="CurrentUser" Field="FirstName" />
+                <Column T="CurrentUser" Field="LastName" />
+                <Column T="CurrentUser" Field="Email" />
+                <Column T="CurrentUser" Field="PhoneNumber" Title="Molar mass" />
+                <Column T="CurrentUser" Field="EmailConfirmed">
                     <CellTemplate>
                         <MudCheckBox Checked="@context.Item.EmailConfirmed" ReadOnly="true" />
                     </CellTemplate>
                     <EditTemplate>
                         <MudCheckBox @bind-Checked="@context.Item.EmailConfirmed" Label="Email confirmed" />
                     </EditTemplate>
                 </Column>
-                <Column T="ApplicationUser" CellClass="d-flex justify-end">
+                <Column T="CurrentUser" CellClass="d-flex justify-end">
                     <CellTemplate>
                         <MudIconButton Size="@Size.Small" Icon="@Icons.Outlined.Edit" OnClick="@context.Actions.StartEditingItem" />
                     </CellTemplate>
                 </Column>
             </Columns>
             <PagerContent>
-                <MudDataGridPager T="ApplicationUser" />
+                <MudDataGridPager T="CurrentUser" />
             </PagerContent>
         </MudDataGrid>
     </MudTabPanel>

diff --git a/NetEvent/Client/Pages/Administration/Users.razor.cs b/NetEvent/Client/Pages/Administration/Users.razor.cs
@@ -1,22 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using System.Net.Http;
-using System.Net.Http.Json;
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.Components.Web.Virtualization;
-using Microsoft.AspNetCore.Components.WebAssembly.Http;
-using Microsoft.JSInterop;
-using NetEvent.Client;
-using NetEvent.Client.Shared;
-using MudBlazor;
-using NetEvent.Shared.Models;
 using Microsoft.AspNetCore.Identity;
+using NetEvent.Shared.Dto;
 
 namespace NetEvent.Client.Pages.Administration
 {
@@ -29,17 +13,17 @@ public partial class Users
 
         protected override async Task OnInitializedAsync()
         {
-            AllUsers = await Utils.Get<List<ApplicationUser>>(HttpClient, "users");
+            AllUsers = await Utils.Get<List<CurrentUser>>(HttpClient, "users");
             AllRoles = await Utils.Get<List<IdentityRole>>(HttpClient, "roles");
         }
 
         #region Users
 
-        public List<ApplicationUser>? AllUsers { get; private set; }
+        public List<CurrentUser>? AllUsers { get; private set; }
         private string _usersSearchString;
 
         // quick filter - filter gobally across multiple columns with the same input
-        private Func<ApplicationUser, bool> _usersQuickFilter => x =>
+        private Func<CurrentUser, bool> _usersQuickFilter => x =>
         {
             if (string.IsNullOrWhiteSpace(_usersSearchString))
                 return true;
@@ -60,7 +44,7 @@ protected override async Task OnInitializedAsync()
         };
 
 
-        void CommittedUserChanges(ApplicationUser item)
+        void CommittedUserChanges(CurrentUser item)
         {
             _ = Utils.Put(HttpClient, $"users/{item.Id}", item);
         }

diff --git a/NetEvent/Client/Pages/Authentication.razor b/NetEvent/Client/Pages/Authentication.razor
diff --git a/NetEvent/Client/Pages/Index.razor b/NetEvent/Client/Pages/Index.razor
@@ -5,5 +5,3 @@
 <h1>Hello, world!</h1>
 
 Welcome to your new app.
-
-<SurveyPrompt Title="How is Blazor working for you?" />
diff --git a/NetEvent/Client/Pages/Login.razor b/NetEvent/Client/Pages/Login.razor
@@ -0,0 +1,17 @@
+@page "/login"
+
+<h3>Login</h3>
+
+<EditForm Model="LoginRequest" OnValidSubmit="ExecuteLogin">
+    <DataAnnotationsValidator />
+    <MudCard >
+        <MudCardContent>         
+            <MudTextField id="Input.Email" Label="Email" @bind-Value="LoginRequest.UserName" For="@(() => LoginRequest.UserName)" />
+            <MudTextField id="Input.Password" Label="Password" @bind-Value="LoginRequest.Password" For="@(() => LoginRequest.Password)" InputType="InputType.Password" />
+             <MudCheckBox id="Input.Remember" Label="Remember Me" @bind-Checked="LoginRequest.RememberMe" />
+        </MudCardContent>
+        <MudCardActions>
+            <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Outlined" Color="Color.Primary" Class="ma-2 py-2">Login</MudButton>
+        </MudCardActions>
+    </MudCard>    
+</EditForm>
diff --git a/NetEvent/Client/Pages/Login.razor.cs b/NetEvent/Client/Pages/Login.razor.cs
@@ -0,0 +1,43 @@
+using Microsoft.AspNetCore.Components;
+using NetEvent.Client.Services;
+using NetEvent.Shared.Dto;
+
+namespace NetEvent.Client.Pages
+{
+    public partial class Login
+    {
+        [Inject]
+        public CustomStateProvider AuthenticationStateProvider { get; set; }
+
+        [Inject]
+        public NavigationManager NavigationManager { get; set; }
+
+
+        public LoginRequest LoginRequest { get; set; } = new ();
+
+
+        public string Error { get; set; }
+
+
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            if (firstRender)
+            {
+
+            }
+        }
+
+        public async Task ExecuteLogin()
+        {
+            try
+            {
+                await AuthenticationStateProvider.Login(LoginRequest);
+                NavigationManager.NavigateTo("");
+            }
+            catch (Exception ex)
+            {
+                Error = ex.Message;
+            }
+        }
+    }
+}
diff --git a/NetEvent/Client/Pages/Profile/Manage.razor b/NetEvent/Client/Pages/Profile/Manage.razor
diff --git a/NetEvent/Client/Pages/Profile/Manage.razor.cs b/NetEvent/Client/Pages/Profile/Manage.razor.cs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,5 +5,3 @@
		<h1>Hello, world!</h1>

		Welcome to your new app.

		<SurveyPrompt Title="How is Blazor working for you?" />