Merge branch 'OpenIdDict' of github.com:Lan2Play/NetEvent into OpenIdDict

Apfelwurm · Apfelwurm · commit 6b10acaff9df · 2022-04-23T14:39:55.000+02:00
diff --git a/NetEvent/Client/Pages/Administration/Users.razor b/NetEvent/Client/Pages/Administration/Users.razor
@@ -8,7 +8,7 @@
 
 <MudTabs Elevation="1" Rounded="true">
     <MudTabPanel Text="User">
-        <MudDataGrid T="CurrentUser"
+        <MudDataGrid T="User"
                      MultiSelection="false"
                      Items="@AllUsers"
                      Sortable="true"
@@ -27,27 +27,27 @@
             </ToolBarContent>
             <Columns>
                 @*<SelectColumn T="ApplicationUser" />*@
-                <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">
+                <Column T="User" Field="UserName" Title="Username" />
+                <Column T="User" Field="FirstName" />
+                <Column T="User" Field="LastName" />
+                <Column T="User" Field="Email" />
+                @*<Column T="User" Field="PhoneNumber" Title="Molar mass" />*@
+                <Column T="User" 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="CurrentUser" CellClass="d-flex justify-end">
+                <Column T="User" CellClass="d-flex justify-end">
                     <CellTemplate>
                         <MudIconButton Size="@Size.Small" Icon="@Icons.Outlined.Edit" OnClick="@context.Actions.StartEditingItem" />
                     </CellTemplate>
                 </Column>
             </Columns>
             <PagerContent>
-                <MudDataGridPager T="CurrentUser" />
+                <MudDataGridPager T="User" />
             </PagerContent>
         </MudDataGrid>
     </MudTabPanel>
diff --git a/NetEvent/Client/Pages/Administration/Users.razor.cs b/NetEvent/Client/Pages/Administration/Users.razor.cs
@@ -13,17 +13,17 @@ public partial class Users
 
         protected override async Task OnInitializedAsync()
         {
-            AllUsers = await Utils.Get<List<CurrentUser>>(HttpClient, "users");
+            AllUsers = await Utils.Get<List<User>>(HttpClient, "users");
             AllRoles = await Utils.Get<List<IdentityRole>>(HttpClient, "roles");
         }
 
         #region Users
 
-        public List<CurrentUser>? AllUsers { get; private set; }
+        public List<User>? AllUsers { get; private set; }
         private string _usersSearchString;
 
         // quick filter - filter gobally across multiple columns with the same input
-        private Func<CurrentUser, bool> _usersQuickFilter => x =>
+        private Func<User, bool> _usersQuickFilter => x =>
         {
             if (string.IsNullOrWhiteSpace(_usersSearchString))
                 return true;
@@ -44,7 +44,7 @@ protected override async Task OnInitializedAsync()
         };
 
 
-        void CommittedUserChanges(CurrentUser item)
+        void CommittedUserChanges(User item)
         {
             _ = Utils.Put(HttpClient, $"users/{item.Id}", item);
         }
