Merge pull request #89 from EasyAbp/abp-wechat-230

Upgrade to Abp.WeChat 2.3.0 to share tokens and tickets
EasyAbp · Jan 13, 2023 · f1568da · f1568da
2 parents 8f14e11 + 76da4bd
commit f1568da
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 35 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
 
     <AbpVersion>7.0.0</AbpVersion>
     <EasyAbpAbpTagHelperPlusModuleVersion>1.3.0</EasyAbpAbpTagHelperPlusModuleVersion>
-    <EasyAbpAbpWeChatModuleVersion>2.2.0</EasyAbpAbpWeChatModuleVersion>
+    <EasyAbpAbpWeChatModuleVersion>2.3.0</EasyAbpAbpWeChatModuleVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.0.1</Version>
+    <Version>2.1.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/...hat/OpenPlatform/ThirdPartyPlatform/AuthorizerRefreshToken/AuthorizerRefreshTokenStore.cs b/...hat/OpenPlatform/ThirdPartyPlatform/AuthorizerRefreshToken/AuthorizerRefreshTokenStore.cs
@@ -15,12 +15,12 @@ public class AuthorizerRefreshTokenStore : IAuthorizerRefreshTokenStore, ITransi
 {
     private readonly IStringEncryptionService _stringEncryptionService;
     private readonly IAuthorizerSecretRepository _authorizerSecretRepository;
-    private readonly IDistributedCache<string> _cache;
+    private readonly CacheAuthorizerRefreshTokenStore _cache;
 
     public AuthorizerRefreshTokenStore(
         IStringEncryptionService stringEncryptionService,
         IAuthorizerSecretRepository authorizerSecretRepository,
-        IDistributedCache<string> cache)
+        CacheAuthorizerRefreshTokenStore cache)
     {
         _stringEncryptionService = stringEncryptionService;
         _authorizerSecretRepository = authorizerSecretRepository;
@@ -29,30 +29,26 @@ public class AuthorizerRefreshTokenStore : IAuthorizerRefreshTokenStore, ITransi
 
     public virtual async Task<string> GetOrNullAsync(string componentAppId, string authorizerAppId)
     {
-        var cacheKey = await GetCacheKeyAsync(componentAppId, authorizerAppId);
-        var cache = await _cache.GetAsync(cacheKey);
+        var cachedValue = await _cache.GetOrNullAsync(componentAppId, authorizerAppId);
 
-        if (cache != null)
+        if (cachedValue != null)
         {
-            return cache;
+            return cachedValue;
         }
 
         var authorizerSecret = await _authorizerSecretRepository.FindAsync(x =>
             x.ComponentAppId == componentAppId && x.AuthorizerAppId == authorizerAppId);
 
-        cache = authorizerSecret?.GetRefreshToken(_stringEncryptionService);
+        cachedValue = authorizerSecret?.GetRefreshToken(_stringEncryptionService);
 
-        await _cache.SetAsync(cacheKey, cache);
+        await _cache.SetAsync(componentAppId, authorizerAppId, cachedValue);
 
-        return cache;
+        return cachedValue;
     }
 
     public virtual async Task SetAsync(string componentAppId, string authorizerAppId, string authorizerRefreshToken)
     {
         // Set only the cache value.
-        await _cache.SetAsync(await GetCacheKeyAsync(componentAppId, authorizerAppId), authorizerRefreshToken);
+        await _cache.SetAsync(componentAppId, authorizerAppId, authorizerRefreshToken);
     }
-
-    protected virtual async Task<string> GetCacheKeyAsync(string componentAppId, string authorizerAppId) =>
-        $"WeChatAuthorizerRefreshToken:{componentAppId}:{authorizerAppId}";
 }
diff --git a/...Abp/Abp/WeChat/OpenPlatform/ThirdPartyPlatform/VerifyTicket/ComponentVerifyTicketStore.cs b/...Abp/Abp/WeChat/OpenPlatform/ThirdPartyPlatform/VerifyTicket/ComponentVerifyTicketStore.cs
@@ -1,8 +1,5 @@
-using System;
 using System.Threading.Tasks;
 using EasyAbp.WeChatManagement.Common.WeChatApps;
-using Microsoft.Extensions.Caching.Distributed;
-using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Security.Encryption;
 using Volo.Abp.Uow;
@@ -17,13 +14,13 @@ public class ComponentVerifyTicketStore : IComponentVerifyTicketStore, ITransien
     private readonly IUnitOfWorkManager _unitOfWorkManager;
     private readonly IStringEncryptionService _stringEncryptionService;
     private readonly IWeChatAppRepository _weChatAppRepository;
-    private readonly IDistributedCache<string> _cache;
+    private readonly CacheComponentVerifyTicketStore _cache;
 
     public ComponentVerifyTicketStore(
         IUnitOfWorkManager unitOfWorkManager,
         IStringEncryptionService stringEncryptionService,
         IWeChatAppRepository weChatAppRepository,
-        IDistributedCache<string> cache)
+        CacheComponentVerifyTicketStore cache)
     {
         _unitOfWorkManager = unitOfWorkManager;
         _stringEncryptionService = stringEncryptionService;
@@ -34,21 +31,20 @@ public class ComponentVerifyTicketStore : IComponentVerifyTicketStore, ITransien
     [UnitOfWork]
     public virtual async Task<string> GetOrNullAsync(string componentAppId)
     {
-        var cacheKey = await GetCacheKeyAsync(componentAppId);
-        var cache = await _cache.GetAsync(cacheKey);
+        var cachedValue = await _cache.GetOrNullAsync(componentAppId);
 
-        if (cache != null)
+        if (cachedValue != null)
         {
-            return cache;
+            return cachedValue;
         }
 
         var weChatApp = await _weChatAppRepository.FindThirdPartyPlatformAppByAppIdAsync(componentAppId);
 
-        cache = weChatApp?.GetVerifyTicketOrNullAsync(_stringEncryptionService);
+        cachedValue = weChatApp?.GetVerifyTicketOrNullAsync(_stringEncryptionService);
 
-        await _cache.SetAsync(cacheKey, cache);
+        await _cache.SetAsync(componentAppId, cachedValue);
 
-        return cache;
+        return cachedValue;
     }
 
     public virtual async Task SetAsync(string componentAppId, string componentVerifyTicket)
@@ -63,13 +59,6 @@ public virtual async Task SetAsync(string componentAppId, string componentVerify
 
         await uow.CompleteAsync();
 
-        await _cache.SetAsync(await GetCacheKeyAsync(componentAppId), componentVerifyTicket,
-            new DistributedCacheEntryOptions
-            {
-                AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(715)
-            });
+        await _cache.SetAsync(componentAppId, componentVerifyTicket);
     }
-
-    protected virtual async Task<string> GetCacheKeyAsync(string componentAppId) =>
-        $"WeChatComponentVerifyTicket:{componentAppId}";
 }