payment-kit 1.28.0 → 1.29.0

package/src/components/payment-method/app-store.tsx

@@ -0,0 +1,103 @@
+import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import { FormInput } from '@blocklet/payment-react';
+import { Stack, ToggleButton, ToggleButtonGroup, Typography } from '@mui/material';
+import { Controller, useFormContext } from 'react-hook-form';
+
+export default function AppStoreMethodForm({ checkDisabled }: { checkDisabled: (key: string) => boolean }) {
+  const { t } = useLocaleContext();
+  const { control } = useFormContext();
+
+  return (
+    <>
+      <FormInput
+        name="name"
+        type="text"
+        rules={{ required: true }}
+        label={t('admin.paymentMethod.name.label')}
+        placeholder={t('admin.paymentMethod.name.tip')}
+        disabled={checkDisabled('name')}
+        inputProps={{ maxLength: 32 }}
+      />
+      <FormInput
+        name="description"
+        type="text"
+        rules={{ required: true }}
+        label={t('admin.paymentMethod.description.label')}
+        placeholder={t('admin.paymentMethod.description.tip')}
+        inputProps={{ maxLength: 255 }}
+      />
+      <FormInput
+        name="settings.app_store.bundle_id"
+        type="text"
+        rules={{ required: true }}
+        label={t('admin.paymentMethod.app_store.bundle_id.label')}
+        placeholder={t('admin.paymentMethod.app_store.bundle_id.tip')}
+        disabled={checkDisabled('settings.app_store.bundle_id')}
+      />
+
+      <Stack spacing={0.5}>
+        <Typography variant="body2">{t('admin.paymentMethod.app_store.environment.label')}</Typography>
+        <Controller
+          name="settings.app_store.environment"
+          control={control}
+          rules={{ required: true }}
+          render={({ field }) => (
+            <ToggleButtonGroup
+              {...field}
+              exclusive
+              disabled={checkDisabled('settings.app_store.environment')}
+              onChange={(_, value: string | null) => {
+                if (value !== null) field.onChange(value);
+              }}>
+              <ToggleButton value="production">
+                {t('admin.paymentMethod.app_store.environment.production')}
+              </ToggleButton>
+              <ToggleButton value="sandbox">{t('admin.paymentMethod.app_store.environment.sandbox')}</ToggleButton>
+            </ToggleButtonGroup>
+          )}
+        />
+        <Typography variant="caption" color="text.secondary">
+          {t('admin.paymentMethod.app_store.environment.tip')}
+        </Typography>
+      </Stack>
+
+      <FormInput
+        name="settings.app_store.shared_secret"
+        type="password"
+        label={t('admin.paymentMethod.app_store.shared_secret.label')}
+        placeholder={t('admin.paymentMethod.app_store.shared_secret.tip')}
+        disabled={checkDisabled('settings.app_store.shared_secret')}
+      />
+
+      <Typography variant="subtitle2" sx={{ mt: 2 }}>
+        {t('admin.paymentMethod.app_store.serverApi.heading')}
+      </Typography>
+      <Typography variant="caption" color="text.secondary" sx={{ mt: -1, display: 'block' }}>
+        {t('admin.paymentMethod.app_store.serverApi.tip')}
+      </Typography>
+      <FormInput
+        name="settings.app_store.issuer_id"
+        type="text"
+        label={t('admin.paymentMethod.app_store.issuer_id.label')}
+        placeholder={t('admin.paymentMethod.app_store.issuer_id.tip')}
+        disabled={checkDisabled('settings.app_store.issuer_id')}
+      />
+      <FormInput
+        name="settings.app_store.key_id"
+        type="text"
+        label={t('admin.paymentMethod.app_store.key_id.label')}
+        placeholder={t('admin.paymentMethod.app_store.key_id.tip')}
+        disabled={checkDisabled('settings.app_store.key_id')}
+      />
+      <FormInput
+        name="settings.app_store.private_key_pem"
+        type="text"
+        multiline
+        rows={5}
+        label={t('admin.paymentMethod.app_store.private_key_pem.label')}
+        placeholder={t('admin.paymentMethod.app_store.private_key_pem.tip')}
+        disabled={checkDisabled('settings.app_store.private_key_pem')}
+      />
+    </>
+  );
+}

package/src/components/payment-method/form.tsx

