Implemented AbpAspNetCoreMvcClientModule

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj

@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.Contracts\Volo.Abp.AspNetCore.Mvc.Contracts.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
     <ProjectReference Include="..\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Caching;
 using Volo.Abp.Http.Client;
 using Volo.Abp.Modularity;
 
@@ -6,7 +7,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
 {
     [DependsOn(
         typeof(AbpHttpClientModule),
-        typeof(AbpAspNetCoreMvcContractsModule)
+        typeof(AbpAspNetCoreMvcContractsModule),
+        typeof(AbpCachingModule)
         )]
     public class AbpAspNetCoreMvcClientModule : AbpModule
     {

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs

@@ -0,0 +1,65 @@
+using System;
+using Microsoft.AspNetCore.Http;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Distributed;
+using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
+using Volo.Abp.Caching;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Http.Client.DynamicProxying;
+using Volo.Abp.Users;
+
+namespace Volo.Abp.AspNetCore.Mvc.Client
+{
+    public class CachedApplicationConfigurationClient : ICachedApplicationConfigurationClient, ITransientDependency
+    {
+        public IHttpContextAccessor HttpContextAccessor { get; set; }
+
+        protected IHttpClientProxy<IAbpApplicationConfigurationAppService> Proxy { get; }
+        protected ICurrentUser CurrentUser { get; }
+        protected IDistributedCache<ApplicationConfigurationDto> Cache { get; }
+
+        public CachedApplicationConfigurationClient(
+            IDistributedCache<ApplicationConfigurationDto> cache,
+            IHttpClientProxy<IAbpApplicationConfigurationAppService> proxy,
+            ICurrentUser currentUser,
+            IHttpContextAccessor httpContextAccessor)
+        {
+            Proxy = proxy;
+            CurrentUser = currentUser;
+            HttpContextAccessor = httpContextAccessor;
+            Cache = cache;
+        }
+
+        public async Task<ApplicationConfigurationDto> GetAsync()
+        {
+            var cacheKey = CreateCacheKey();
+            var httpContext = HttpContextAccessor?.HttpContext;
+
+            if (httpContext != null && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration)
+            {
+                return configuration;
+            }
+
+            configuration = await Cache.GetOrAddAsync(
+                CreateCacheKey(),
+                async () => await Proxy.Service.GetAsync(),
+                () => new DistributedCacheEntryOptions
+                {
+                    AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(5)
+                }
+            );
+
+            if (httpContext != null)
+            {
+                httpContext.Items[cacheKey] = configuration;
+            }
+
+            return configuration;
+        }
+
+        protected virtual string CreateCacheKey()
+        {
+            return $"ApplicationConfiguration_{CurrentUser.Id?.ToString("N") ?? "Anonymous"}";
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
+
+namespace Volo.Abp.AspNetCore.Mvc.Client
+{
+    public interface ICachedApplicationConfigurationClient
+    {
+        Task<ApplicationConfigurationDto> GetAsync();
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemotePermissionChecker.cs

@@ -0,0 +1,32 @@
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Mvc.Client
+{
+    public class RemotePermissionChecker : IPermissionChecker, ITransientDependency
+    {
+        protected ICachedApplicationConfigurationClient ConfigurationClient { get; }
+
+        public RemotePermissionChecker(ICachedApplicationConfigurationClient configurationClient)
+        {
+            ConfigurationClient = configurationClient;
+        }
+
+        public async Task<PermissionGrantInfo> CheckAsync(string name)
+        {
+            var configuration = await ConfigurationClient.GetAsync();
+
+            return new PermissionGrantInfo(
+                name,
+                configuration.Auth.GrantedPolicies.ContainsKey(name)
+            );
+        }
+
+        public Task<PermissionGrantInfo> CheckAsync(ClaimsPrincipal claimsPrincipal, string name)
+        {
+            return CheckAsync(name);
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationAuthConfigurationDto.cs

@@ -1,7 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 {
+    [Serializable]
     public class ApplicationAuthConfigurationDto
     {
         public Dictionary<string, bool> Policies { get; set; }

framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs

@@ -1,9 +1,14 @@
-namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
+using System;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 {
+    [Serializable]
     public class ApplicationConfigurationDto
     {
         public ApplicationLocalizationConfigurationDto Localization { get; set; }
 
         public ApplicationAuthConfigurationDto Auth { get; set; }
+
+        public CurrentUserDto CurrentUser { get; set; }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationConfigurationDto.cs

@@ -1,7 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 {
+    [Serializable]
     public class ApplicationLocalizationConfigurationDto
     {
         public Dictionary<string, Dictionary<string, string>> Values { get; set; }

framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/CurrentUserDto.cs

@@ -0,0 +1,16 @@
+using System;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
+{
+    [Serializable]
+    public class CurrentUserDto
+    {
+        public bool IsAuthenticated { get; set; }
+
+        public Guid? Id { get; set; }
+
+        public Guid? TenantId { get; set; }
+
+        public string UserName { get; set; }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs

@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Authorization;
 using Volo.Abp.Localization;
+using Volo.Abp.Users;
 
 namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 {
@@ -17,16 +18,19 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
         private readonly IServiceProvider _serviceProvider;
         private readonly IAbpAuthorizationPolicyProvider _abpAuthorizationPolicyProvider;
         private readonly IAuthorizationService _authorizationService;
+        private readonly ICurrentUser _currentUser;
 
         public AbpApplicationConfigurationAppService(
             IOptions<AbpLocalizationOptions> localizationOptions,
             IServiceProvider serviceProvider,
             IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider,
-            IAuthorizationService authorizationService)
+            IAuthorizationService authorizationService,
+            ICurrentUser currentUser)
         {
             _serviceProvider = serviceProvider;
             _abpAuthorizationPolicyProvider = abpAuthorizationPolicyProvider;
             _authorizationService = authorizationService;
+            _currentUser = currentUser;
             _localizationOptions = localizationOptions.Value;
         }
 
@@ -37,7 +41,19 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
             return new ApplicationConfigurationDto
             {
                 Auth = await GetAuthConfig(),
-                Localization = GetLocalizationConfig()
+                Localization = GetLocalizationConfig(),
+                CurrentUser = GetCurrentUser()
+            };
+        }
+
+        protected virtual CurrentUserDto GetCurrentUser()
+        {
+            return new CurrentUserDto
+            {
+                IsAuthenticated = _currentUser.IsAuthenticated,
+                Id = _currentUser.Id,
+                TenantId = _currentUser.TenantId,
+                UserName = _currentUser.UserName
             };
         }
 

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 {
     [Route("api/abp/application-configuration")]
-    public class AbpApplicationConfigurationController : AbpController
+    public class AbpApplicationConfigurationController : AbpController, IAbpApplicationConfigurationAppService
     {
         private readonly IAbpApplicationConfigurationAppService _applicationConfigurationAppService;
 

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs

@@ -79,6 +79,7 @@ namespace Volo.Abp.AspNetCore.Mvc
                 return;
             }
 
+            Logger.LogDebug($"ActionApiDescriptionModel.Create: {controllerModel.ControllerName}.{uniqueMethodName}");
             var actionModel = controllerModel.AddAction(uniqueMethodName, ActionApiDescriptionModel.Create(
                 uniqueMethodName,
                 method,

framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs

@@ -1,4 +1,4 @@
-using System.Net.Http.Headers;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
@@ -26,9 +26,7 @@ namespace Volo.Abp.Http.Client.IdentityModel
 
             if (accessToken != null)
             {
-                //TODO: "Bearer" should be configurable
-                context.Client.DefaultRequestHeaders.Authorization
-                    = new AuthenticationHeaderValue("Bearer", accessToken);
+                context.Client.SetBearerToken(accessToken);
             }
             else
             {