From c404e50ecf6dca81a52601a083522b0a6712238d Mon Sep 17 00:00:00 2001 From: Innei Date: Wed, 27 Nov 2024 17:01:41 +0800 Subject: [PATCH] refactor: remove external and proxy server pages Signed-off-by: Innei --- apps/renderer/src/pages/(external)/layout.tsx | 15 --- apps/renderer/src/pages/(external)/login.tsx | 125 ------------------ apps/server/client/pages/(login)/login.tsx | 4 +- package.json | 2 + pnpm-lock.yaml | 38 ++++++ vite.config.ts | 50 ++++++- 6 files changed, 86 insertions(+), 148 deletions(-) delete mode 100644 apps/renderer/src/pages/(external)/layout.tsx delete mode 100644 apps/renderer/src/pages/(external)/login.tsx diff --git a/apps/renderer/src/pages/(external)/layout.tsx b/apps/renderer/src/pages/(external)/layout.tsx deleted file mode 100644 index 2d429363f..000000000 --- a/apps/renderer/src/pages/(external)/layout.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { Outlet } from "react-router" - -import { EnvironmentIndicator } from "~/modules/app/EnvironmentIndicator" -import { UserProvider } from "~/providers/user-provider" - -export function Component() { - return ( - <> - - - - {!import.meta.env.PROD && } - - ) -} diff --git a/apps/renderer/src/pages/(external)/login.tsx b/apps/renderer/src/pages/(external)/login.tsx deleted file mode 100644 index e5f1d8168..000000000 --- a/apps/renderer/src/pages/(external)/login.tsx +++ /dev/null @@ -1,125 +0,0 @@ -import { Logo } from "@follow/components/icons/logo.jsx" -import { Button } from "@follow/components/ui/button/index.js" -import { DEEPLINK_SCHEME } from "@follow/shared/constants" -import { SessionProvider, signIn, useSession } from "@hono/auth-js/react" -import { useEffect, useState } from "react" -import { useTranslation } from "react-i18next" -import { useLocation, useNavigate } from "react-router" - -import { useSignOut } from "~/hooks/biz/useSignOut" -import { apiClient } from "~/lib/api-fetch" -import { LOGIN_CALLBACK_URL, loginHandler } from "~/lib/auth" -import { UserAvatar } from "~/modules/user/UserAvatar" - -export function Component() { - return ( - - - - ) -} -function Login() { - const { status } = useSession() - const navigate = useNavigate() - const [redirecting, setRedirecting] = useState(false) - const signOut = useSignOut() - const location = useLocation() - const urlParams = new URLSearchParams(location.search) - const provider = urlParams.get("provider") - - const isAuthenticated = status === "authenticated" - - const { t } = useTranslation("external") - - useEffect(() => { - if (!window.electron && provider && status === "unauthenticated") { - signIn(provider, { - callbackUrl: LOGIN_CALLBACK_URL, - }) - setRedirecting(true) - } - }, [status]) - - const getCallbackUrl = async () => { - const { data } = await apiClient["auth-app"]["new-session"].$post({}) - return { - url: `${DEEPLINK_SCHEME}auth?token=${data.sessionToken}&userId=${data.userId}`, - userId: data.userId, - } - } - - return ( -
- - {!isAuthenticated && ( -

- {t("login.logInTo")} - {` ${APP_NAME}`} -

- )} - {redirecting ? ( -
{t("login.redirecting")}
- ) : ( -
- {isAuthenticated ? ( -
-
- -
- -
-
-

- {t("redirect.successMessage", { app_name: APP_NAME })}
-
- {t("redirect.instruction", { app_name: APP_NAME })} -

-
- - - -
-
- ) : ( - <> - - - - )} -
- )} -
- ) -} diff --git a/apps/server/client/pages/(login)/login.tsx b/apps/server/client/pages/(login)/login.tsx index 40401aaad..17b514339 100644 --- a/apps/server/client/pages/(login)/login.tsx +++ b/apps/server/client/pages/(login)/login.tsx @@ -107,7 +107,7 @@ function Login() { ) : ( <>