feat: remove hono/auth-js

RSSNext · DIYgod · Dec 3, 2024 · Nov 30, 2024 · Dec 1, 2024 · Dec 1, 2024
commit c94d718927cc02dfcb7f25a3fe7c9df9b3aa63ca
diff --git a/apps/renderer/package.json b/apps/renderer/package.json
@@ -18,7 +18,6 @@
     "@follow/shared": "workspace:*",
     "@fontsource/sn-pro": "5.1.0",
     "@headlessui/react": "2.2.0",
-    "@hono/auth-js": "1.0.15",
     "@hookform/resolvers": "3.9.1",
     "@lottiefiles/dotlottie-react": "0.10.0",
     "@microflash/remark-callout-directives": "4.3.2",

diff --git a/apps/renderer/src/atoms/user.ts b/apps/renderer/src/atoms/user.ts
@@ -1,10 +1,12 @@
-import type { User } from "@auth/core/types"
 import type { UserRole } from "@follow/constants"
+import type { AuthSession } from "@follow/shared/hono"
 import { atom } from "jotai"
 
 import { createAtomHooks } from "~/lib/jotai"
 
-export const [, , useWhoami, , whoami, setWhoami] = createAtomHooks(atom<Nullable<User>>(null))
+export const [, , useWhoami, , whoami, setWhoami] = createAtomHooks(
+  atom<Nullable<NonNullable<AuthSession>["user"]>>(null),
+)
 
 export const [, , useLoginModalShow, useSetLoginModalShow, getLoginModalShow, setLoginModalShow] =
   createAtomHooks(atom<boolean>(false))

diff --git a/apps/renderer/src/hooks/biz/useSignOut.ts b/apps/renderer/src/hooks/biz/useSignOut.ts
@@ -1,10 +1,9 @@
-import { env } from "@follow/shared/env"
+import { signOut } from "@follow/shared/auth"
 import { clearStorage } from "@follow/utils/ns"
-import { signOut } from "@hono/auth-js/react"
 import { useCallback } from "react"
 
 import { setWhoami } from "~/atoms/user"
-import { isWebBuild, QUERY_PERSIST_KEY } from "~/constants"
+import { QUERY_PERSIST_KEY } from "~/constants"
 import { tipcClient } from "~/lib/client"
 import { clearLocalPersistStoreData } from "~/store/utils/clear"
 
@@ -22,7 +21,5 @@ export const useSignOut = () =>
     // clear local store data
     await Promise.allSettled([clearLocalPersistStoreData(), tipcClient?.cleanAuthSessionToken()])
     // Sign out
-    await signOut({
-      callbackUrl: isWebBuild ? env.VITE_WEB_URL : undefined,
-    })
+    await signOut()
   }, [])
diff --git a/apps/renderer/src/initialize/index.ts b/apps/renderer/src/initialize/index.ts
@@ -1,8 +1,6 @@
 import { initializeDayjs } from "@follow/components/dayjs"
 import { registerGlobalContext } from "@follow/shared/bridge"
 import { IN_ELECTRON } from "@follow/shared/constants"
-import { env } from "@follow/shared/env"
-import { authConfigManager } from "@hono/auth-js/react"
 import { repository } from "@pkg"
 import { enableMapSet } from "immer"
 
