From 3927e6644c695c3e4b572d6089376c15ccd63335 Mon Sep 17 00:00:00 2001 From: Gao Sun Date: Fri, 31 May 2024 11:40:40 +0800 Subject: [PATCH] refactor: update naming (#5951) replace all "mainFlow" with "experience" --- .../index.module.scss | 0 .../index.tsx | 11 +++++++++-- .../Profile/containers/ChangePasswordModal/index.tsx | 6 +++--- .../pages/Profile/containers/LinkEmailModal/index.tsx | 6 +++--- .../containers/VerificationCodeModal/index.tsx | 6 +++--- .../Profile/containers/VerifyPasswordModal/index.tsx | 6 +++--- packages/core/src/middleware/koa-security-headers.ts | 4 ++-- 7 files changed, 23 insertions(+), 16 deletions(-) rename packages/console/src/pages/Profile/components/{MainFlowLikeModal => ExperienceLikeModal}/index.module.scss (100%) rename packages/console/src/pages/Profile/components/{MainFlowLikeModal => ExperienceLikeModal}/index.tsx (92%) diff --git a/packages/console/src/pages/Profile/components/MainFlowLikeModal/index.module.scss b/packages/console/src/pages/Profile/components/ExperienceLikeModal/index.module.scss similarity index 100% rename from packages/console/src/pages/Profile/components/MainFlowLikeModal/index.module.scss rename to packages/console/src/pages/Profile/components/ExperienceLikeModal/index.module.scss diff --git a/packages/console/src/pages/Profile/components/MainFlowLikeModal/index.tsx b/packages/console/src/pages/Profile/components/ExperienceLikeModal/index.tsx similarity index 92% rename from packages/console/src/pages/Profile/components/MainFlowLikeModal/index.tsx rename to packages/console/src/pages/Profile/components/ExperienceLikeModal/index.tsx index 37d1e6b6434..7c82358e6e5 100644 --- a/packages/console/src/pages/Profile/components/MainFlowLikeModal/index.tsx +++ b/packages/console/src/pages/Profile/components/ExperienceLikeModal/index.tsx @@ -20,7 +20,14 @@ type Props = PropsWithChildren<{ readonly onGoBack?: () => void; }>; -function MainFlowLikeModal({ title, subtitle, subtitleProps, children, onClose, onGoBack }: Props) { +function ExperienceLikeModal({ + title, + subtitle, + subtitleProps, + children, + onClose, + onGoBack, +}: Props) { const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' }); const navigate = useNavigate(); @@ -58,4 +65,4 @@ function MainFlowLikeModal({ title, subtitle, subtitleProps, children, onClose, ); } -export default MainFlowLikeModal; +export default ExperienceLikeModal; diff --git a/packages/console/src/pages/Profile/containers/ChangePasswordModal/index.tsx b/packages/console/src/pages/Profile/containers/ChangePasswordModal/index.tsx index bb7b6d52f5c..9a209b174da 100644 --- a/packages/console/src/pages/Profile/containers/ChangePasswordModal/index.tsx +++ b/packages/console/src/pages/Profile/containers/ChangePasswordModal/index.tsx @@ -14,7 +14,7 @@ import { useStaticApi } from '@/hooks/use-api'; import { useConfirmModal } from '@/hooks/use-confirm-modal'; import useTenantPathname from '@/hooks/use-tenant-pathname'; -import MainFlowLikeModal from '../../components/MainFlowLikeModal'; +import ExperienceLikeModal from '../../components/ExperienceLikeModal'; import { handleError } from '../../utils'; type FormFields = { @@ -88,7 +88,7 @@ function ChangePasswordModal() { }; return ( - + - + ); } diff --git a/packages/console/src/pages/Profile/containers/LinkEmailModal/index.tsx b/packages/console/src/pages/Profile/containers/LinkEmailModal/index.tsx index da6d5af2584..5b90e626bd6 100644 --- a/packages/console/src/pages/Profile/containers/LinkEmailModal/index.tsx +++ b/packages/console/src/pages/Profile/containers/LinkEmailModal/index.tsx @@ -10,7 +10,7 @@ import { useStaticApi } from '@/hooks/use-api'; import useTenantPathname from '@/hooks/use-tenant-pathname'; import { trySubmitSafe } from '@/utils/form'; -import MainFlowLikeModal from '../../components/MainFlowLikeModal'; +import ExperienceLikeModal from '../../components/ExperienceLikeModal'; import { parseLocationState } from '../../utils'; type EmailForm = { @@ -50,7 +50,7 @@ function LinkEmailModal() { const { email: currentEmail } = parseLocationState(state); return ( - - + ); } diff --git a/packages/console/src/pages/Profile/containers/VerificationCodeModal/index.tsx b/packages/console/src/pages/Profile/containers/VerificationCodeModal/index.tsx index 2902d936ea4..31a660397a3 100644 --- a/packages/console/src/pages/Profile/containers/VerificationCodeModal/index.tsx +++ b/packages/console/src/pages/Profile/containers/VerificationCodeModal/index.tsx @@ -14,7 +14,7 @@ import { useConfirmModal } from '@/hooks/use-confirm-modal'; import useCurrentUser from '@/hooks/use-current-user'; import useTenantPathname from '@/hooks/use-tenant-pathname'; -import MainFlowLikeModal from '../../components/MainFlowLikeModal'; +import ExperienceLikeModal from '../../components/ExperienceLikeModal'; import { handleError, parseLocationState } from '../../utils'; import * as styles from './index.module.scss'; @@ -110,7 +110,7 @@ function VerificationCodeModal() { }, [code, onSubmit]); return ( - )} - + ); } diff --git a/packages/console/src/pages/Profile/containers/VerifyPasswordModal/index.tsx b/packages/console/src/pages/Profile/containers/VerifyPasswordModal/index.tsx index 262615018b1..b5d76284fcb 100644 --- a/packages/console/src/pages/Profile/containers/VerifyPasswordModal/index.tsx +++ b/packages/console/src/pages/Profile/containers/VerifyPasswordModal/index.tsx @@ -14,7 +14,7 @@ import TextLink from '@/ds-components/TextLink'; import { useStaticApi } from '@/hooks/use-api'; import useTenantPathname from '@/hooks/use-tenant-pathname'; -import MainFlowLikeModal from '../../components/MainFlowLikeModal'; +import ExperienceLikeModal from '../../components/ExperienceLikeModal'; import { handleError, parseLocationState } from '../../utils'; import * as styles from './index.module.scss'; @@ -69,7 +69,7 @@ function VerifyPasswordModal() { }; return ( - )} - + ); } diff --git a/packages/core/src/middleware/koa-security-headers.ts b/packages/core/src/middleware/koa-security-headers.ts index e43312114c9..b7e2c8c5bcd 100644 --- a/packages/core/src/middleware/koa-security-headers.ts +++ b/packages/core/src/middleware/koa-security-headers.ts @@ -72,7 +72,7 @@ export default function koaSecurityHeaders( }; // @ts-expect-error: helmet typings has lots of {A?: T, B?: never} | {A?: never, B?: T} options definitions. Optional settings type can not inferred correctly. - const mainFlowUiSecurityHeaderSettings: HelmetOptions = { + const experienceSecurityHeaderSettings: HelmetOptions = { ...basicSecurityHeaderSettings, // WARNING: high risk Need to allow self hosted terms of use page loaded in an iframe frameguard: false, @@ -145,7 +145,7 @@ export default function koaSecurityHeaders( } // Main flow UI - await helmetPromise(mainFlowUiSecurityHeaderSettings, req, res); + await helmetPromise(experienceSecurityHeaderSettings, req, res); return next(); };