diff --git a/packages/backend/server/src/__tests__/__snapshots__/mails.spec.ts.md b/packages/backend/server/src/__tests__/__snapshots__/mails.spec.ts.md index d67f5b0cd8..b5b26f46c7 100644 --- a/packages/backend/server/src/__tests__/__snapshots__/mails.spec.ts.md +++ b/packages/backend/server/src/__tests__/__snapshots__/mails.spec.ts.md @@ -65,7 +65,7 @@ Generated by [AVA](https://avajs.dev). ␊ ␊ - Sign in to AFFiNE Cloud␊ + Sign in to AFFiNE␊

␊ ␊ ␊ @@ -205,7 +205,7 @@ Generated by [AVA](https://avajs.dev). ␊ ␊ - Sign up to AFFiNE Cloud␊ + Sign up to AFFiNE␊

␊ ␊ ␊ diff --git a/packages/backend/server/src/__tests__/__snapshots__/mails.spec.ts.snap b/packages/backend/server/src/__tests__/__snapshots__/mails.spec.ts.snap index 0b48451d26..bf8f5d8422 100644 Binary files a/packages/backend/server/src/__tests__/__snapshots__/mails.spec.ts.snap and b/packages/backend/server/src/__tests__/__snapshots__/mails.spec.ts.snap differ diff --git a/packages/backend/server/src/core/auth/service.ts b/packages/backend/server/src/core/auth/service.ts index f9a4532b16..90e18baac0 100644 --- a/packages/backend/server/src/core/auth/service.ts +++ b/packages/backend/server/src/core/auth/service.ts @@ -51,6 +51,13 @@ export class AuthService implements OnApplicationBootstrap { }; } + private getServerName() { + return ( + this.config.server.name ?? + (env.selfhosted ? 'AFFiNE Self-hosted' : 'AFFiNE Cloud') + ); + } + async onApplicationBootstrap() { if (env.dev) { await createDevUsers(this.models); @@ -372,6 +379,7 @@ export class AuthService implements OnApplicationBootstrap { props: { url: link, otp, + serverName: this.getServerName(), }, }); } diff --git a/packages/backend/server/src/core/config/resolver.ts b/packages/backend/server/src/core/config/resolver.ts index c1ad0e876d..d14e559da5 100644 --- a/packages/backend/server/src/core/config/resolver.ts +++ b/packages/backend/server/src/core/config/resolver.ts @@ -75,7 +75,7 @@ export class ServerConfigResolver { name: this.config.server.name ?? (env.selfhosted - ? 'AFFiNE SelfHosted Cloud' + ? 'AFFiNE Self-hosted' : env.namespaces.canary ? 'AFFiNE Canary Cloud' : env.namespaces.beta diff --git a/packages/backend/server/src/mails/users/sign-in.tsx b/packages/backend/server/src/mails/users/sign-in.tsx index 479579638b..501f0c2175 100644 --- a/packages/backend/server/src/mails/users/sign-in.tsx +++ b/packages/backend/server/src/mails/users/sign-in.tsx @@ -11,12 +11,13 @@ import { export type SignInProps = { url: string; otp: string; + serverName?: string; }; export default function SignIn(props: SignInProps) { return (