Skip to content

Commit 4c09aca

Browse files
authored
chore: remove feature guard of hide branding (#7937)
1 parent 7b8a6f4 commit 4c09aca

File tree

4 files changed

+16
-24
lines changed

4 files changed

+16
-24
lines changed

packages/console/src/pages/SignInExperience/PageContent/Branding/BrandingForm/index.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Controller, useFormContext } from 'react-hook-form';
55
import { useTranslation } from 'react-i18next';
66

77
import LogoAndFavicon from '@/components/ImageInputs/LogoAndFavicon';
8-
import { isCloud, isDevFeaturesEnabled } from '@/consts/env';
8+
import { isCloud } from '@/consts/env';
99
import { latestProPlanId } from '@/consts/subscriptions';
1010
import { SubscriptionDataContext } from '@/contexts/SubscriptionDataProvider';
1111
import Button from '@/ds-components/Button';
@@ -54,8 +54,6 @@ function BrandingForm() {
5454
}
5555
}, [handleResetColor, isDarkModeEnabled, isDirty]);
5656

57-
const showHideLogtoBranding = isCloud && isDevFeaturesEnabled;
58-
5957
return (
6058
<Card>
6159
<FormSectionTitle title="branding.title" />
@@ -120,7 +118,7 @@ function BrandingForm() {
120118
/>
121119
</>
122120
)}
123-
{showHideLogtoBranding && (
121+
{isCloud && (
124122
<FormField
125123
title="sign_in_exp.branding.hide_logto_branding"
126124
featureTag={{

packages/console/src/pages/SignInExperience/PageContent/Branding/CustomUiForm/index.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import { Controller, useFormContext } from 'react-hook-form';
33
import { Trans, useTranslation } from 'react-i18next';
44

55
import CustomCssEditorField from '@/components/CustomCssEditorField';
6-
import InlineUpsell from '@/components/InlineUpsell';
7-
import { isCloud, isDevFeaturesEnabled } from '@/consts/env';
6+
import { isCloud } from '@/consts/env';
87
import { latestProPlanId } from '@/consts/subscriptions';
98
import { SubscriptionDataContext } from '@/contexts/SubscriptionDataProvider';
109
import Card from '@/ds-components/Card';
@@ -16,8 +15,6 @@ import CustomUiAssetsUploader from '@/pages/SignInExperience/components/CustomUi
1615
import type { SignInExperienceForm } from '../../../types';
1716
import FormSectionTitle from '../../components/FormSectionTitle';
1817

19-
import brandingStyles from './index.module.scss';
20-
2118
function CustomUiForm() {
2219
const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
2320
const { getDocumentationUrl } = useDocumentationUrl();
@@ -63,13 +60,6 @@ function CustomUiForm() {
6360
/>
6461
)}
6562
/>
66-
{!isBringYourUiEnabled && !isDevFeaturesEnabled && (
67-
<InlineUpsell
68-
className={brandingStyles.upsell}
69-
for="bring_your_ui"
70-
actionButtonText="upsell.view_plans"
71-
/>
72-
)}
7363
</FormField>
7464
)}
7565
</Card>

packages/console/src/pages/SignInExperience/PageContent/Branding/UpsellNotice/index.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import classNames from 'classnames';
22
import { useContext } from 'react';
33
import { useTranslation } from 'react-i18next';
44

5-
import { isCloud, isDevFeaturesEnabled } from '@/consts/env';
5+
import { isCloud } from '@/consts/env';
66
import { SubscriptionDataContext } from '@/contexts/SubscriptionDataProvider';
77
import TextLink from '@/ds-components/TextLink';
88
import useTenantPathname from '@/hooks/use-tenant-pathname';
@@ -14,9 +14,8 @@ function UpsellNotice() {
1414
const { navigate } = useTenantPathname();
1515
const { currentSubscriptionQuota } = useContext(SubscriptionDataContext);
1616
const isBringYourUiEnabled = currentSubscriptionQuota.bringYourUiEnabled;
17-
const showHideLogtoBranding = isCloud && isDevFeaturesEnabled;
1817

19-
if (!showHideLogtoBranding || isBringYourUiEnabled) {
18+
if (!isCloud || isBringYourUiEnabled) {
2019
return null;
2120
}
2221

packages/core/src/routes/sign-in-experience/index.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { validateMfa } from '#src/libraries/sign-in-experience/mfa.js';
2121
import koaGuard from '#src/middleware/koa-guard.js';
2222

2323
import RequestError from '../../errors/RequestError/index.js';
24+
import assertThat from '../../utils/assert-that.js';
2425
import { checkPasswordPolicyForUser } from '../../utils/password.js';
2526
import { captureEvent } from '../../utils/posthog.js';
2627
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
@@ -91,7 +92,7 @@ export default function signInExperiencesRoutes<T extends ManagementApiRouter>(
9192
async (ctx, next) => {
9293
const {
9394
query: { removeUnusedDemoSocialConnector },
94-
body: { socialSignInConnectorTargets, emailBlocklistPolicy, hideLogtoBranding, ...rest },
95+
body: { socialSignInConnectorTargets, emailBlocklistPolicy, ...rest },
9596
} = ctx.guard;
9697
const {
9798
languageInfo,
@@ -101,6 +102,7 @@ export default function signInExperiencesRoutes<T extends ManagementApiRouter>(
101102
sentinelPolicy,
102103
captchaPolicy,
103104
forgotPasswordMethods,
105+
hideLogtoBranding,
104106
} = rest;
105107

106108
if (languageInfo) {
@@ -190,16 +192,19 @@ export default function signInExperiencesRoutes<T extends ManagementApiRouter>(
190192

191193
// Guard the quota for BYUI if the hideLogtoBranding is set to true
192194
if (hideLogtoBranding) {
195+
// Hide Logto branding is only available for Logto Cloud
196+
assertThat(
197+
EnvSet.values.isCloud,
198+
new RequestError({
199+
code: 'request.invalid_input',
200+
details: 'Hide Logto branding is not supported in this environment',
201+
})
202+
);
193203
await quota.guardTenantUsageByKey('bringYourUiEnabled');
194204
}
195205

196206
const payload = {
197207
...rest,
198-
...conditional(
199-
EnvSet.values.isCloud &&
200-
EnvSet.values.isDevFeaturesEnabled &&
201-
hideLogtoBranding !== undefined && { hideLogtoBranding }
202-
),
203208
...conditional(
204209
filteredSocialSignInConnectorTargets && {
205210
socialSignInConnectorTargets: filteredSocialSignInConnectorTargets,

0 commit comments

Comments
 (0)