From fc252b56f04abc24344b9f8ac489567598e5a2d1 Mon Sep 17 00:00:00 2001
From: simeng-li <simeng@silverhand.io>
Date: Thu, 21 Sep 2023 14:40:53 +0800
Subject: [PATCH] refactor(console): retrieve latest invoice id from stripe
 (#4563)

refactor(console): replace invoice url link with API call

replace invoice url link with API call
---
 packages/console/package.json                 |  2 +-
 packages/console/src/hooks/use-invoices.ts    |  4 +--
 .../TenantSettings/BillingHistory/index.tsx   | 29 +++++++++++++------
 pnpm-lock.yaml                                | 14 +++++++--
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/packages/console/package.json b/packages/console/package.json
index 3092fcbc5..d4ad56b3c 100644
--- a/packages/console/package.json
+++ b/packages/console/package.json
@@ -26,7 +26,7 @@
     "@fontsource/roboto-mono": "^5.0.0",
     "@jest/types": "^29.5.0",
     "@logto/app-insights": "workspace:^1.3.1",
-    "@logto/cloud": "0.2.5-444ed49",
+    "@logto/cloud": "0.2.5-d434baa",
     "@logto/connector-kit": "workspace:^1.1.1",
     "@logto/core-kit": "workspace:^2.1.0",
     "@logto/language-kit": "workspace:^1.0.0",
diff --git a/packages/console/src/hooks/use-invoices.ts b/packages/console/src/hooks/use-invoices.ts
index 160b71058..2dfbbc329 100644
--- a/packages/console/src/hooks/use-invoices.ts
+++ b/packages/console/src/hooks/use-invoices.ts
@@ -2,12 +2,12 @@ import useSWR from 'swr';
 
 import { useCloudApi } from '@/cloud/hooks/use-cloud-api';
 import { type InvoicesResponse } from '@/cloud/types/router';
-import { isCloud } from '@/consts/env';
 
 const useInvoices = (tenantId: string) => {
   const cloudApi = useCloudApi();
+
   const swrResponse = useSWR<InvoicesResponse, Error>(
-    isCloud && `/api/tenants/${tenantId}/invoices`,
+    `/api/tenants/${tenantId}/invoices`,
     async () => cloudApi.get('/api/tenants/:tenantId/invoices', { params: { tenantId } })
   );
 
diff --git a/packages/console/src/pages/TenantSettings/BillingHistory/index.tsx b/packages/console/src/pages/TenantSettings/BillingHistory/index.tsx
index 6da95437d..16c8dfea6 100644
--- a/packages/console/src/pages/TenantSettings/BillingHistory/index.tsx
+++ b/packages/console/src/pages/TenantSettings/BillingHistory/index.tsx
@@ -1,8 +1,9 @@
 import { withAppInsights } from '@logto/app-insights/react';
 import { conditional } from '@silverhand/essentials';
 import dayjs from 'dayjs';
-import { useContext, useMemo } from 'react';
+import { useCallback, useContext, useMemo } from 'react';
 
+import { useCloudApi } from '@/cloud/hooks/use-cloud-api';
 import EmptyDataPlaceholder from '@/components/EmptyDataPlaceholder';
 import ItemPreview from '@/components/ItemPreview';
 import PageMeta from '@/components/PageMeta';
@@ -16,6 +17,7 @@ import { formatPeriod } from '@/utils/subscription';
 import InvoiceStatusTag from './InvoiceStatusTag';
 
 function BillingHistory() {
+  const cloudApi = useCloudApi();
   const { currentTenantId } = useContext(TenantsContext);
   const { data: invoices, error } = useInvoices(currentTenantId);
   const isLoadingInvoices = !invoices && !error;
@@ -25,6 +27,20 @@ function BillingHistory() {
     [invoices]
   );
 
+  const openStripeHostedInvoicePage = useCallback(
+    async (invoiceId: string) => {
+      const { hostedInvoiceUrl } = await cloudApi.get(
+        '/api/tenants/:tenantId/invoices/:invoiceId/hosted-invoice-url',
+        {
+          params: { tenantId: currentTenantId, invoiceId },
+        }
+      );
+
+      window.open(hostedInvoiceUrl, '_blank');
+    },
+    [cloudApi, currentTenantId]
+  );
+
   return (
     <div>
       <PageMeta titleKey={['tenants.tabs.billing_history', 'tenants.title']} />
@@ -35,13 +51,11 @@ function BillingHistory() {
           {
             title: <DynamicT forKey="subscription.billing_history.invoice_column" />,
             dataIndex: 'planName',
-            render: ({ planName, hostedInvoiceUrl, periodStart, periodEnd }) => {
+            render: ({ planName, periodStart, periodEnd }) => {
               return (
                 <ItemPreview
                   title={formatPeriod({ periodStart, periodEnd, displayYear: true })}
                   subtitle={conditional(planName && <PlanName name={planName} />)}
-                  to={conditional(hostedInvoiceUrl)}
-                  toTarget="_blank"
                 />
               );
             },
@@ -70,11 +84,8 @@ function BillingHistory() {
         ]}
         isLoading={isLoadingInvoices}
         placeholder={<EmptyDataPlaceholder />}
-        rowClickHandler={({ hostedInvoiceUrl }) => {
-          if (!hostedInvoiceUrl) {
-            return;
-          }
-          window.open(hostedInvoiceUrl, '_blank');
+        rowClickHandler={({ id }) => {
+          void openStripeHostedInvoicePage(id);
         }}
       />
     </div>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4fc180c11..f8afe67c2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2834,8 +2834,8 @@ importers:
         specifier: workspace:^1.3.1
         version: link:../app-insights
       '@logto/cloud':
-        specifier: 0.2.5-444ed49
-        version: 0.2.5-444ed49(zod@3.20.2)
+        specifier: 0.2.5-d434baa
+        version: 0.2.5-d434baa(zod@3.20.2)
       '@logto/connector-kit':
         specifier: workspace:^1.1.1
         version: link:../toolkit/connector-kit
@@ -7320,6 +7320,16 @@ packages:
       - zod
     dev: true
 
+  /@logto/cloud@0.2.5-d434baa(zod@3.20.2):
+    resolution: {integrity: sha512-VmWpqFzpWBrzJPQLvfe0bb7/XjF3lxs/rPbLt3zqBjGPtDXM9FAUn1m/gPbTwzXi5PxGOjlbD7jTl+3+1u4/NQ==}
+    engines: {node: ^18.12.0}
+    dependencies:
+      '@silverhand/essentials': 2.8.4
+      '@withtyped/server': 0.12.9(zod@3.20.2)
+    transitivePeerDependencies:
+      - zod
+    dev: true
+
   /@logto/js@2.1.1:
     resolution: {integrity: sha512-PHikheavVK+l4ivgtzi14p184hEPgXjqQEAom1Gme1MZoopx+WlwxvHSEQBsmyvVqRtI0oiojhoU5tgYi1FKJw==}
     dependencies: