Fixed Buypass Go SSL issuing error (#344)

shibayan · Jul 30, 2021 · 10c8d7e · 10c8d7e
1 parent 4c5b691
commit 10c8d7e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/KeyVault.Acmebot/Functions/ISharedActivity.cs b/KeyVault.Acmebot/Functions/ISharedActivity.cs
@@ -37,7 +37,7 @@ public interface ISharedActivity
         Task<OrderDetails> FinalizeOrder((CertificatePolicyItem, OrderDetails) input);
 
         [RetryOptions("00:00:05", 12, HandlerType = typeof(ExceptionRetryStrategy<RetriableActivityException>))]
-        Task CheckIsValid(OrderDetails orderDetails);
+        Task<OrderDetails> CheckIsValid(OrderDetails orderDetails);
 
         Task<CertificateItem> MergeCertificate((string, OrderDetails) input);
 

diff --git a/KeyVault.Acmebot/Functions/SharedActivity.cs b/KeyVault.Acmebot/Functions/SharedActivity.cs
@@ -364,7 +364,7 @@ public async Task<OrderDetails> FinalizeOrder([ActivityTrigger] (CertificatePoli
         }
 
         [FunctionName(nameof(CheckIsValid))]
-        public async Task CheckIsValid([ActivityTrigger] OrderDetails orderDetails)
+        public async Task<OrderDetails> CheckIsValid([ActivityTrigger] OrderDetails orderDetails)
         {
             var acmeProtocolClient = await _acmeProtocolClientFactory.CreateClientAsync();
 
@@ -381,6 +381,8 @@ public async Task CheckIsValid([ActivityTrigger] OrderDetails orderDetails)
                 // invalid の場合は最初から実行が必要なので失敗させる
                 throw new InvalidOperationException("Finalize request is invalid. Required retry at first.");
             }
+
+            return orderDetails;
         }
 
         [FunctionName(nameof(MergeCertificate))]
@@ -390,8 +392,6 @@ public async Task<CertificateItem> MergeCertificate([ActivityTrigger] (string, O
 
             var acmeProtocolClient = await _acmeProtocolClientFactory.CreateClientAsync();
 
-            orderDetails = await acmeProtocolClient.GetOrderDetailsAsync(orderDetails.OrderUrl, orderDetails);
-
             // 証明書をダウンロードして Key Vault へ格納
             var x509Certificates = await acmeProtocolClient.GetOrderCertificateAsync(orderDetails, _options.PreferredChain);
 

diff --git a/KeyVault.Acmebot/Functions/SharedOrchestrator.cs b/KeyVault.Acmebot/Functions/SharedOrchestrator.cs
@@ -54,7 +54,7 @@ public async Task IssueCertificate([OrchestrationTrigger] IDurableOrchestrationC
             if (orderDetails.Payload.Status != "valid")
             {
                 // Finalize 後のステータスが valid になるまで 60 秒待機
-                await activity.CheckIsValid(orderDetails);
+                orderDetails = await activity.CheckIsValid(orderDetails);
             }
 
             // 証明書をダウンロードし Key Vault に保存

diff --git a/KeyVault.Acmebot/static/add-certificate.html b/KeyVault.Acmebot/static/add-certificate.html
@@ -232,7 +232,7 @@ <h1 class="title">
               this.zones = response.data;
             }
           } catch (error) {
-            alert(error.response.data);
+            alert(error.response.data.output);
           }
 
           this.loading = false;

diff --git a/KeyVault.Acmebot/static/renew-certificate.html b/KeyVault.Acmebot/static/renew-certificate.html
@@ -136,7 +136,7 @@ <h1 class="title">
               this.certificates = response.data;
             }
           } catch (error) {
-            alert(error);
+            alert(error.response.data.output);
           }
 
           this.loading = false;