@@ -63,12 +61,6 @@ export const initializeApp = async () => {
   window.version = APP_VERSION
 
   const now = Date.now()
-  // Initialize the auth config first
-  authConfigManager.setConfig({
-    baseUrl: env.VITE_API_URL,
-    basePath: "/auth",
-    credentials: "include",
-  })
   initializeDayjs()
   registerHistoryStack()
 

diff --git a/apps/renderer/src/lib/api-fetch.ts b/apps/renderer/src/lib/api-fetch.ts
@@ -1,6 +1,5 @@
 import { env } from "@follow/shared/env"
 import type { AppType } from "@follow/shared/hono"
-import { getCsrfToken } from "@hono/auth-js/react"
 import PKG from "@pkg"
 import { hc } from "hono/client"
 import { FetchError, ofetch } from "ofetch"
@@ -13,27 +12,15 @@ import { isDev } from "~/constants"
 import { NeedActivationToast } from "~/modules/activation/NeedActivationToast"
 import { DebugRegistry } from "~/modules/debug/registry"
 
-let csrfTokenPromise: Promise<string> | null = null
-
-const getPromisedCsrfToken = async () => {
-  if (!csrfTokenPromise) {
-    csrfTokenPromise = getCsrfToken()
-  }
-
-  return await csrfTokenPromise
-}
 export const apiFetch = ofetch.create({
   baseURL: env.VITE_API_URL,
   credentials: "include",
   retry: false,
-  onRequest: async ({ options }) => {
-    const csrfToken = await getPromisedCsrfToken()
-
+  onRequest: ({ options }) => {
     const header = new Headers(options.headers)
 
     header.set("x-app-version", PKG.version)
     header.set("X-App-Dev", process.env.NODE_ENV === "development" ? "1" : "0")
-    header.set("X-Csrf-Token", csrfToken)
     options.headers = header
   },
   onResponse() {
@@ -92,11 +79,10 @@ export const apiClient = hc<AppType>(env.VITE_API_URL, {
       }
       throw err
     }),
-  async headers() {
+  headers() {
     return {
       "X-App-Version": PKG.version,
       "X-App-Dev": process.env.NODE_ENV === "development" ? "1" : "0",
-      "X-Csrf-Token": await getPromisedCsrfToken(),
     }
   },
 })

diff --git a/apps/renderer/src/queries/auth.ts b/apps/renderer/src/queries/auth.ts
@@ -1,4 +1,5 @@
 import { getSession } from "@follow/shared/auth"
+import type { AuthSession } from "@follow/shared/hono"
 import type { FetchError } from "ofetch"
 
 import { useAuthQuery } from "~/hooks/common"
@@ -30,7 +31,7 @@ export const useSession = (options?: { enabled?: boolean }) => {
   const fetchError = error as FetchError
 
   return {
-    session: data?.data,
+    session: data?.data as AuthSession,
     ...rest,
     status: isLoading
       ? "loading"

diff --git a/apps/server/client/initialize/index.ts b/apps/server/client/initialize/index.ts
@@ -1,18 +1,10 @@
 import { initI18n } from "@client/i18n"
 import { initializeDayjs } from "@follow/components/dayjs"
-import { env } from "@follow/shared/env"
-import { authConfigManager } from "@hono/auth-js/react"
 
 import { initAnalytics } from "./analytics"
 import { initSentry } from "./sentry"
 
 export const initialize = () => {
-  authConfigManager.setConfig({
-    baseUrl: env.VITE_API_URL,
-    basePath: "/auth",
-    credentials: "include",
-  })
-
   initializeDayjs()
   initI18n()
   initAnalytics()

diff --git a/apps/server/client/lib/api-fetch.ts b/apps/server/client/lib/api-fetch.ts
@@ -1,24 +1,15 @@
 import { env } from "@follow/shared/env"
 import type { AppType } from "@follow/shared/hono"
-import { getCsrfToken } from "@hono/auth-js/react"
 import { hc } from "hono/client"
 import { ofetch } from "ofetch"
 
-let csrfTokenPromise: Promise<string> | null = null
 const apiFetch = ofetch.create({
   credentials: "include",
   retry: false,
-  onRequest: async ({ options }) => {
-    if (!csrfTokenPromise) {
-      csrfTokenPromise = getCsrfToken()
-    }
-
-    const csrfToken = await csrfTokenPromise
-
+  onRequest: ({ options }) => {
     const header = new Headers(options.headers)
 
     header.set("x-app-version", "Web External")
-    header.set("X-Csrf-Token", csrfToken)
     options.headers = header
   },
 })

diff --git a/apps/server/client/pages/(login)/login.tsx b/apps/server/client/pages/(login)/login.tsx
@@ -1,23 +1,19 @@
 import { UserAvatar } from "@client/components/ui/user-avatar"
 import { apiClient } from "@client/lib/api-fetch"
+import { useSession } from "@client/query/auth"
 import { useAuthProviders } from "@client/query/users"
 import { Logo } from "@follow/components/icons/logo.jsx"
 import { Button } from "@follow/components/ui/button/index.js"
 import { authProvidersConfig } from "@follow/constants"
-import { loginHandler } from "@follow/shared/auth"
+import { loginHandler, signOut } from "@follow/shared/auth"
 import { DEEPLINK_SCHEME } from "@follow/shared/constants"
 import { cn } from "@follow/utils/utils"
-import { SessionProvider, signOut, useSession } from "@hono/auth-js/react"
 import { useCallback, useEffect, useRef, useState } from "react"
 import { useTranslation } from "react-i18next"
 import { useLocation } from "react-router"
 
 export function Component() {
-  return (
-    <SessionProvider>
-      <Login />
-    </SessionProvider>
-  )
+  return <Login />
 }
 
 function Login() {

diff --git a/apps/server/client/query/auth.ts b/apps/server/client/query/auth.ts
@@ -1,9 +1,6 @@
-import type { Session } from "@auth/core/types"
-import type { GetSessionParams } from "@hono/auth-js/react"
-import { authConfigManager } from "@hono/auth-js/react"
+import { getSession } from "@follow/shared/auth"
 import { useQuery } from "@tanstack/react-query"
 import type { FetchError } from "ofetch"
-import { ofetch } from "ofetch"
 
 export const useSession = (options?: { enabled?: boolean }) => {
   const { data, isLoading, ...rest } = useQuery({
@@ -38,36 +35,3 @@ export const useSession = (options?: { enabled?: boolean }) => {
           : "error",
   }
 }
-
-/**
- * Fetch session data, copy and patch code from @hono/auth-js/react
- */
-async function fetchData<T = any>(
-  path: string,
-
-  req: any = {},
-): Promise<T | null> {
-  const config = authConfigManager.getConfig()
-  const url = `${config.baseUrl}${config.basePath}/${path}`
-
-  const options: RequestInit = {
-    headers: {
-      "Content-Type": "application/json",
-      ...(req?.headers?.cookie ? { cookie: req.headers.cookie } : {}),
-    },
-    credentials: config.credentials,
-  }
-
-  if (req?.body) {
-    options.body = JSON.stringify(req.body)
-    options.method = "POST"
-  }
-
-  const data = await ofetch(url, options)
-
-  return data as T
-}
-
-function getSession(params?: GetSessionParams) {
-  return fetchData<Session>("session", params)
-}
diff --git a/apps/server/package.json b/apps/server/package.json
@@ -10,7 +10,6 @@
     "@fastify/middie": "9.0.2",
     "@fastify/request-context": "6.0.1",
     "@fontsource/sn-pro": "5.1.0",
-    "@hono/auth-js": "1.0.15",
     "@openpanel/web": "1.0.1",
     "@resvg/resvg-js": "2.6.2",
     "@sentry/react": "8.40.0",