chore: upgrade logto cloud package (#7978)

Author: xiaoyijun

packages/connectors/connector-logto-email/package.json

@@ -52,7 +52,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@logto/cloud": "0.2.5-fd82773",
+    "@logto/cloud": "0.2.5-96334d3",
     "@silverhand/eslint-config": "6.0.1",
     "@silverhand/ts-config": "6.0.0",
     "@types/node": "^22.14.0",

packages/console/package.json

@@ -28,7 +28,7 @@
     "@fontsource/roboto-mono": "^5.0.0",
     "@inkeep/cxkit-react": "^0.5.66",
     "@jest/types": "^29.5.0",
-    "@logto/cloud": "0.2.5-fd82773",
+    "@logto/cloud": "0.2.5-96334d3",
     "@logto/connector-kit": "workspace:^",
     "@logto/core-kit": "workspace:^",
     "@logto/language-kit": "workspace:^",

packages/console/src/components/Region/index.tsx

@@ -1,4 +1,4 @@
-import { type PublicRegionName, type RegionResponse as RegionType } from '@logto/cloud/routes';
+import { type RegionResponse as RegionType } from '@logto/cloud/routes';
 import { TenantTag } from '@logto/schemas';
 import classNames from 'classnames';
 import { useMemo, type FunctionComponent } from 'react';
@@ -12,16 +12,15 @@ import ukFlag from './assets/uk.svg?react';
 import usFlag from './assets/us.svg?react';
 import styles from './index.module.scss';
 
-export const defaultRegionName = 'EU' satisfies PublicRegionName;
+export const defaultRegionName = 'EU';
 
-const regionDisplayNameMap: Readonly<Record<PublicRegionName, string> & Record<string, string>> =
-  Object.freeze({
-    EU: 'Europe',
-    US: 'West US',
-    AU: 'Australia',
-    JP: 'Japan',
-    UK: 'United Kingdom',
-  });
+const regionDisplayNameMap: Readonly<Record<string, string>> = Object.freeze({
+  EU: 'Europe',
+  US: 'West US',
+  AU: 'Australia',
+  JP: 'Japan',
+  UK: 'United Kingdom',
+});
 
 /**
  * Get the display name of the region. If the region is not in the map, return the original region

packages/console/src/consts/quota-item-phrases.ts

@@ -32,6 +32,7 @@ export const skuQuotaItemPhrasesMap: Record<
   idpInitiatedSsoEnabled: 'idp_initiated_sso_enabled.name',
   samlApplicationsLimit: 'saml_applications_limit.name',
   securityFeaturesEnabled: 'security_features_enabled.name',
+  customDomainsLimit: 'custom_domains_limit.name',
 };
 
 export const skuQuotaItemUnlimitedPhrasesMap: Record<
@@ -63,6 +64,7 @@ export const skuQuotaItemUnlimitedPhrasesMap: Record<
   idpInitiatedSsoEnabled: 'idp_initiated_sso_enabled.unlimited',
   samlApplicationsLimit: 'saml_applications_limit.unlimited',
   securityFeaturesEnabled: 'security_features_enabled.unlimited',
+  customDomainsLimit: 'custom_domains_limit.unlimited',
 };
 
 export const skuQuotaItemLimitedPhrasesMap: Record<
@@ -94,6 +96,7 @@ export const skuQuotaItemLimitedPhrasesMap: Record<
   idpInitiatedSsoEnabled: 'idp_initiated_sso_enabled.limited',
   samlApplicationsLimit: 'saml_applications_limit.limited',
   securityFeaturesEnabled: 'security_features_enabled.limited',
+  customDomainsLimit: 'custom_domains_limit.limited',
 };
 
 export const skuQuotaItemNotEligiblePhrasesMap: Record<
@@ -125,5 +128,6 @@ export const skuQuotaItemNotEligiblePhrasesMap: Record<
   idpInitiatedSsoEnabled: 'idp_initiated_sso_enabled.not_eligible',
   samlApplicationsLimit: 'saml_applications_limit.not_eligible',
   securityFeaturesEnabled: 'security_features_enabled.not_eligible',
+  customDomainsLimit: 'custom_domains_limit.not_eligible',
 };
 /* === for new pricing model === */

packages/console/src/consts/tenants.ts

@@ -1,4 +1,3 @@
-import { type PublicRegionName } from '@logto/cloud/routes';
 import { ReservedPlanId, TenantTag, defaultManagementApi } from '@logto/schemas';
 import dayjs from 'dayjs';
 
@@ -116,6 +115,7 @@ export const defaultSubscriptionQuota: NewSubscriptionQuota = {
   idpInitiatedSsoEnabled: false,
   samlApplicationsLimit: 0,
   securityFeaturesEnabled: false,
+  customDomainsLimit: 1,
 };
 
 export const defaultSubscriptionUsage: NewSubscriptionCountBasedUsage = {
@@ -140,6 +140,7 @@ export const defaultSubscriptionUsage: NewSubscriptionCountBasedUsage = {
   idpInitiatedSsoEnabled: false,
   samlApplicationsLimit: 0,
   securityFeaturesEnabled: false,
+  customDomainsLimit: 0,
 };
 
 const getAdminTenantEndpoint = () => {
@@ -158,12 +159,7 @@ export const adminTenantEndpoint = getAdminTenantEndpoint();
 export const mainTitle = isCloud ? 'Logto Cloud' : 'Logto Console';
 
 // Manually maintaining the list of regions to avoid unexpected changes. We may consider using an API in the future.
-export const availableRegions = Object.freeze([
-  'EU',
-  'US',
-  'AU',
-  'JP',
-] as const satisfies PublicRegionName[]);
+export const availableRegions = Object.freeze(['EU', 'US', 'AU', 'JP'] as const);
 
 // The threshold days to show the convert to production card in the get started page
 export const convertToProductionThresholdDays = 7;

packages/console/src/hooks/use-system-limit-error-message.ts

@@ -23,6 +23,7 @@ const systemLimitKeyGuard = z.enum([
   'tenantMembersLimit',
   'organizationsLimit',
   'samlApplicationsLimit',
+  'customDomainsLimit',
   'usersPerOrganizationLimit',
   'organizationUserRolesLimit',
   'organizationMachineToMachineRolesLimit',
@@ -48,6 +49,7 @@ const systemLimitEntityPhrases: Record<SystemLimitKey, AdminConsoleKey> = {
   tenantMembersLimit: 'system_limit.entities.tenant_member',
   organizationsLimit: 'system_limit.entities.organization',
   samlApplicationsLimit: 'system_limit.entities.saml_application',
+  customDomainsLimit: 'system_limit.entities.custom_domain',
   usersPerOrganizationLimit: 'system_limit.entities.user_per_organization',
   organizationUserRolesLimit: 'system_limit.entities.organization_user_role',
   organizationMachineToMachineRolesLimit:

packages/core/package.json

@@ -26,12 +26,12 @@
     "test:report": "codecov -F core"
   },
   "dependencies": {
-    "@logto/account-center": "workspace:*",
     "@authenio/samlify-node-xmllint": "^2.0.0",
     "@aws-sdk/client-s3": "^3.556.0",
     "@azure/storage-blob": "^12.17.0",
     "@google-cloud/storage": "^7.10.0",
     "@koa/cors": "^5.0.0",
+    "@logto/account-center": "workspace:*",
     "@logto/affiliate": "^0.1.0",
     "@logto/app-insights": "workspace:^",
     "@logto/cli": "workspace:^",
@@ -102,7 +102,7 @@
     "zod": "3.24.3"
   },
   "devDependencies": {
-    "@logto/cloud": "0.2.5-fd82773",
+    "@logto/cloud": "0.2.5-96334d3",
     "@silverhand/eslint-config": "6.0.1",
     "@silverhand/ts-config": "6.0.0",
     "@types/adm-zip": "^0.5.5",

packages/core/src/__mocks__/cloud-connection.ts

@@ -59,6 +59,7 @@ export const mockQuota = {
   idpInitiatedSsoEnabled: false,
   samlApplicationsLimit: 0,
   securityFeaturesEnabled: false,
+  customDomainsLimit: 1,
 };
 
 export const mockSubscriptionData: Subscription = {

packages/core/src/queries/tenant-usage/index.ts

@@ -14,6 +14,7 @@ import {
   OrganizationUserRelations,
   OrganizationRoles,
   OrganizationScopes,
+  Domains,
 } from '@logto/schemas';
 import { sql } from '@silverhand/slonik';
 import type { CommonQueryMethods } from '@silverhand/slonik';
@@ -60,6 +61,7 @@ const { table: organizationRolesTable, fields: organizationRolesFields } = conve
   true
 );
 const { table: organizationScopesTable } = convertToIdentifiers(OrganizationScopes, true);
+const { table: domainsTable } = convertToIdentifiers(Domains, true);
 
 export default class TenantUsageQuery {
   constructor(private readonly pool: CommonQueryMethods) {}
@@ -82,6 +84,7 @@ export default class TenantUsageQuery {
       organizationUserRolesLimit: this.countOrganizationUserRoles,
       organizationMachineToMachineRolesLimit: this.countOrganizationMachineToMachineRoles,
       organizationScopesLimit: this.countOrganizationScopes,
+      customDomainsLimit: this.countCustomDomains,
     };
   }
 
@@ -274,4 +277,14 @@ export default class TenantUsageQuery {
 
     return Number(result.count);
   };
+
+  private readonly countCustomDomains: UsageQuery = async () => {
+    const result = await this.pool.one<{ count: string }>(sql`  
+      select
+        count(*)
+      from ${domainsTable}
+    `);
+
+    return Number(result.count);
+  };
 }

packages/core/src/queries/tenant-usage/types.ts

@@ -66,6 +66,7 @@ const sharedUsageKeyGuard = z.enum([
   'enterpriseSsoLimit',
   'organizationsLimit',
   'samlApplicationsLimit',
+  'customDomainsLimit',
 ]) satisfies ToZodEnum<SharedUsageKey>;
 
 /** All usage keys that need to be checked (union of SystemUsageKey and QuotaUsageKey). */
@@ -91,6 +92,7 @@ const quotaUsageKeyGuard = z.enum([
   'mfaEnabled',
   'securityFeaturesEnabled',
   'idpInitiatedSsoEnabled',
+  'customDomainsLimit',
 ]) satisfies ToZodEnum<QuotaUsageKey>;
 
 export const isQuotaUsageKey = (key: UsageKey): key is QuotaUsageKey =>
@@ -116,6 +118,7 @@ const numericQuotaUsageKeyGuard = z.enum([
   'organizationsLimit',
   'samlApplicationsLimit',
   'socialConnectorsLimit',
+  'customDomainsLimit',
 ]) satisfies ToZodEnum<NumericQuotaUsageKey>;
 
 export const isNumericQuotaUsageKey = (key: string): key is NumericQuotaUsageKey =>