There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
feat(core): open in app for self-hosted (#9231)
pengx1717c2293986ef
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.ymlindex 2a9b32ca0a..9810136d41 100644--- a/.github/workflows/release-desktop.yml+++ b/.github/workflows/release-desktop.yml@@ -146,7 +146,6 @@ jobs:env:SKIP_WEB_BUILD: 1HOIST_NODE_MODULES: 1- DEBUG: '*'- name: signing DMGif: ${{ matrix.spec.platform == 'darwin' }}diff --git a/packages/frontend/core/src/components/sign-in/add-selfhosted.tsx b/packages/frontend/core/src/components/sign-in/add-selfhosted.tsxindex b6db8a15a0..d993681d56 100644--- a/packages/frontend/core/src/components/sign-in/add-selfhosted.tsx+++ b/packages/frontend/core/src/components/sign-in/add-selfhosted.tsx@@ -78,9 +78,11 @@ export const AddSelfhostedStep = ({...prev,initialServerBaseUrl: undefined,}));- onConnect();+ if (serversService.getServerByBaseUrl(state.initialServerBaseUrl)) {+ onConnect();+ }}- }, [changeState, onConnect, state]);+ }, [changeState, onConnect, serversService, state]);return (<>diff --git a/packages/frontend/core/src/components/sign-in/index.tsx b/packages/frontend/core/src/components/sign-in/index.tsxindex e5ac4a9a7a..3bcb0ef07a 100644--- a/packages/frontend/core/src/components/sign-in/index.tsx+++ b/packages/frontend/core/src/components/sign-in/index.tsx@@ -1,4 +1,5 @@import { DefaultServerService, type Server } from '@affine/core/modules/cloud';+import type { AuthSessionStatus } from '@affine/core/modules/cloud/entities/session';import { FrameworkScope, useService } from '@toeverything/infra';import { useState } from 'react';@@ -22,11 +23,13 @@ export interface SignInState {}export const SignInPanel = ({- onClose,+ onSkip,server: initialServerBaseUrl,initStep,+ onAuthenticated,}: {- onClose: () => void;+ onAuthenticated?: (status: AuthSessionStatus) => void;+ onSkip: () => void;server?: string;initStep?: SignInStep | undefined;}) => {@@ -47,18 +50,23 @@ export const SignInPanel = ({return (<FrameworkScope scope={server.scope}>{step === 'signIn' ? (- <SignInStep state={state} changeState={setState} close={onClose} />+ <SignInStep+ state={state}+ changeState={setState}+ onSkip={onSkip}+ onAuthenticated={onAuthenticated}+ />) : step === 'signInWithEmail' ? (<SignInWithEmailStepstate={state}changeState={setState}- close={onClose}+ onAuthenticated={onAuthenticated}/>) : step === 'signInWithPassword' ? (<SignInWithPasswordStepstate={state}changeState={setState}- close={onClose}+ onAuthenticated={onAuthenticated}/>) : step === 'addSelfhosted' ? (<AddSelfhostedStep state={state} changeState={setState} />diff --git a/packages/frontend/core/src/components/sign-in/sign-in-with-email.tsx b/packages/frontend/core/src/components/sign-in/sign-in-with-email.tsxindex 7a99ecaa27..5c190e6f6e 100644--- a/packages/frontend/core/src/components/sign-in/sign-in-with-email.tsx+++ b/packages/frontend/core/src/components/sign-in/sign-in-with-email.tsx@@ -8,6 +8,7 @@ import {import { Button } from '@affine/component/ui/button';import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';import { AuthService, CaptchaService } from '@affine/core/modules/cloud';+import type { AuthSessionStatus } from '@affine/core/modules/cloud/entities/session';import { Unreachable } from '@affine/env/constant';import { Trans, useI18n } from '@affine/i18n';import { useLiveData, useService } from '@toeverything/infra';@@ -27,11 +28,11 @@ import * as style from './style.css';export const SignInWithEmailStep = ({state,changeState,- close,+ onAuthenticated,}: {state: SignInState;changeState: Dispatch<SetStateAction<SignInState>>;- close: () => void;+ onAuthenticated?: (status: AuthSessionStatus) => void;}) => {const initialSent = useRef(false);const [resendCountDown, setResendCountDown] = useState(0);@@ -66,13 +67,13 @@ export const SignInWithEmailStep = ({useEffect(() => {if (loginStatus === 'authenticated') {- close();notify.success({title: t['com.affine.auth.toast.title.signed-in'](),message: t['com.affine.auth.toast.message.signed-in'](),});}- }, [close, loginStatus, t]);+ onAuthenticated?.(loginStatus);+ }, [loginStatus, onAuthenticated, t]);const sendEmail = useAsyncCallback(async () => {if (isSending || (!verifyToken && needCaptcha)) return;diff --git a/packages/frontend/core/src/components/sign-in/sign-in-with-password.tsx b/packages/frontend/core/src/components/sign-in/sign-in-with-password.tsxindex 30b00e1c58..f79ac964b5 100644--- a/packages/frontend/core/src/components/sign-in/sign-in-with-password.tsx+++ b/packages/frontend/core/src/components/sign-in/sign-in-with-password.tsx@@ -11,6 +11,7 @@ import {CaptchaService,ServerService,} from '@affine/core/modules/cloud';+import type { AuthSessionStatus } from '@affine/core/modules/cloud/entities/session';import { Unreachable } from '@affine/env/constant';import { ServerDeploymentType } from '@affine/graphql';import { useI18n } from '@affine/i18n';@@ -25,11 +26,11 @@ import * as styles from './style.css';export const SignInWithPasswordStep = ({state,changeState,- close,+ onAuthenticated,}: {state: SignInState;changeState: Dispatch<SetStateAction<SignInState>>;- close: () => void;+ onAuthenticated?: (status: AuthSessionStatus) => void;}) => {const t = useI18n();const authService = useService(AuthService);@@ -62,13 +63,13 @@ export const SignInWithPasswordStep = ({useEffect(() => {if (loginStatus === 'authenticated') {- close();notify.success({title: t['com.affine.auth.toast.title.signed-in'](),message: t['com.affine.auth.toast.message.signed-in'](),});}- }, [close, loginStatus, t]);+ onAuthenticated?.(loginStatus);+ }, [loginStatus, onAuthenticated, t]);const onSignIn = useAsyncCallback(async () => {if (isLoading || (!verifyToken && needCaptcha)) return;diff --git a/packages/frontend/core/src/components/sign-in/sign-in.tsx b/packages/frontend/core/src/components/sign-in/sign-in.tsxindex 57d13924aa..efbe5e2199 100644--- a/packages/frontend/core/src/components/sign-in/sign-in.tsx+++ b/packages/frontend/core/src/components/sign-in/sign-in.tsx@@ -3,6 +3,7 @@ import { AuthInput, ModalHeader } from '@affine/component/auth-components';import { OAuth } from '@affine/core/components/affine/auth/oauth';import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';import { AuthService, ServerService } from '@affine/core/modules/cloud';+import type { AuthSessionStatus } from '@affine/core/modules/cloud/entities/session';import { FeatureFlagService } from '@affine/core/modules/feature-flag';import { ServerDeploymentType } from '@affine/graphql';import { Trans, useI18n } from '@affine/i18n';@@ -30,11 +31,13 @@ function validateEmail(email: string) {export const SignInStep = ({state,changeState,- close,+ onSkip,+ onAuthenticated,}: {state: SignInState;changeState: Dispatch<SetStateAction<SignInState>>;- close: () => void;+ onSkip: () => void;+ onAuthenticated?: (status: AuthSessionStatus) => void;}) => {const t = useI18n();const serverService = useService(ServerService);@@ -61,13 +64,13 @@ export const SignInStep = ({useEffect(() => {if (loginStatus === 'authenticated') {- close();notify.success({title: t['com.affine.auth.toast.title.signed-in'](),message: t['com.affine.auth.toast.message.signed-in'](),});}- }, [close, loginStatus, t]);+ onAuthenticated?.(loginStatus);+ }, [loginStatus, onAuthenticated, t]);const onContinue = useAsyncCallback(async () => {if (!validateEmail(email)) {@@ -205,7 +208,7 @@ export const SignInStep = ({</div><Buttonvariant="plain"- onClick={() => close()}+ onClick={onSkip}className={style.skipLink}suffix={<ArrowRightBigIcon className={style.skipLinkIcon} />}>diff --git a/packages/frontend/core/src/desktop/dialogs/sign-in/index.tsx b/packages/frontend/core/src/desktop/dialogs/sign-in/index.tsxindex 14cedb123d..7816142cef 100644--- a/packages/frontend/core/src/desktop/dialogs/sign-in/index.tsx+++ b/packages/frontend/core/src/desktop/dialogs/sign-in/index.tsx@@ -1,14 +1,24 @@import { Modal } from '@affine/component';import { SignInPanel, type SignInStep } from '@affine/core/components/sign-in';+import type { AuthSessionStatus } from '@affine/core/modules/cloud/entities/session';import type {DialogComponentProps,GLOBAL_DIALOG_SCHEMA,} from '@affine/core/modules/dialogs';+import { useCallback } from 'react';export const SignInDialog = ({close,server: initialServerBaseUrl,step,}: DialogComponentProps<GLOBAL_DIALOG_SCHEMA['sign-in']>) => {+ const onAuthenticated = useCallback(+ (status: AuthSessionStatus) => {+ if (status === 'authenticated') {+ close();+ }+ },+ [close]+ );return (<Modalopen@@ -21,7 +31,8 @@ export const SignInDialog = ({}}><SignInPanel- onClose={close}+ onSkip={close}+ onAuthenticated={onAuthenticated}server={initialServerBaseUrl}initStep={step as SignInStep}/>diff --git a/packages/frontend/core/src/desktop/pages/auth/sign-in.tsx b/packages/frontend/core/src/desktop/pages/auth/sign-in.tsxindex f58c25e2f6..22387a70b8 100644--- a/packages/frontend/core/src/desktop/pages/auth/sign-in.tsx+++ b/packages/frontend/core/src/desktop/pages/auth/sign-in.tsx@@ -2,11 +2,9 @@ import { notify } from '@affine/component';import { AffineOtherPageLayout } from '@affine/component/affine-other-page-layout';import { SignInPageContainer } from '@affine/component/auth-components';import { SignInPanel } from '@affine/core/components/sign-in';-import { AuthService } from '@affine/core/modules/cloud';+import type { AuthSessionStatus } from '@affine/core/modules/cloud/entities/session';import { useI18n } from '@affine/i18n';-import { useService } from '@toeverything/infra';-import { useEffect } from 'react';-// eslint-disable-next-line @typescript-eslint/no-restricted-imports+import { useCallback, useEffect } from 'react';import { useNavigate, useSearchParams } from 'react-router-dom';import {@@ -20,11 +18,12 @@ export const SignIn = ({redirectUrl?: string;}) => {const t = useI18n();- const session = useService(AuthService).session;const navigate = useNavigate();const { jumpToIndex } = useNavigateHelper();const [searchParams] = useSearchParams();const redirectUrl = redirectUrlFromProps ?? searchParams.get('redirect_uri');++ const server = searchParams.get('server') ?? undefined;const error = searchParams.get('error');useEffect(() => {@@ -36,22 +35,38 @@ export const SignIn = ({}}, [error, t]);- const handleClose = () => {- if (session.status$.value === 'authenticated' && redirectUrl) {- navigate(redirectUrl, {- replace: true,- });- } else {- jumpToIndex(RouteLogic.REPLACE, {- search: searchParams.toString(),- });- }- };+ const handleClose = useCallback(() => {+ jumpToIndex(RouteLogic.REPLACE, {+ search: searchParams.toString(),+ });+ }, [jumpToIndex, searchParams]);++ const handleAuthenticated = useCallback(+ (status: AuthSessionStatus) => {+ if (status === 'authenticated') {+ if (redirectUrl) {+ navigate(redirectUrl, {+ replace: true,+ });+ } else {+ handleClose();+ }+ }+ },+ [handleClose, navigate, redirectUrl]+ );++ const initStep = server ? 'addSelfhosted' : 'signIn';return (<SignInPageContainer><div style={{ maxWidth: '400px', width: '100%' }}>- <SignInPanel onClose={handleClose} />+ <SignInPanel+ onSkip={handleClose}+ onAuthenticated={handleAuthenticated}+ initStep={initStep}+ server={server}+ /></div></SignInPageContainer>);diff --git a/packages/frontend/core/src/desktop/pages/workspace/index.tsx b/packages/frontend/core/src/desktop/pages/workspace/index.tsxindex 49f3b98f0d..4e2effc92e 100644--- a/packages/frontend/core/src/desktop/pages/workspace/index.tsx+++ b/packages/frontend/core/src/desktop/pages/workspace/index.tsx@@ -3,6 +3,7 @@ import { AffineOtherPageLayout } from '@affine/component/affine-other-page-layouimport { workbenchRoutes } from '@affine/core/desktop/workbench-router';import {DefaultServerService,+ ServersService,WorkspaceServerService,} from '@affine/core/modules/cloud';import { DndService } from '@affine/core/modules/dnd/services';@@ -21,12 +22,18 @@ import {} from '@toeverything/infra';import type { PropsWithChildren, ReactElement } from 'react';import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';-import { matchPath, useLocation, useParams } from 'react-router-dom';+import {+ matchPath,+ useLocation,+ useParams,+ useSearchParams,+} from 'react-router-dom';import { AffineErrorBoundary } from '../../../components/affine/affine-error-boundary';import { WorkbenchRoot } from '../../../modules/workbench';import { AppContainer } from '../../components/app-container';import { PageNotFound } from '../404';+import { SignIn } from '../auth/sign-in';import { WorkspaceLayout } from './layouts/workspace-layout';import { SharePage } from './share/share-page';@@ -52,6 +59,7 @@ export const Component = (): ReactElement => {const params = useParams();const location = useLocation();+ const [searchParams] = useSearchParams();// check if we are in detail doc route, if so, maybe render share pageconst detailDocRoute = useMemo(() => {@@ -80,6 +88,11 @@ export const Component = (): ReactElement => {const [workspaceNotFound, setWorkspaceNotFound] = useState(false);const listLoading = useLiveData(workspacesService.list.isRevalidating$);const workspaces = useLiveData(workspacesService.list.workspaces$);+ const serversService = useService(ServersService);+ const serverFromSearchParams = searchParams.get('server');+ const serverNotFound = serverFromSearchParams+ ? serversService.getServerByBaseUrl(serverFromSearchParams)+ : null;const meta = useMemo(() => {return workspaces.find(({ id }) => id === params.workspaceId);}, [workspaces, params.workspaceId]);@@ -113,6 +126,16 @@ export const Component = (): ReactElement => {}, [listLoading, meta, workspaceNotFound, workspacesService]);if (workspaceNotFound) {+ if (BUILD_CONFIG.isElectron && serverNotFound) {+ const url = new URL(window.location.href);+ url.searchParams.delete('server');+ const redirectUrl = url.toString().replace(window.location.origin, '');+ return (+ <AffineOtherPageLayout>+ <SignIn redirectUrl={redirectUrl} />+ </AffineOtherPageLayout>+ );+ }if (detailDocRoute) {return (<SharePagediff --git a/packages/frontend/core/src/mobile/components/sign-in/index.tsx b/packages/frontend/core/src/mobile/components/sign-in/index.tsxindex 5bfc891258..0d16f2daa6 100644--- a/packages/frontend/core/src/mobile/components/sign-in/index.tsx+++ b/packages/frontend/core/src/mobile/components/sign-in/index.tsx@@ -1,4 +1,6 @@import { SignInPanel } from '@affine/core/components/sign-in';+import type { AuthSessionStatus } from '@affine/core/modules/cloud/entities/session';+import { useCallback } from 'react';import { MobileSignInLayout } from './layout';@@ -9,9 +11,22 @@ export const MobileSignInPanel = ({onClose: () => void;server?: string;}) => {+ const onAuthenticated = useCallback(+ (status: AuthSessionStatus) => {+ if (status === 'authenticated') {+ onClose();+ }+ },+ [onClose]+ );+return (<MobileSignInLayout>- <SignInPanel onClose={onClose} server={server} />+ <SignInPanel+ onSkip={onClose}+ onAuthenticated={onAuthenticated}+ server={server}+ /></MobileSignInLayout>);};diff --git a/packages/frontend/core/src/modules/cloud/entities/session.ts b/packages/frontend/core/src/modules/cloud/entities/session.tsindex f6f63b5975..ae5e50072f 100644--- a/packages/frontend/core/src/modules/cloud/entities/session.ts+++ b/packages/frontend/core/src/modules/cloud/entities/session.ts@@ -35,6 +35,11 @@ export interface AuthSessionAuthenticated {session: AuthSessionInfo;}+export type AuthSessionStatus = (+ | AuthSessionUnauthenticated+ | AuthSessionAuthenticated+)['status'];+export class AuthSession extends Entity {session$: LiveData<AuthSessionUnauthenticated | AuthSessionAuthenticated> =LiveData.from(this.store.watchCachedAuthSession(), null).map(session =>diff --git a/packages/frontend/core/src/modules/open-in-app/utils.ts b/packages/frontend/core/src/modules/open-in-app/utils.tsindex 0b16fbc6cd..e0c0a2a4f4 100644--- a/packages/frontend/core/src/modules/open-in-app/utils.ts+++ b/packages/frontend/core/src/modules/open-in-app/utils.ts@@ -20,6 +20,10 @@ export const getOpenUrlInDesktopAppLink = (if (newTab) {params.set('new-tab', '1');}+ if (environment.isSelfHosted) {+ // assume self-hosted server is the current origin+ params.set('server', location.origin);+ }return new URL(`${scheme}://${urlObject.host}${urlObject.pathname}?${params.toString()}#${urlObject.hash}`).toString();diff --git a/tools/cli/src/webpack/config.ts b/tools/cli/src/webpack/config.tsindex e39038277d..f739935959 100644--- a/tools/cli/src/webpack/config.ts+++ b/tools/cli/src/webpack/config.ts@@ -360,7 +360,18 @@ export const createConfiguration: (client: {overlay: process.env.DISABLE_DEV_OVERLAY === 'true' ? false : undefined,},- historyApiFallback: true,+ historyApiFallback: {+ rewrites: [+ {+ from: /.*/,+ to: () => {+ return process.env.SELF_HOSTED === 'true'+ ? '/selfhost.html'+ : '/index.html';+ },+ },+ ],+ },static: [{directory: join(diff --git a/tools/cli/src/webpack/runtime-config.ts b/tools/cli/src/webpack/runtime-config.tsindex c5d61254c4..aa097824cb 100644--- a/tools/cli/src/webpack/runtime-config.ts+++ b/tools/cli/src/webpack/runtime-config.ts@@ -22,7 +22,6 @@ export function getBuildConfig(buildFlags: BuildFlags): BUILD_CONFIG_TYPE {isAndroid: buildFlags.distribution === 'android',isAdmin: buildFlags.distribution === 'admin',- isSelfHosted: process.env.SELF_HOSTED === 'true',appBuildType: 'stable' as const,serverUrlPrefix: 'https://app.affine.pro',appVersion: packageJson.version,