RSSNext · DIYgod · Dec 3, 2024 · Nov 30, 2024 · Dec 1, 2024 · Dec 1, 2024
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -3,6 +3,10 @@ on:
   push:
     branches: [main, dev]
 
+env:
+  VITE_WEB_URL: ${{ vars.VITE_WEB_URL }}
+  VITE_API_URL: ${{ vars.VITE_API_URL }}
+
 name: CI Format, Typecheck and Lint
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-lint

diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
@@ -48,7 +48,7 @@ If you prefer to develop in Electron, follow these steps:
    pnpm run dev
    ```
 
-> **Tip:** If you encounter login issues, copy the `authjs.session-token` from your browser's cookies into the app.
+> **Tip:** If you encounter login issues, copy the `better-auth.session_token` from your browser's cookies into the app.
 
 ## Contribution Guidelines
 

diff --git a/README.md b/README.md
@@ -126,7 +126,7 @@ pnpm run dev
 Since it is not very convenient to develop in Electron, the first way to develop and contribute is recommended at this stage.
 
 > [!TIP]
-> If you can't log in to the app, copy the `authjs.session-token` in the cookie from your browser into the app.
+> If you can't log in to the app, copy the `better-auth.session_token` in the cookie from your browser into the app.
 
 ## 📝 License
 

diff --git a/apps/main/global.d.ts b/apps/main/global.d.ts
@@ -1,5 +1,4 @@
 import "../../types/vite"
-import "../../types/authjs"
 
 declare global {
   const GIT_COMMIT_HASH: string

diff --git a/apps/main/src/index.ts b/apps/main/src/index.ts
@@ -14,7 +14,7 @@
 import { handleUrlRouting } from "./lib/router"
 import { store } from "./lib/store"
 import { registerAppTray } from "./lib/tray"
-import { setAuthSessionToken, updateNotificationsToken } from "./lib/user"
+import { setBetterAuthSessionCookie, updateNotificationsToken } from "./lib/user"
 import { registerUpdater } from "./updater"
 import { cleanupOldRender } from "./updater/hot-updater"
 import {
@@ -62,7 +62,7 @@
  // This method will be called when Electron has finished
  // initialization and is ready to create browser windows.
  // Some APIs can only be used after this event occurs.
  app.whenReady().then(async () => {
    // Default open or close DevTools by F12 in development
    // and ignore CommandOrControl + R in production.
    // see https://github.com/alex8088/electron-toolkit/tree/master/packages/utils
@@ -189,24 +189,16 @@
     const urlObj = new URL(url)
 
     if (urlObj.hostname === "auth" || urlObj.pathname === "//auth") {
-      const token = urlObj.searchParams.get("token")
+      const ck = urlObj.searchParams.get("ck")
       const userId = urlObj.searchParams.get("userId")
 
-      if (token && apiURL) {
-        setAuthSessionToken(token)
+      if (ck && apiURL) {
+        setBetterAuthSessionCookie(ck)
+        const cookie = atob(ck)
         mainWindow.webContents.session.cookies.set({
           url: apiURL,
-          name: "authjs.session-token",
-          value: token,
-          secure: true,
-          httpOnly: true,
-          domain: new URL(apiURL).hostname,
-          sameSite: "no_restriction",
-        })
-        mainWindow.webContents.session.cookies.set({
-          url: apiURL,
-          name: "authjs.callback-url",
-          value: env.VITE_WEB_URL,
+          name: cookie.split("=")[0],
+          value: cookie.split("=")[1],
           secure: true,
           httpOnly: true,
           domain: new URL(apiURL).hostname,

diff --git a/apps/main/src/lib/api-client.ts b/apps/main/src/lib/api-client.ts
@@ -5,7 +5,7 @@ import { hc } from "hono/client"
 import { ofetch } from "ofetch"
 
 import { logger } from "../logger"
-import { getAuthSessionToken, getUser } from "./user"
+import { getBetterAuthSessionCookie, getUser } from "./user"
 
 const abortController = new AbortController()
 export const apiFetch = ofetch.create({
@@ -14,8 +14,8 @@ export const apiFetch = ofetch.create({
   signal: abortController.signal,
   retry: false,
   onRequest({ request }) {
-    const authSessionToken = getAuthSessionToken()
-    if (!authSessionToken) {
+    const betterAuthSessionCookie = getBetterAuthSessionCookie()
+    if (!betterAuthSessionCookie) {
       abortController.abort()
       return
     }
@@ -32,12 +32,12 @@ export const apiFetch = ofetch.create({
 export const apiClient = hc<AppType>("", {
   fetch: async (input, options = {}) => apiFetch(input.toString(), options),
   headers() {
-    const authSessionToken = getAuthSessionToken()
+    const betterAuthSessionCookie = getBetterAuthSessionCookie()
     const user = getUser()
     return {
       "X-App-Version": PKG.version,
       "X-App-Dev": process.env.NODE_ENV === "development" ? "1" : "0",
-      Cookie: authSessionToken ? `authjs.session-token=${authSessionToken}` : "",
+      Cookie: betterAuthSessionCookie ? atob(betterAuthSessionCookie) : "",
       "User-Agent": `Follow/${PKG.version}${user?.id ? ` uid: ${user.id}` : ""}`,
     }
   },

diff --git a/apps/main/src/lib/user.ts b/apps/main/src/lib/user.ts
@@ -1,13 +1,15 @@
 import type { User } from "@auth/core/types"
 import type { Credentials } from "@eneris/push-receiver/dist/types"
 
+import { logger } from "~/logger"
+
 import { apiClient } from "./api-client"
 import { store } from "./store"
 
-const AuthKey = "authSessionToken"
-export const setAuthSessionToken = (token: string) => store.set(AuthKey, token)
-export const getAuthSessionToken = (): string | null => store.get(AuthKey)
-export const cleanAuthSessionToken = () => store.set(AuthKey, null)
+const BetterAuthKey = "betterAuthSessionCookie"
+export const setBetterAuthSessionCookie = (cookie: string) => store.set(BetterAuthKey, cookie)
+export const getBetterAuthSessionCookie = (): string | null => store.get(BetterAuthKey)
+export const cleanBetterAuthSessionCookie = () => store.set(BetterAuthKey, null)
 
 const UserKey = "user"
 export const setUser = (user: User) => store.set(UserKey, JSON.stringify(user))
@@ -24,11 +26,15 @@ export const updateNotificationsToken = async (newCredentials?: Credentials) =>
   }
   const credentials = newCredentials || store.get("notifications-credentials")
   if (credentials?.fcm?.token) {
-    await apiClient.messaging.$post({
-      json: {
-        token: credentials.fcm.token,
-        channel: "desktop",
-      },
-    })
+    try {
+      await apiClient.messaging.$post({
+        json: {
+          token: credentials.fcm.token,
+          channel: "desktop",
+        },
+      })
+    } catch (error) {
+      logger.error("updateNotificationsToken error: ", error)
+    }
   }
 }
diff --git a/apps/main/src/tipc/app.ts b/apps/main/src/tipc/app.ts
@@ -18,7 +18,7 @@ import { cleanupOldRender, loadDynamicRenderEntry } from "~/updater/hot-updater"
 import { isDev, isWindows11 } from "../env"
 import { downloadFile } from "../lib/download"
 import { i18n } from "../lib/i18n"
-import { cleanAuthSessionToken, cleanUser } from "../lib/user"
+import { cleanBetterAuthSessionCookie, cleanUser } from "../lib/user"
 import type { RendererHandlers } from "../renderer-handlers"
 import { quitAndInstall } from "../updater"
 import { getMainWindow } from "../window"
@@ -167,8 +167,8 @@ export const appRoute = {
     quitAndInstall()
   }),
 
-  cleanAuthSessionToken: t.procedure.action(async () => {
-    cleanAuthSessionToken()
+  cleanBetterAuthSessionCookie: t.procedure.action(async () => {
+    cleanBetterAuthSessionCookie()
     cleanUser()
   }),
   /// clipboard

diff --git a/apps/renderer/global.d.ts b/apps/renderer/global.d.ts
@@ -1,5 +1,3 @@
-import "../../types/authjs"
-
 import type { ElectronAPI } from "@electron-toolkit/preload"
 
 declare global {

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.1",
     "@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/components/ui/media/SwipeMedia.tsx b/apps/renderer/src/components/ui/media/SwipeMedia.tsx
@@ -28,7 +28,7 @@ export function SwipeMedia({
     height: number
   }
 }) {
-  const uniqMedia = uniqBy(media, "url")
+  const uniqMedia = media ? uniqBy(media, "url") : []
 
   const hoverRef = useRef<HTMLDivElement>(null)
 

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"
 
@@ -20,9 +19,10 @@ export const useSignOut = () =>
     clearStorage()
     window.analytics?.reset()
     // clear local store data
-    await Promise.allSettled([clearLocalPersistStoreData(), tipcClient?.cleanAuthSessionToken()])
+    await Promise.allSettled([
+      clearLocalPersistStoreData(),
+      tipcClient?.cleanBetterAuthSessionCookie(),
+    ])
     // Sign out
-    await signOut({
-      callbackUrl: isWebBuild ? env.VITE_WEB_URL : undefined,
-    })
+    await signOut()
   }, [])
diff --git a/apps/renderer/src/initialize/helper.ts b/apps/renderer/src/initialize/helper.ts
@@ -1,13 +1,13 @@
-import type { User } from "@auth/core/types"
+import type { UserModel } from "@follow/models"
 
 import { op } from "./op"
 
-export const setIntegrationIdentify = async (user: User) => {
+export const setIntegrationIdentify = async (user: UserModel) => {
   op.identify({
     profileId: user.id,
     email: user.email,
-    avatar: user.image,
-    lastName: user.name,
+    avatar: user.image ?? undefined,
+    lastName: user.name ?? undefined,
     properties: {
       handle: user.handle,
       name: user.name,

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/lib/auth.ts b/apps/renderer/src/lib/auth.ts
diff --git a/apps/renderer/src/modules/auth/LoginModalContent.tsx b/apps/renderer/src/modules/auth/LoginModalContent.tsx
@@ -2,6 +2,8 @@ import { FollowIcon } from "@follow/components/icons/follow.jsx"
 import { MotionButtonBase } from "@follow/components/ui/button/index.js"
 import { LoadingCircle } from "@follow/components/ui/loading/index.jsx"
 import { authProvidersConfig } from "@follow/constants"
+import type { LoginRuntime } from "@follow/shared/auth"
+import { loginHandler } from "@follow/shared/auth"
 import { stopPropagation } from "@follow/utils/dom"
 import clsx from "clsx"
 import { AnimatePresence, m } from "framer-motion"
@@ -10,8 +12,6 @@ import { useTranslation } from "react-i18next"
 
 import { modalMontionConfig } from "~/components/ui/modal/stacked/constants"
 import { useCurrentModal } from "~/components/ui/modal/stacked/hooks"
-import type { LoginRuntime } from "~/lib/auth"
-import { loginHandler } from "~/lib/auth"
 import { useAuthProviders } from "~/queries/users"
 
 interface LoginModalContentProps {