From df4359e3e514160f381df5f28c5034fc58c62d64 Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Mon, 27 Jan 2025 10:23:51 +0000 Subject: [PATCH] migrate /auth/login page (#18903) --- .../(use-page-wrapper)/auth/login/page.tsx | 27 +++++++++++++ apps/web/app/future/auth/login/page.tsx | 21 ---------- apps/web/modules/auth/error/error-view.tsx | 40 ------------------- apps/web/modules/auth/login-view.tsx | 1 + apps/web/pages/auth/login.tsx | 10 ----- 5 files changed, 28 insertions(+), 71 deletions(-) create mode 100644 apps/web/app/(use-page-wrapper)/auth/login/page.tsx delete mode 100644 apps/web/app/future/auth/login/page.tsx delete mode 100644 apps/web/modules/auth/error/error-view.tsx delete mode 100644 apps/web/pages/auth/login.tsx diff --git a/apps/web/app/(use-page-wrapper)/auth/login/page.tsx b/apps/web/app/(use-page-wrapper)/auth/login/page.tsx new file mode 100644 index 0000000000..9ccefad02c --- /dev/null +++ b/apps/web/app/(use-page-wrapper)/auth/login/page.tsx @@ -0,0 +1,27 @@ +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/login/getServerSideProps"; + +import type { PageProps as ClientPageProps } from "~/auth/login-view"; +import Login from "~/auth/login-view"; + +export const generateMetadata = async () => { + return await _generateMetadata( + (t) => t("login"), + (t) => t("login") + ); +}; + +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/login/page.tsx b/apps/web/app/future/auth/login/page.tsx deleted file mode 100644 index 1117171c93..0000000000 --- a/apps/web/app/future/auth/login/page.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import { withAppDirSsr } from "app/WithAppDirSsr"; -import { _generateMetadata } from "app/_utils"; -import { WithLayout } from "app/layoutHOC"; - -import { getServerSideProps } from "@server/lib/auth/login/getServerSideProps"; - -import type { PageProps } from "~/auth/login-view"; -import Login from "~/auth/login-view"; - -export const generateMetadata = async () => { - return await _generateMetadata( - (t) => t("login"), - (t) => t("login") - ); -}; - -export default WithLayout({ - getLayout: null, - Page: Login, - getData: withAppDirSsr(getServerSideProps), -})<"P">; diff --git a/apps/web/modules/auth/error/error-view.tsx b/apps/web/modules/auth/error/error-view.tsx deleted file mode 100644 index 967bc20e41..0000000000 --- a/apps/web/modules/auth/error/error-view.tsx +++ /dev/null @@ -1,40 +0,0 @@ -"use client"; - -import Link from "next/link"; -import { useSearchParams } from "next/navigation"; -import z from "zod"; - -import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { Button, Icon } from "@calcom/ui"; - -import AuthContainer from "@components/ui/AuthContainer"; - -const querySchema = z.object({ - error: z.string().optional(), -}); - -export default function Error() { - const { t } = useLocale(); - const searchParams = useSearchParams(); - const { error } = querySchema.parse({ error: searchParams?.get("error") || undefined }); - const errorMsg = error || t("error_during_login"); - return ( - -
-
- -
-
- -
-
-
- - - -
-
- ); -} diff --git a/apps/web/modules/auth/login-view.tsx b/apps/web/modules/auth/login-view.tsx index 0f8ba9628e..9a4b39e609 100644 --- a/apps/web/modules/auth/login-view.tsx +++ b/apps/web/modules/auth/login-view.tsx @@ -182,6 +182,7 @@ PageProps & WithNonceProps<{}>) { return (
; -Page.PageWrapper = PageWrapper; - -export default Page; -export { getServerSideProps } from "@server/lib/auth/login/getServerSideProps";