diff --git a/NetEvent/Server/Modules/Users/Endpoints/GetUser/GetUserResponse.cs b/NetEvent/Server/Modules/Users/Endpoints/GetUser/GetUserResponse.cs
@@ -3,9 +3,9 @@
 
 namespace NetEvent.Server.Modules.Users.Endpoints.GetUser
 {
-    public class GetUserResponse : ResponseBase<CurrentUser>
+    public class GetUserResponse : ResponseBase<User>
     {
-        public GetUserResponse(CurrentUser value) : base(value)
+        public GetUserResponse(User value) : base(value)
         {
         }
 
diff --git a/NetEvent/Server/Modules/Users/Endpoints/GetUsers/GetUsersHandler.cs b/NetEvent/Server/Modules/Users/Endpoints/GetUsers/GetUsersHandler.cs
@@ -20,7 +20,7 @@ public async Task<GetUsersResponse> Handle(GetUsersRequest request, Cancellation
         {
             var allUsers = await _UserDbContext.Users.ToListAsync();
 
-            var convertedUsers = allUsers.Select(a => new CurrentUser()
+            var convertedUsers = allUsers.Select(a => new User()
             {
                 Id = a.Id,
                 UserName = a.UserName,
diff --git a/NetEvent/Server/Modules/Users/Endpoints/GetUsers/GetUsersResponse.cs b/NetEvent/Server/Modules/Users/Endpoints/GetUsers/GetUsersResponse.cs
@@ -3,9 +3,9 @@
 
 namespace NetEvent.Server.Modules.Users.Endpoints.GetUsers
 {
-    public class GetUsersResponse : ResponseBase<IEnumerable<CurrentUser>>
+    public class GetUsersResponse : ResponseBase<IEnumerable<User>>
     {
-        public GetUsersResponse(IEnumerable<CurrentUser>? value) : base(value)
+        public GetUsersResponse(IEnumerable<User>? value) : base(value)
         {
         }
 
diff --git a/NetEvent/Server/Modules/Users/Endpoints/PutUser/PutUserHandler.cs b/NetEvent/Server/Modules/Users/Endpoints/PutUser/PutUserHandler.cs
@@ -32,7 +32,7 @@ public async Task<PutUserResponse> Handle(PutUserRequest request, CancellationTo
             return new PutUserResponse();
         }
 
-        private static void UpdateOldUser(ApplicationUser oldUser, CurrentUser user)
+        private static void UpdateOldUser(ApplicationUser oldUser, User user)
         {
             oldUser.UserName = user.UserName;
             oldUser.FirstName = user.FirstName;
diff --git a/NetEvent/Server/Modules/Users/Endpoints/PutUser/PutUserRequest.cs b/NetEvent/Server/Modules/Users/Endpoints/PutUser/PutUserRequest.cs
@@ -5,13 +5,13 @@ namespace NetEvent.Server.Modules.Users.Endpoints.PutUser
 {
     public class PutUserRequest : IRequest<PutUserResponse>
     {
-        public PutUserRequest(string id, CurrentUser user)
+        public PutUserRequest(string id, User user)
         {
             Id = id;
             User = user;
         }
 
         public string Id { get; }
-        public CurrentUser User { get; }
+        public User User { get; }
     }
 }
diff --git a/NetEvent/Server/Modules/Users/UsersModule.cs b/NetEvent/Server/Modules/Users/UsersModule.cs
@@ -16,7 +16,7 @@ public override IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoin
             //endpoints.MapGet("/users", GetUsers.Handle);
             endpoints.MapGet("/users", async ([FromServices] IMediator m) => ToApiResult(await m.Send(new GetUsersRequest())));
             endpoints.MapGet("/users/{id}", async ([FromRoute] string id, [FromServices] IMediator m) => ToApiResult(await m.Send(new GetUserRequest(id))));
-            endpoints.MapPut("/users/{id}", async ([FromRoute] string id, [FromBody] CurrentUser user, [FromServices] IMediator m) => ToApiResult(await m.Send(new PutUserRequest(id, user))));
+            endpoints.MapPut("/users/{id}", async ([FromRoute] string id, [FromBody] User user, [FromServices] IMediator m) => ToApiResult(await m.Send(new PutUserRequest(id, user))));
             return endpoints;
         }
 
diff --git a/NetEvent/Server/Program.cs b/NetEvent/Server/Program.cs
@@ -11,7 +11,6 @@
 {
     case "sqlite":
         {
-
             builder.Services.AddDbContext<ApplicationDbContext, SqliteApplicationDbContext>();
         }
         break;
@@ -57,11 +56,12 @@
 
 var app = builder.Build();
 
-using (IServiceScope scope = app.Services.CreateScope())
+using (var scope = app.Services.GetRequiredService<IServiceScopeFactory>().CreateScope())
 {
-    var dbContext = app.Services.GetRequiredService<ApplicationDbContext>();
-
-    await dbContext.Database.MigrateAsync().ConfigureAwait(false);
+    using (var ctx = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>())
+    {
+        ctx.Database.Migrate();
+    }
 }
 
 if (app.Environment.IsDevelopment())

Original file line number	Diff line number	Diff line change
`@@ -13,17 +13,17 @@ public partial class Users`
`13`	`13`
`14`	`14`	`protected override async Task OnInitializedAsync()`
`15`	`15`	`{`
`16`		`- AllUsers = await Utils.Get<List<CurrentUser>>(HttpClient, "users");`
	`16`	`+ AllUsers = await Utils.Get<List<User>>(HttpClient, "users");`
`17`	`17`	`AllRoles = await Utils.Get<List<IdentityRole>>(HttpClient, "roles");`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`#region Users`
`21`	`21`
`22`		`- public List<CurrentUser>? AllUsers { get; private set; }`
	`22`	`+ public List<User>? AllUsers { get; private set; }`
`23`	`23`	`private string _usersSearchString;`
`24`	`24`
`25`	`25`	`// quick filter - filter gobally across multiple columns with the same input`
`26`		`- private Func<CurrentUser, bool> _usersQuickFilter => x =>`
	`26`	`+ private Func<User, bool> _usersQuickFilter => x =>`
`27`	`27`	`{`
`28`	`28`	`if (string.IsNullOrWhiteSpace(_usersSearchString))`
`29`	`29`	`return true;`
`@@ -44,7 +44,7 @@ protected override async Task OnInitializedAsync()`
`44`	`44`	`};`
`45`	`45`
`46`	`46`
`47`		`- void CommittedUserChanges(CurrentUser item)`
	`47`	`+ void CommittedUserChanges(User item)`
`48`	`48`	`{`
`49`	`49`	`_ = Utils.Put(HttpClient, $"users/{item.Id}", item);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`
`4`	`4`	`namespace NetEvent.Server.Modules.Users.Endpoints.GetUser`
`5`	`5`	`{`
`6`		`- public class GetUserResponse : ResponseBase<CurrentUser>`
	`6`	`+ public class GetUserResponse : ResponseBase<User>`
`7`	`7`	`{`
`8`		`- public GetUserResponse(CurrentUser value) : base(value)`
	`8`	`+ public GetUserResponse(User value) : base(value)`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public async Task<GetUsersResponse> Handle(GetUsersRequest request, Cancellation`
`20`	`20`	`{`
`21`	`21`	`var allUsers = await _UserDbContext.Users.ToListAsync();`
`22`	`22`
`23`		`- var convertedUsers = allUsers.Select(a => new CurrentUser()`
	`23`	`+ var convertedUsers = allUsers.Select(a => new User()`
`24`	`24`	`{`
`25`	`25`	`Id = a.Id,`
`26`	`26`	`UserName = a.UserName,`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`
`4`	`4`	`namespace NetEvent.Server.Modules.Users.Endpoints.GetUsers`
`5`	`5`	`{`
`6`		`- public class GetUsersResponse : ResponseBase<IEnumerable<CurrentUser>>`
	`6`	`+ public class GetUsersResponse : ResponseBase<IEnumerable<User>>`
`7`	`7`	`{`
`8`		`- public GetUsersResponse(IEnumerable<CurrentUser>? value) : base(value)`
	`8`	`+ public GetUsersResponse(IEnumerable<User>? value) : base(value)`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public async Task<PutUserResponse> Handle(PutUserRequest request, CancellationTo`
`32`	`32`	`return new PutUserResponse();`
`33`	`33`	`}`
`34`	`34`
`35`		`- private static void UpdateOldUser(ApplicationUser oldUser, CurrentUser user)`
	`35`	`+ private static void UpdateOldUser(ApplicationUser oldUser, User user)`
`36`	`36`	`{`
`37`	`37`	`oldUser.UserName = user.UserName;`
`38`	`38`	`oldUser.FirstName = user.FirstName;`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@ namespace NetEvent.Server.Modules.Users.Endpoints.PutUser`
`5`	`5`	`{`
`6`	`6`	`public class PutUserRequest : IRequest<PutUserResponse>`
`7`	`7`	`{`
`8`		`- public PutUserRequest(string id, CurrentUser user)`
	`8`	`+ public PutUserRequest(string id, User user)`
`9`	`9`	`{`
`10`	`10`	`Id = id;`
`11`	`11`	`User = user;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public string Id { get; }`
`15`		`- public CurrentUser User { get; }`
	`15`	`+ public User User { get; }`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public override IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoin`
`16`	`16`	`//endpoints.MapGet("/users", GetUsers.Handle);`
`17`	`17`	`endpoints.MapGet("/users", async ([FromServices] IMediator m) => ToApiResult(await m.Send(new GetUsersRequest())));`
`18`	`18`	`endpoints.MapGet("/users/{id}", async ([FromRoute] string id, [FromServices] IMediator m) => ToApiResult(await m.Send(new GetUserRequest(id))));`
`19`		`- endpoints.MapPut("/users/{id}", async ([FromRoute] string id, [FromBody] CurrentUser user, [FromServices] IMediator m) => ToApiResult(await m.Send(new PutUserRequest(id, user))));`
	`19`	`+ endpoints.MapPut("/users/{id}", async ([FromRoute] string id, [FromBody] User user, [FromServices] IMediator m) => ToApiResult(await m.Send(new PutUserRequest(id, user))));`
`20`	`20`	`return endpoints;`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`{`
`12`	`12`	`case "sqlite":`
`13`	`13`	`{`
`14`		`-`
`15`	`14`	`builder.Services.AddDbContext<ApplicationDbContext, SqliteApplicationDbContext>();`
`16`	`15`	`}`
`17`	`16`	`break;`
`@@ -57,11 +56,12 @@`
`57`	`56`
`58`	`57`	`var app = builder.Build();`
`59`	`58`
`60`		`-using (IServiceScope scope = app.Services.CreateScope())`
	`59`	`+using (var scope = app.Services.GetRequiredService<IServiceScopeFactory>().CreateScope())`
`61`	`60`	`{`
`62`		`- var dbContext = app.Services.GetRequiredService<ApplicationDbContext>();`
`63`		`-`
`64`		`- await dbContext.Database.MigrateAsync().ConfigureAwait(false);`
	`61`	`+ using (var ctx = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>())`
	`62`	`+ {`
	`63`	`+ ctx.Database.Migrate();`
	`64`	`+ }`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (app.Environment.IsDevelopment())`