fixes JWT authentication with .NET 8

WebVella · Nov 23, 2023 · 8afe254 · 8afe254
1 parent e19cb6c
commit 8afe254
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 27 deletions.
diff --git a/WebVella.Erp.Plugins.Project/Controllers/ProjectController.cs b/WebVella.Erp.Plugins.Project/Controllers/ProjectController.cs
@@ -480,34 +480,39 @@ public ContentResult TimeTrackJs([FromQuery]string file = "")
 			}
 		}
 
-
-        [AllowAnonymous]
+
         [Route("api/v3.0/p/project/user/get-current")]
         [HttpGet]
         public ActionResult GetCurrentUser()
         {
-            var response = new ResponseModel();
-
-            try
-            {
-				var boz = CurrentUserId;
-
-                var user = SecurityContext.CurrentUser;
-                response.Success = true;
-                response.Message = "Tested";
-                return Json(response);
-            }
-            catch (Exception ex)
-            {
-                response.Success = false;
-                response.Message = ex.Message;
-                return Json(response);
-            }
+			//        var response = new ResponseModel();
+
+			//        try
+			//        {
+			//var boz = CurrentUserId;
+
+			//            var user = SecurityContext.CurrentUser;
+			//            response.Success = true;
+			//            response.Message = "Tested";
+			//            return Json(response);
+			//        }
+			//        catch (Exception ex)
+			//        {
+			//            response.Success = false;
+			//            response.Message = ex.Message;
+			//            return Json(response);
+			//        }
+			return Json( new WvUser { Email = "email", Id = CurrentUserId.Value });
         }
 
         #endregion
 
     }
 
+	public class WvUser
+	{
+		public Guid Id { get; set; }
+		public string Email { get; set; }
+	}
 
 }
diff --git a/WebVella.Erp.Site.Project/Startup.cs b/WebVella.Erp.Site.Project/Startup.cs
@@ -160,8 +160,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 			});
 			app.UseStaticFiles(); //Workaround for blazor to work - https://github.com/dotnet/aspnetcore/issues/9588
 			app.UseRouting();
-			app.UseAuthentication();
-			app.UseAuthorization();
+
 
 			app
 			.UseErpPlugin<NextPlugin>()
@@ -171,6 +170,9 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 			.UseErpMiddleware()
 			.UseJwtMiddleware();
 
+			app.UseAuthentication();
+			app.UseAuthorization();
+
 			app.UseEndpoints(endpoints =>
 			{
 				endpoints.MapRazorPages();

diff --git a/WebVella.Erp.Site/Startup.cs b/WebVella.Erp.Site/Startup.cs
@@ -175,16 +175,18 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             });
             app.UseStaticFiles(); //Workaround for blazor to work - https://github.com/dotnet/aspnetcore/issues/9588
             app.UseRouting();
-            app.UseAuthentication();
-            app.UseAuthorization();
+
 
             app
             .UseErpPlugin<SdkPlugin>()
             .UseErp()
             .UseErpMiddleware()
             .UseJwtMiddleware();
 
-            app.UseEndpoints(endpoints =>
+			app.UseAuthentication();
+			app.UseAuthorization();
+
+			app.UseEndpoints(endpoints =>
             {
                 endpoints.MapRazorPages();
                 endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");

diff --git a/WebVella.Erp.Web/Middleware/JwtMiddleware.cs b/WebVella.Erp.Web/Middleware/JwtMiddleware.cs
@@ -47,6 +47,9 @@ public async Task Invoke(HttpContext context)
 						{
 							var user = new SecurityManager().GetUser(new Guid(nameIdentifier));
 							context.Items["User"] = user;
+
+						   var identity = new ClaimsIdentity(jwtToken.Claims, "jwt");
+						   context.User = new ClaimsPrincipal(identity);
 						}
 					}
 				}

diff --git a/WebVella.Erp.WebAssembly/Client/ApiService/ApiService.Project.cs b/WebVella.Erp.WebAssembly/Client/ApiService/ApiService.Project.cs
@@ -13,8 +13,8 @@ public async ValueTask<WvUser> GetCurrentUserAsync()
     {
         var httpClient = await GetAuthorizedHttpClientAsync();
 
-        //return await httpClient.GetAndReadAsJsonAsync<WvUser>($"{apiProjectRoot}user/get-current");
-        return await httpClient.PostAndReadAsJsonAsync<object,WvUser>($"/api/v3/en_US/eql",null);
+        return await httpClient.GetAndReadAsJsonAsync<WvUser>($"{apiProjectRoot}user/get-current");
+        //return await httpClient.PostAndReadAsJsonAsync<object,WvUser>($"/api/v3/en_US/eql",null);
     }
 
 }
diff --git a/WebVella.Erp.WebAssembly/Client/Components/General/WvLogin.razor.cs b/WebVella.Erp.WebAssembly/Client/Components/General/WvLogin.razor.cs
@@ -41,7 +41,7 @@ public async Task _loginBtnClick()
             if (!result)
                 throw new ValidationException("Грешно потребителско име или парола");
 
-            var user = await ApiService.GetCurrentUserAsync();
+           // var user = await ApiService.GetCurrentUserAsync();
 
             if (!String.IsNullOrWhiteSpace(_returnUrl))
                 Navigator.NavigateTo(_returnUrl);