opt code

Portkey-Wallet · Sep 30, 2024 · 30263fb · 30263fb
1 parent 411ea50
commit 30263fb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/src/CAServer.Application/CAAccount/Provider/ZkLoginProverOptions.cs b/src/CAServer.Application/CAAccount/Provider/ZkLoginProverOptions.cs
diff --git a/src/CAServer.Application/CAServerApplicationModule.cs b/src/CAServer.Application/CAServerApplicationModule.cs
@@ -77,7 +77,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
         Configure<MarketCacheOptions>(configuration.GetSection("MarketCache"));
         Configure<CryptoGiftOptions>(configuration.GetSection("CryptoGiftExpiration"));
         Configure<SecondaryEmailOptions>(configuration.GetSection("SecondaryEmail"));
-        Configure<ZkLoginProverOptions>(configuration.GetSection("ZkLoginProver"));
 
         Configure<SeedImageOptions>(configuration.GetSection("SeedSymbolImage"));
         Configure<SecurityOptions>(configuration.GetSection("Security"));

diff --git a/src/CAServer.AuthServer/SignatureGrantHandler.cs b/src/CAServer.AuthServer/SignatureGrantHandler.cs
@@ -49,7 +49,6 @@ public class SignatureGrantHandler : ITokenExtensionGrant
     private readonly string _lockKeyPrefix = "CAServer:Auth:SignatureGrantHandler:";
     private ISignatureProvider _signatureProvider;
     private IDistributedCache<string> _distributedCache;
-    // private IPreValidationProvider _preValidationProvider;
 
     public async Task<IActionResult> HandleAsync(ExtensionGrantContext context)
     {
@@ -92,7 +91,6 @@ public async Task<IActionResult> HandleAsync(ExtensionGrantContext context)
         var graphqlConfig = context.HttpContext.RequestServices.GetRequiredService<IOptions<GraphQLOption>>().Value;
         var chainOptions = context.HttpContext.RequestServices.GetRequiredService<IOptions<ChainOptions>>().Value;
         _signatureProvider = context.HttpContext.RequestServices.GetRequiredService<ISignatureProvider>();
-        // _preValidationProvider = context.HttpContext.RequestServices.GetRequiredService<IPreValidationProvider>();
 
         var managerCheck = await CheckAddressAsync(chainId, graphqlConfig.Url, caHash, address, chainOptions);
         if (!managerCheck.HasValue || !managerCheck.Value)
@@ -139,7 +137,6 @@ await _distributedEventBus.PublishAsync(new UserLoginEto()
             CreateTime = DateTime.UtcNow,
             FromCaServer = true
         });
-        _logger.LogInformation("userId:{0} time:{1} sent login message", user.Id, DateTimeOffset.Now.ToUnixTimeMilliseconds());
         return new SignInResult(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme, claimsPrincipal);
     }
 
@@ -239,19 +236,21 @@ await _distributedEventBus.PublishAsync(new CreateUserEto
         ChainOptions chainOptions)
     {
         var graphQlResult = await CheckAddressFromGraphQlAsync(graphQlUrl, caHash, manager);
-        if (!graphQlResult.HasValue || !graphQlResult.Value)
+        if (graphQlResult.HasValue && graphQlResult.Value)
         {
-            _logger.LogDebug("graphql is invalid.");
-            var contractResult = await CheckAddressFromContractAsync(chainId, caHash, manager, chainOptions);
-            if (!contractResult.HasValue || !contractResult.Value)
-            {
-                // var managerCacheDto = await _preValidationProvider.GetManagerFromCache(manager);
-                var result = await _distributedCache.GetAsync(GetCacheKey(manager));
-                return !result.IsNullOrEmpty() && caHash.Equals(JsonConvert.DeserializeObject<ManagerCacheDto>(result)?.CaHash);
-            }
+            return true;
+        }
+
+        _logger.LogDebug("graphql is invalid.");
+        var contractResult = await CheckAddressFromContractAsync(chainId, caHash, manager, chainOptions);
+        if (contractResult.HasValue && contractResult.Value)
+        {
+            return true;
         }
 
-        return true;
+        var result = await _distributedCache.GetAsync(GetCacheKey(manager));
+        return !result.IsNullOrEmpty() && caHash.Equals(JsonConvert.DeserializeObject<ManagerCacheDto>(result)?.CaHash);
+
     }
 
     private string GetCacheKey(string manager)