Shady nagy/net6 (#614)

* udated to .net6 * used the .net6 version RC2 * added editconfig. * App core new Scoped Namespaces style. * BlazorAdmin new Scoped Namespaces style. * Blazor Shared new Scoped Namespaces style. * Infra new Scoped Namespaces style. * public api new Scoped Namespaces style. * web new Scoped Namespaces style. * FunctionalTests new Scoped Namespaces style. * Integrational tests new Scoped Namespaces style. * unit tests new Scoped Namespaces style. * update github action. * update github action. * change the global.
2021-11-06 01:55:48 +02:00
parent 64f150dc07
commit 9db2feb930
252 changed files with 6307 additions and 6413 deletions
--- a/src/Web/Controllers/UserController.cs
+++ b/src/Web/Controllers/UserController.cs
@@ -1,75 +1,74 @@
-using BlazorShared.Authorization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopWeb.ApplicationCore.Interfaces;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using BlazorShared.Authorization;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;

-namespace Microsoft.eShopWeb.Web.Controllers
+namespace Microsoft.eShopWeb.Web.Controllers;
+
+[Route("[controller]")]
+[ApiController]
+public class UserController : ControllerBase
 {
-    [Route("[controller]")]
-    [ApiController]
-    public class UserController : ControllerBase
+    private readonly ITokenClaimsService _tokenClaimsService;
+
+    public UserController(ITokenClaimsService tokenClaimsService)
    {
-        private readonly ITokenClaimsService _tokenClaimsService;
-
-        public UserController(ITokenClaimsService tokenClaimsService)
-        {
-            _tokenClaimsService = tokenClaimsService;
-        }
-
-        [HttpGet]
-        [Authorize]
-        [AllowAnonymous]
-        public async Task<IActionResult> GetCurrentUser() =>
-            Ok(User.Identity.IsAuthenticated ? await CreateUserInfo(User) : UserInfo.Anonymous);
-
-        private async Task<UserInfo> CreateUserInfo(ClaimsPrincipal claimsPrincipal)
-        {
-            if (!claimsPrincipal.Identity.IsAuthenticated)
-            {
-                return UserInfo.Anonymous;
-            }
-
-            var userInfo = new UserInfo
-            {
-                IsAuthenticated = true
-            };
-
-            if (claimsPrincipal.Identity is ClaimsIdentity claimsIdentity)
-            {
-                userInfo.NameClaimType = claimsIdentity.NameClaimType;
-                userInfo.RoleClaimType = claimsIdentity.RoleClaimType;
-            }
-            else
-            {
-                userInfo.NameClaimType = "name";
-                userInfo.RoleClaimType = "role";
-            }
-
-            if (claimsPrincipal.Claims.Any())
-            {
-                var claims = new List<ClaimValue>();
-                var nameClaims = claimsPrincipal.FindAll(userInfo.NameClaimType);
-                foreach (var claim in nameClaims)
-                {
-                    claims.Add(new ClaimValue(userInfo.NameClaimType, claim.Value));
-                }
-
-                foreach (var claim in claimsPrincipal.Claims.Except(nameClaims))
-                {
-                    claims.Add(new ClaimValue(claim.Type, claim.Value));
-                }
-
-                userInfo.Claims = claims;
-            }
-
-            var token = await _tokenClaimsService.GetTokenAsync(claimsPrincipal.Identity.Name);
-            userInfo.Token = token;
-
-            return userInfo;
-        }
+        _tokenClaimsService = tokenClaimsService;
    }
-}
+
+    [HttpGet]
+    [Authorize]
+    [AllowAnonymous]
+    public async Task<IActionResult> GetCurrentUser() =>
+        Ok(User.Identity.IsAuthenticated ? await CreateUserInfo(User) : UserInfo.Anonymous);
+
+    private async Task<UserInfo> CreateUserInfo(ClaimsPrincipal claimsPrincipal)
+    {
+        if (!claimsPrincipal.Identity.IsAuthenticated)
+        {
+            return UserInfo.Anonymous;
+        }
+
+        var userInfo = new UserInfo
+        {
+            IsAuthenticated = true
+        };
+
+        if (claimsPrincipal.Identity is ClaimsIdentity claimsIdentity)
+        {
+            userInfo.NameClaimType = claimsIdentity.NameClaimType;
+            userInfo.RoleClaimType = claimsIdentity.RoleClaimType;
+        }
+        else
+        {
+            userInfo.NameClaimType = "name";
+            userInfo.RoleClaimType = "role";
+        }
+
+        if (claimsPrincipal.Claims.Any())
+        {
+            var claims = new List<ClaimValue>();
+            var nameClaims = claimsPrincipal.FindAll(userInfo.NameClaimType);
+            foreach (var claim in nameClaims)
+            {
+                claims.Add(new ClaimValue(userInfo.NameClaimType, claim.Value));
+            }
+
+            foreach (var claim in claimsPrincipal.Claims.Except(nameClaims))
+            {
+                claims.Add(new ClaimValue(claim.Type, claim.Value));
+            }
+
+            userInfo.Claims = claims;
+        }
+
+        var token = await _tokenClaimsService.GetTokenAsync(claimsPrincipal.Identity.Name);
+        userInfo.Token = token;
+
+        return userInfo;
+    }
+}