@@ -3,11 +3,13 @@ import { Stack, ToggleButton, ToggleButtonGroup, Typography } from '@mui/materia
 import { styled } from '@mui/system';
 import { Controller, useFormContext, useWatch } from 'react-hook-form';
 
+import AppStoreMethodForm from './app-store';
 import ArcBlockMethodForm from './arcblock';
+import BaseMethodForm from './base';
 import BitcoinMethodForm from './bitcoin';
 import EthereumMethodForm from './ethereum';
+import GooglePlayMethodForm from './google-play';
 import StripeMethodForm from './stripe';
-import BaseMethodForm from './base';
 
 export default function PaymentMethodForm({
   action = 'create',
@@ -47,6 +49,8 @@ export default function PaymentMethodForm({
             <ToggleButton value="stripe">Stripe</ToggleButton>
             <ToggleButton value="ethereum">Ethereum</ToggleButton>
             <ToggleButton value="base">Base</ToggleButton>
+            <ToggleButton value="google_play">Google Play</ToggleButton>
+            <ToggleButton value="app_store">App Store</ToggleButton>
             <ToggleButton value="bitcoin" disabled>
               Bitcoin
             </ToggleButton>
@@ -60,6 +64,8 @@ export default function PaymentMethodForm({
       {type === 'arcblock' && <ArcBlockMethodForm checkDisabled={checkDisabled} />}
       {type === 'ethereum' && <EthereumMethodForm checkDisabled={checkDisabled} />}
       {type === 'base' && <BaseMethodForm checkDisabled={checkDisabled} />}
+      {type === 'google_play' && <GooglePlayMethodForm checkDisabled={checkDisabled} />}
+      {type === 'app_store' && <AppStoreMethodForm checkDisabled={checkDisabled} />}
       {type === 'bitcoin' && <BitcoinMethodForm checkDisabled={checkDisabled} />}
     </Root>
   );

package/src/components/payment-method/google-play.tsx

@@ -0,0 +1,85 @@
+import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import { FormInput } from '@blocklet/payment-react';
+import { useFormContext, useWatch } from 'react-hook-form';
+import { Alert, Typography } from '@mui/material';
+
+export default function GooglePlayMethodForm({ checkDisabled }: { checkDisabled: (key: string) => boolean }) {
+  const { t } = useLocaleContext();
+  const { control } = useFormContext();
+  const serviceAccountJson = useWatch({ control, name: 'settings.google_play.service_account_json' }) as
+    | string
+    | undefined;
+
+  // Quick client-side JSON sanity check — the server re-validates and decrypts.
+  let parseError: string | null = null;
+  let clientEmail: string | null = null;
+  if (serviceAccountJson) {
+    try {
+      const parsed = JSON.parse(serviceAccountJson);
+      if (!parsed.client_email || !parsed.private_key) {
+        parseError = t('admin.paymentMethod.google_play.service_account_json.missingFields');
+      } else {
+        clientEmail = parsed.client_email;
+      }
+    } catch {
+      parseError = t('admin.paymentMethod.google_play.service_account_json.invalidJson');
+    }
+  }
+
+  return (
+    <>
+      <FormInput
+        name="name"
+        type="text"
+        rules={{ required: true }}
+        label={t('admin.paymentMethod.name.label')}
+        placeholder={t('admin.paymentMethod.name.tip')}
+        disabled={checkDisabled('name')}
+        inputProps={{ maxLength: 32 }}
+      />
+      <FormInput
+        name="description"
+        type="text"
+        rules={{ required: true }}
+        label={t('admin.paymentMethod.description.label')}
+        placeholder={t('admin.paymentMethod.description.tip')}
+        inputProps={{ maxLength: 255 }}
+      />
+      <FormInput
+        name="settings.google_play.package_name"
+        type="text"
+        rules={{ required: true }}
+        label={t('admin.paymentMethod.google_play.package_name.label')}
+        placeholder={t('admin.paymentMethod.google_play.package_name.tip')}
+        disabled={checkDisabled('settings.google_play.package_name')}
+      />
+      <FormInput
+        name="settings.google_play.service_account_json"
+        type="text"
+        multiline
+        rows={6}
+        rules={{ required: true }}
+        label={t('admin.paymentMethod.google_play.service_account_json.label')}
+        placeholder={t('admin.paymentMethod.google_play.service_account_json.tip')}
+        disabled={checkDisabled('settings.google_play.service_account_json')}
+      />
+      {parseError && (
+        <Alert severity="error" sx={{ mt: -1 }}>
+          {parseError}
+        </Alert>
+      )}
+      {clientEmail && (
+        <Typography variant="caption" color="text.secondary" sx={{ mt: -1, display: 'block' }}>
+          {t('admin.paymentMethod.google_play.service_account_json.detectedClient')}: {clientEmail}
+        </Typography>
+      )}
+      <FormInput
+        name="settings.google_play.pubsub_topic_name"
+        type="text"
+        label={t('admin.paymentMethod.google_play.pubsub_topic_name.label')}
+        placeholder={t('admin.paymentMethod.google_play.pubsub_topic_name.tip')}
+        disabled={checkDisabled('settings.google_play.pubsub_topic_name')}
+      />
+    </>
+  );
+}

package/src/components/subscription/list.tsx

@@ -152,6 +152,26 @@ export default function SubscriptionList({
         },
       },
     },
+    {
+      label: t('admin.subscription.channel'),
+      name: 'channel',
+      options: {
+        filter: true,
+        customBodyRenderLite: (_: string, index: number) => {
+          const item = data.list[index] as TSubscriptionExpanded;
+          const channel = (item as any).channel || (item as any).paymentMethod?.type;
+          if (!channel) return null;
+          let color: 'primary' | 'secondary' | 'default' = 'default';
+          if (channel === 'google_play' || channel === 'app_store') color = 'primary';
+          else if (channel === 'stripe') color = 'secondary';
+          return (
+            <Link to={`/admin/billing/${item.id}`}>
+              <Status label={channel} color={color as any} />
+            </Link>
+          );
+        },
+      },
+    },
     {
       label: t('common.createdAt'),
       name: 'created_at',

package/src/locales/en.tsx

@@ -1310,6 +1310,55 @@ export default flat({
           tip: 'Number of blocks required since transaction execution',
         },
       },
+      google_play: {
+        package_name: {
+          label: 'Package Name',
+          tip: 'e.g. com.example.app, configured in Play Console',
+        },
+        service_account_json: {
+          label: 'Service Account JSON',
+          tip: 'Paste the full service account credentials JSON downloaded from Google Cloud Console',
+          invalidJson: 'Not valid JSON',
+          missingFields: 'JSON is missing client_email or private_key',
+          detectedClient: 'Detected client',
+        },
+        pubsub_topic_name: {
+          label: 'Pub/Sub Topic (optional)',
+          tip: 'projects/<project-id>/topics/<topic-name>, for receiving RTDN',
+        },
+      },
+      app_store: {
+        bundle_id: {
+          label: 'Bundle ID',
+          tip: 'e.g. com.example.app, configured in App Store Connect',
+        },
+        environment: {
+          label: 'Environment',
+          tip: 'StoreKit 2 JWS environment must match this setting',
+          production: 'Production',
+          sandbox: 'Sandbox',
+        },
+        shared_secret: {
+          label: 'Shared Secret (for StoreKit 1)',
+          tip: 'App-Specific Shared Secret for legacy receipt verification. Not needed for StoreKit 2 JWS. Find it at App Store Connect → App Information → App-Specific Shared Secret',
+        },
+        serverApi: {
+          heading: 'Server API Credentials (optional)',
+          tip: 'Not required for StoreKit 2 JWS verification. Only needed when querying App Store Server API for subscription status. Provide all three or none.',
+        },
+        issuer_id: {
+          label: 'Issuer ID',
+          tip: 'App Store Connect API Issuer ID',
+        },
+        key_id: {
+          label: 'Key ID',
+          tip: 'App Store Connect API Key ID',
+        },
+        private_key_pem: {
+          label: 'Private Key (.p8 contents)',
+          tip: 'Paste the contents of the .p8 file downloaded from App Store Connect',
+        },
+      },
     },
     paymentCurrency: {
       name: 'Payment Currency',
@@ -1484,7 +1533,19 @@ export default flat({
       attention: 'Past due subscriptions',
       product: 'Product',
       collectionMethod: 'Billing',
+      channel: 'Channel',
       currentPeriod: 'Current Period',
+      iap: {
+        googlePlayTitle: 'Google Play Purchase',
+        appStoreTitle: 'App Store Purchase',
+        purchaseToken: 'Purchase Token',
+        orderId: 'Order ID',
+        productId: 'Product ID',
+        originalTransactionId: 'Original Transaction ID',
+        transactionId: 'Transaction ID',
+        expiryTime: 'Expires At',
+        environment: 'Environment',
+      },
       trialingPeriod: 'Trial Period',
       trialEnd: 'Trial ends {prefix} {date}',
       willEnd: 'Will end {prefix} {date}',
@@ -1605,6 +1666,8 @@ export default flat({
       email: 'Email',
       phone: 'Phone',
       invoicePrefix: 'Invoice Prefix',
+      googlePlayUuid: 'Google Play UUID',
+      appStoreUuid: 'App Store UUID',
       balance: 'Balance ({currency})',
       summary: {
         refund: 'Refunds',

package/src/locales/zh.tsx

@@ -1265,6 +1265,55 @@ export default flat({
           tip: '交易标记为确认需要的区块数',
         },
       },
+      google_play: {
+        package_name: {
+          label: '应用包名',
+          tip: '例如 com.example.app，在 Play Console 中配置',
+        },
+        service_account_json: {
+          label: '服务账号 JSON',
+          tip: '从 Google Cloud Console 下载的 service account credentials JSON，整段粘贴',
+          invalidJson: '不是合法的 JSON',
+          missingFields: 'JSON 缺少 client_email 或 private_key 字段',
+          detectedClient: '识别到客户端',
+        },
+        pubsub_topic_name: {
+          label: 'Pub/Sub 主题名（可选）',
+          tip: 'projects/<project-id>/topics/<topic-name>，用于接收 RTDN',
+        },
+      },
+      app_store: {
+        bundle_id: {
+          label: '应用 Bundle ID',
+          tip: '例如 com.example.app，在 App Store Connect 中配置',
+        },
+        environment: {
+          label: '环境',
+          tip: 'StoreKit 2 JWS 中携带的 environment 必须与此匹配',
+          production: '正式环境',
+          sandbox: '沙盒环境',
+        },
+        shared_secret: {
+          label: 'Shared Secret（StoreKit 1 用）',
+          tip: 'App-Specific Shared Secret，用于 legacy receipt 校验。StoreKit 2 JWS 不需要。在 App Store Connect → App Information → App-Specific Shared Secret',
+        },
+        serverApi: {
+          heading: 'Server API 凭据（可选）',
+          tip: 'StoreKit 2 JWS 校验不需要凭据；只在调用 App Store Server API 查询订阅状态时使用。三项需同时填写。',
+        },
+        issuer_id: {
+          label: 'Issuer ID',
+          tip: 'App Store Connect API 的 Issuer ID',
+        },
+        key_id: {
+          label: 'Key ID',
+          tip: 'App Store Connect API 的 Key ID',
+        },
+        private_key_pem: {
+          label: '私钥 (.p8 内容)',
+          tip: '从 App Store Connect 下载的 .p8 文件内容，整段粘贴',
+        },
+      },
     },
     paymentCurrency: {
       name: '支付货币',
@@ -1452,7 +1501,19 @@ export default flat({
       product: '产品',
       attention: '将过期的订阅',
       collectionMethod: '计费',
+      channel: '渠道',
       currentPeriod: '当前周期',
+      iap: {
+        googlePlayTitle: 'Google Play 订阅详情',
+        appStoreTitle: 'App Store 订阅详情',
+        purchaseToken: '购买令牌',
+        orderId: '订单号',
+        productId: '产品 ID',
+        originalTransactionId: '原始交易 ID',
+        transactionId: '本次交易 ID',
+        expiryTime: '过期时间',
+        environment: '环境',
+      },
       trialingPeriod: '试用期',
       trialEnd: '试用期结束于 {date}',
       willEnd: '将于 {date} 结束',
@@ -1569,6 +1630,8 @@ export default flat({
       email: '电子邮件',
       phone: '电话',
       invoicePrefix: '账单前缀',
+      googlePlayUuid: 'Google Play UUID',
+      appStoreUuid: 'App Store UUID',
       balance: '余额 ({currency})',
       summary: {
         refund: '退款金额',

package/src/pages/admin/billing/subscriptions/detail.tsx

@@ -335,6 +335,86 @@ export default function SubscriptionDetail(props: { id: string }) {
               )}
             </InfoRowGroup>
           </Box>
+
+          {/* IAP details — Google Play / App Store */}
+          {(data.payment_details?.google_play || data.payment_details?.app_store) && (
+            <>
+              <Divider />
+              <Box className="section" sx={{ containerType: 'inline-size' }}>
+                <SectionHeader
+                  title={
+                    data.payment_details?.google_play
+                      ? t('admin.subscription.iap.googlePlayTitle')
+                      : t('admin.subscription.iap.appStoreTitle')
+                  }
+                />
+                <InfoRowGroup
+                  sx={{
+                    '.info-row-value': { wordBreak: 'break-all' },
+                  }}>
+                  {(data as any).channel && (
+                    <InfoRow label={t('admin.subscription.channel')} value={(data as any).channel} />
+                  )}
+                  {data.payment_details?.google_play && (
+                    <>
+                      <InfoRow
+                        label={t('admin.subscription.iap.purchaseToken')}
+                        value={data.payment_details.google_play.purchase_token}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.orderId')}
+                        value={data.payment_details.google_play.order_id || '—'}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.productId')}
+                        value={data.payment_details.google_play.product_id}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.expiryTime')}
+                        value={
+                          data.payment_details.google_play.expiry_time_millis
+                            ? formatTime(Number(data.payment_details.google_play.expiry_time_millis))
+                            : '—'
+                        }
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.environment')}
+                        value={data.payment_details.google_play.environment || (data as any).environment || '—'}
+                      />
+                    </>
+                  )}
+                  {data.payment_details?.app_store && (
+                    <>
+                      <InfoRow
+                        label={t('admin.subscription.iap.originalTransactionId')}
+                        value={data.payment_details.app_store.original_transaction_id}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.transactionId')}
+                        value={data.payment_details.app_store.transaction_id || '—'}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.productId')}
+                        value={data.payment_details.app_store.product_id}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.expiryTime')}
+                        value={
+                          data.payment_details.app_store.expires_at
+                            ? formatTime(data.payment_details.app_store.expires_at * 1000)
+                            : '—'
+                        }
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.environment')}
+                        value={data.payment_details.app_store.environment || (data as any).environment || '—'}
+                      />
+                    </>
+                  )}
+                </InfoRowGroup>
+              </Box>
+            </>
+          )}
           <Divider />
           {/* Discount Information */}
           {(data as any).discountStats && (

package/src/pages/admin/customers/customers/detail.tsx

@@ -349,6 +349,12 @@ export default function CustomerDetail(props: { id: string }) {
               <InfoRow label={t('common.createdAt')} value={formatTime(data.customer.created_at)} />
 
               <InfoRow label={t('admin.customer.invoicePrefix')} value={data.customer.invoice_prefix} />
+              {(data.customer as any).google_play_uuid && (
+                <InfoRow label={t('admin.customer.googlePlayUuid')} value={(data.customer as any).google_play_uuid} />
+              )}
+              {(data.customer as any).app_store_uuid && (
+                <InfoRow label={t('admin.customer.appStoreUuid')} value={(data.customer as any).app_store_uuid} />
+              )}
               <InfoRow label={t('common.updatedAt')} value={formatTime(data.customer.updated_at)} />
               {state.editing.customer && (
                 <EditCustomer

package/src/pages/admin/settings/payment-methods/create.tsx

@@ -52,6 +52,18 @@ export default function PaymentMethodCreate() {
           explorer_host: '',
           logo: '',
         },
+        google_play: {
+          package_name: '',
+          service_account_json: '',
+          pubsub_topic_name: '',
+        },
+        app_store: {
+          bundle_id: '',
+          environment: 'sandbox',
+          issuer_id: '',
+          key_id: '',
+          private_key_pem: '',
+        },
       },
     },
   });

package/src/pages/admin/settings/payment-methods/index.tsx

@@ -453,7 +453,7 @@ export default function PaymentMethods() {
               addons={
                 <>
                   <Switch checked={method.active} disabled sx={{ cursor: 'default' }} />
-                  {method.type !== 'arcblock' && (
+                  {!['arcblock', 'google_play', 'app_store'].includes(method.type) && (
                     <IconButton
                       onClick={(e) => {
                         e.stopPropagation();