diff --git a/apps/web/app/future/auth/oauth2/authorize/page.tsx b/apps/web/app/auth/oauth2/authorize/page.tsx similarity index 91% rename from apps/web/app/future/auth/oauth2/authorize/page.tsx rename to apps/web/app/auth/oauth2/authorize/page.tsx index 3fa8dca235..6cdb42ab56 100644 --- a/apps/web/app/future/auth/oauth2/authorize/page.tsx +++ b/apps/web/app/auth/oauth2/authorize/page.tsx @@ -5,7 +5,7 @@ import Page from "~/auth/oauth2/authorize-view"; export const generateMetadata = async () => { return await _generateMetadata( - () => "Authorize", + (t) => t("authorize"), () => "" ); }; diff --git a/apps/web/app/future/auth/platform/authorize/page.tsx b/apps/web/app/auth/platform/authorize/page.tsx similarity index 91% rename from apps/web/app/future/auth/platform/authorize/page.tsx rename to apps/web/app/auth/platform/authorize/page.tsx index 4f263ae4c0..898959c4ef 100644 --- a/apps/web/app/future/auth/platform/authorize/page.tsx +++ b/apps/web/app/auth/platform/authorize/page.tsx @@ -5,7 +5,7 @@ import Page from "~/auth/platform/authorize-view"; export const generateMetadata = async () => { return await _generateMetadata( - () => "Authorize", + (t) => t("authorize"), () => "" ); }; diff --git a/apps/web/app/future/auth/signin/page.tsx b/apps/web/app/auth/signin/page.tsx similarity index 100% rename from apps/web/app/future/auth/signin/page.tsx rename to apps/web/app/auth/signin/page.tsx diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts index 928b2ea86f..027ba5cc6b 100644 --- a/apps/web/middleware.ts +++ b/apps/web/middleware.ts @@ -168,6 +168,9 @@ export const config = { "/login", "/auth/login", "/auth/error", + "/auth/signin", + "/auth/oauth2/authorize", + "/auth/platform/authorize", /** * Paths required by routingForms.handle */ diff --git a/apps/web/pages/auth/oauth2/authorize.tsx b/apps/web/pages/auth/oauth2/authorize.tsx deleted file mode 100644 index 0783bd442d..0000000000 --- a/apps/web/pages/auth/oauth2/authorize.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import PageWrapper from "@components/PageWrapper"; - -import Authorize from "~/auth/oauth2/authorize-view"; - -const Page = () => ; -Page.PageWrapper = PageWrapper; -export default Page; diff --git a/apps/web/pages/auth/platform/authorize.tsx b/apps/web/pages/auth/platform/authorize.tsx deleted file mode 100644 index fd68c83625..0000000000 --- a/apps/web/pages/auth/platform/authorize.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import PageWrapper from "@components/PageWrapper"; - -import Authorize from "~/auth/platform/authorize-view"; - -const Page = () => ; -Page.PageWrapper = PageWrapper; -export default Page; diff --git a/apps/web/pages/auth/signin.tsx b/apps/web/pages/auth/signin.tsx deleted file mode 100644 index 7ce8e789e8..0000000000 --- a/apps/web/pages/auth/signin.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import PageWrapper from "@components/PageWrapper"; - -import { getServerSideProps } from "@server/lib/auth/signin/getServerSideProps"; - -import type { PageProps } from "~/auth/signin-view"; -import SignIn from "~/auth/signin-view"; - -const Page = (props: PageProps) => ; - -Page.PageWrapper = PageWrapper; - -export default Page; - -export { getServerSideProps }; diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index d95cfa7f82..d0450c6497 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -2928,6 +2928,7 @@ "managed_users_description": "See all the managed users created by your OAuth client", "select_oAuth_client": "Select Oauth Client", "on_every_instance": "On every instance", + "authorize": "Authorize", "next": "Next", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" }