chore: remove feature guard of hide branding (#7937)

Author: wangsijie

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

@@ -5,7 +5,7 @@ import { Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
 import LogoAndFavicon from '@/components/ImageInputs/LogoAndFavicon';
-import { isCloud, isDevFeaturesEnabled } from '@/consts/env';
+import { isCloud } from '@/consts/env';
 import { latestProPlanId } from '@/consts/subscriptions';
 import { SubscriptionDataContext } from '@/contexts/SubscriptionDataProvider';
 import Button from '@/ds-components/Button';
@@ -54,8 +54,6 @@ function BrandingForm() {
     }
   }, [handleResetColor, isDarkModeEnabled, isDirty]);
 
-  const showHideLogtoBranding = isCloud && isDevFeaturesEnabled;
-
   return (
     <Card>
       <FormSectionTitle title="branding.title" />
@@ -120,7 +118,7 @@ function BrandingForm() {
           />
         </>
       )}
-      {showHideLogtoBranding && (
+      {isCloud && (
         <FormField
           title="sign_in_exp.branding.hide_logto_branding"
           featureTag={{

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

@@ -3,8 +3,7 @@ import { Controller, useFormContext } from 'react-hook-form';
 import { Trans, useTranslation } from 'react-i18next';
 
 import CustomCssEditorField from '@/components/CustomCssEditorField';
-import InlineUpsell from '@/components/InlineUpsell';
-import { isCloud, isDevFeaturesEnabled } from '@/consts/env';
+import { isCloud } from '@/consts/env';
 import { latestProPlanId } from '@/consts/subscriptions';
 import { SubscriptionDataContext } from '@/contexts/SubscriptionDataProvider';
 import Card from '@/ds-components/Card';
@@ -16,8 +15,6 @@ import CustomUiAssetsUploader from '@/pages/SignInExperience/components/CustomUi
 import type { SignInExperienceForm } from '../../../types';
 import FormSectionTitle from '../../components/FormSectionTitle';
 
-import brandingStyles from './index.module.scss';
-
 function CustomUiForm() {
   const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
   const { getDocumentationUrl } = useDocumentationUrl();
@@ -63,13 +60,6 @@ function CustomUiForm() {
               />
             )}
           />
-          {!isBringYourUiEnabled && !isDevFeaturesEnabled && (
-            <InlineUpsell
-              className={brandingStyles.upsell}
-              for="bring_your_ui"
-              actionButtonText="upsell.view_plans"
-            />
-          )}
         </FormField>
       )}
     </Card>

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

@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { isCloud, isDevFeaturesEnabled } from '@/consts/env';
+import { isCloud } from '@/consts/env';
 import { SubscriptionDataContext } from '@/contexts/SubscriptionDataProvider';
 import TextLink from '@/ds-components/TextLink';
 import useTenantPathname from '@/hooks/use-tenant-pathname';
@@ -14,9 +14,8 @@ function UpsellNotice() {
   const { navigate } = useTenantPathname();
   const { currentSubscriptionQuota } = useContext(SubscriptionDataContext);
   const isBringYourUiEnabled = currentSubscriptionQuota.bringYourUiEnabled;
-  const showHideLogtoBranding = isCloud && isDevFeaturesEnabled;
 
-  if (!showHideLogtoBranding || isBringYourUiEnabled) {
+  if (!isCloud || isBringYourUiEnabled) {
     return null;
   }
 

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

@@ -21,6 +21,7 @@ import { validateMfa } from '#src/libraries/sign-in-experience/mfa.js';
 import koaGuard from '#src/middleware/koa-guard.js';
 
 import RequestError from '../../errors/RequestError/index.js';
+import assertThat from '../../utils/assert-that.js';
 import { checkPasswordPolicyForUser } from '../../utils/password.js';
 import { captureEvent } from '../../utils/posthog.js';
 import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
@@ -91,7 +92,7 @@ export default function signInExperiencesRoutes<T extends ManagementApiRouter>(
     async (ctx, next) => {
       const {
         query: { removeUnusedDemoSocialConnector },
-        body: { socialSignInConnectorTargets, emailBlocklistPolicy, hideLogtoBranding, ...rest },
+        body: { socialSignInConnectorTargets, emailBlocklistPolicy, ...rest },
       } = ctx.guard;
       const {
         languageInfo,
@@ -101,6 +102,7 @@ export default function signInExperiencesRoutes<T extends ManagementApiRouter>(
         sentinelPolicy,
         captchaPolicy,
         forgotPasswordMethods,
+        hideLogtoBranding,
       } = rest;
 
       if (languageInfo) {
@@ -190,16 +192,19 @@ export default function signInExperiencesRoutes<T extends ManagementApiRouter>(
 
       // Guard the quota for BYUI if the hideLogtoBranding is set to true
       if (hideLogtoBranding) {
+        // Hide Logto branding is only available for Logto Cloud
+        assertThat(
+          EnvSet.values.isCloud,
+          new RequestError({
+            code: 'request.invalid_input',
+            details: 'Hide Logto branding is not supported in this environment',
+          })
+        );
         await quota.guardTenantUsageByKey('bringYourUiEnabled');
       }
 
       const payload = {
         ...rest,
-        ...conditional(
-          EnvSet.values.isCloud &&
-            EnvSet.values.isDevFeaturesEnabled &&
-            hideLogtoBranding !== undefined && { hideLogtoBranding }
-        ),
         ...conditional(
           filteredSocialSignInConnectorTargets && {
             socialSignInConnectorTargets: filteredSocialSignInConnectorTargets,