From a1e4959fb708a792e8fce3246b49267cb24b4989 Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Tue, 28 Jan 2025 16:34:39 +0000 Subject: [PATCH] chore: migrate /auth/verify-email-change (#18942) --- .../auth/verify-email-change/page.tsx | 25 +++++++++++++++++++ .../future/auth/verify-email-change/page.tsx | 22 ---------------- apps/web/middleware.ts | 1 + apps/web/pages/auth/verify-email-change.tsx | 9 ------- apps/web/public/static/locales/en/common.json | 1 + 5 files changed, 27 insertions(+), 31 deletions(-) create mode 100644 apps/web/app/(use-page-wrapper)/auth/verify-email-change/page.tsx delete mode 100644 apps/web/app/future/auth/verify-email-change/page.tsx delete mode 100644 apps/web/pages/auth/verify-email-change.tsx diff --git a/apps/web/app/(use-page-wrapper)/auth/verify-email-change/page.tsx b/apps/web/app/(use-page-wrapper)/auth/verify-email-change/page.tsx new file mode 100644 index 0000000000..f49468649f --- /dev/null +++ b/apps/web/app/(use-page-wrapper)/auth/verify-email-change/page.tsx @@ -0,0 +1,25 @@ +import { withAppDirSsr } from "app/WithAppDirSsr"; +import type { PageProps as ServerPageProps } from "app/_types"; +import { _generateMetadata } from "app/_utils"; +import { cookies, headers } from "next/headers"; + +import { buildLegacyCtx } from "@lib/buildLegacyCtx"; + +import { getServerSideProps } from "@server/lib/auth/verify-email-change/getServerSideProps"; + +import type { PageProps as ClientPageProps } from "~/auth/verify-email-change-view"; +import VerifyEmailChange from "~/auth/verify-email-change-view"; + +export const generateMetadata = async () => { + return await _generateMetadata( + (t) => t("verify_email_change"), + () => "" + ); +}; + +const getData = withAppDirSsr(getServerSideProps); +const ServerPage = async ({ params, searchParams }: ServerPageProps) => { + const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams)); + return ; +}; +export default ServerPage; diff --git a/apps/web/app/future/auth/verify-email-change/page.tsx b/apps/web/app/future/auth/verify-email-change/page.tsx deleted file mode 100644 index 94628ea908..0000000000 --- a/apps/web/app/future/auth/verify-email-change/page.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import { withAppDirSsr } from "app/WithAppDirSsr"; -import { _generateMetadata } from "app/_utils"; -import { WithLayout } from "app/layoutHOC"; - -import { getServerSideProps } from "@server/lib/auth/verify-email-change/getServerSideProps"; - -import type { PageProps } from "~/auth/verify-email-change-view"; -import VerifyEmailChange from "~/auth/verify-email-change-view"; - -export const generateMetadata = async () => { - return await _generateMetadata( - () => "Verify email change", - () => "" - ); -}; - -const getData = withAppDirSsr(getServerSideProps); -export default WithLayout({ - getLayout: null, - Page: VerifyEmailChange, - getData, -}); diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts index ccaeee526b..c31bcfd3d1 100644 --- a/apps/web/middleware.ts +++ b/apps/web/middleware.ts @@ -160,6 +160,7 @@ export const config = { "/auth/signin", "/auth/oauth2/authorize", "/auth/platform/authorize", + "/auth/verify-email-change", "/auth/verify-email", "/auth/verify", /** diff --git a/apps/web/pages/auth/verify-email-change.tsx b/apps/web/pages/auth/verify-email-change.tsx deleted file mode 100644 index 0013dc3593..0000000000 --- a/apps/web/pages/auth/verify-email-change.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import PageWrapper from "@components/PageWrapper"; - -import type { PageProps } from "~/auth/verify-email-change-view"; -import VerifyEmailChange from "~/auth/verify-email-change-view"; - -const Page = (props: PageProps) => ; -Page.PageWrapper = PageWrapper; -export default Page; -export { getServerSideProps } from "@server/lib/auth/verify-email-change/getServerSideProps"; diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index 1d43a5a987..4f90233a02 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -2945,5 +2945,6 @@ "asc": "Asc", "desc": "Desc", "verify_email": "Verify email", + "verify_email_change": "Verify email change", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" }