Skip to content

Commit e36219f

Browse files
authored
refactor: read feature flag from tenant response (#7835)
1 parent 6ce9992 commit e36219f

File tree

8 files changed

+20
-21
lines changed

8 files changed

+20
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"access": "public"
5353
},
5454
"devDependencies": {
55-
"@logto/cloud": "0.2.5-590fbce",
55+
"@logto/cloud": "0.2.5-299028a",
5656
"@silverhand/eslint-config": "6.0.1",
5757
"@silverhand/ts-config": "6.0.0",
5858
"@types/node": "^22.14.0",

packages/connectors/connector-logto-email/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ const sendMessage =
4040
body: {
4141
data: {
4242
to,
43-
// @ts-expect-error TODO @wangsijie: remove this when @logto/cloud updates
4443
type,
4544
payload: {
4645
...payload,

packages/console/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@fontsource/roboto-mono": "^5.0.0",
2929
"@inkeep/cxkit-react": "^0.5.66",
3030
"@jest/types": "^29.5.0",
31-
"@logto/cloud": "0.2.5-590fbce",
31+
"@logto/cloud": "0.2.5-299028a",
3232
"@logto/connector-kit": "workspace:^",
3333
"@logto/core-kit": "workspace:^",
3434
"@logto/language-kit": "workspace:^",

packages/console/src/consts/env.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,4 @@ export const consoleEmbeddedPricingUrl =
1818
normalizeEnv(import.meta.env.CONSOLE_EMBEDDED_PRICING_URL) ??
1919
'https://logto.io/console-embedded-pricing';
2020

21-
export const isMultipleCustomDomainsEnabled = yes(
22-
normalizeEnv(import.meta.env.MULTIPLE_CUSTOM_DOMAINS_ENABLED)
23-
);
24-
2521
export const inkeepApiKey = normalizeEnv(import.meta.env.INKEEP_API_KEY);

packages/console/src/pages/TenantSettings/TenantDomainSettings/index.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { useContext } from 'react';
2+
13
import FormCard from '@/components/FormCard';
24
import PageMeta from '@/components/PageMeta';
3-
import { isMultipleCustomDomainsEnabled } from '@/consts/env';
5+
import { TenantsContext } from '@/contexts/TenantsProvider';
46
import FormField from '@/ds-components/FormField';
57
import useCustomDomain from '@/hooks/use-custom-domain';
68
import useDocumentationUrl from '@/hooks/use-documentation-url';
@@ -15,6 +17,11 @@ import styles from './index.module.scss';
1517
function TenantDomainSettings() {
1618
const { isLoading: isLoadingCustomDomain } = useCustomDomain(true);
1719
const { getDocumentationUrl } = useDocumentationUrl();
20+
const { currentTenant } = useContext(TenantsContext);
21+
22+
const isMultipleCustomDomainsEnabled = Boolean(
23+
currentTenant?.featureFlags?.isMultipleCustomDomainsEnabled
24+
);
1825

1926
if (isLoadingCustomDomain) {
2027
return <Skeleton />;

packages/console/vite.config.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ const buildConfig = (mode: string): UserConfig => ({
5151
'import.meta.env.CONSOLE_EMBEDDED_PRICING_URL': JSON.stringify(
5252
process.env.CONSOLE_EMBEDDED_PRICING_URL
5353
),
54-
'import.meta.env.MULTIPLE_CUSTOM_DOMAINS_ENABLED': JSON.stringify(
55-
process.env.MULTIPLE_CUSTOM_DOMAINS_ENABLED
56-
),
5754
'import.meta.env.INKEEP_API_KEY': JSON.stringify(process.env.INKEEP_API_KEY),
5855
// `@withtyped/client` needs this to be defined. We can optimize this later.
5956
'process.env': {},

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"zod": "3.24.3"
101101
},
102102
"devDependencies": {
103-
"@logto/cloud": "0.2.5-590fbce",
103+
"@logto/cloud": "0.2.5-299028a",
104104
"@silverhand/eslint-config": "6.0.1",
105105
"@silverhand/ts-config": "6.0.0",
106106
"@types/adm-zip": "^0.5.5",

pnpm-lock.yaml

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)