Merge remote-tracking branch 'origin/canary' into stable

packages/backend/server/src/modules/config.ts

@@ -0,0 +1,30 @@
+import { Module } from '@nestjs/common';
+import { Field, ObjectType, Query } from '@nestjs/graphql';
+
+import { SERVER_FLAVOR } from '../modules';
+
+@ObjectType()
+export class ServerConfigType {
+  @Field({ description: 'server version' })
+  version!: string;
+
+  @Field({ description: 'server flavor' })
+  flavor!: string;
+}
+
+export class ServerConfigResolver {
+  @Query(() => ServerConfigType, {
+    description: 'server config',
+  })
+  serverConfig(): ServerConfigType {
+    return {
+      version: AFFiNE.version,
+      flavor: SERVER_FLAVOR || 'allinone',
+    };
+  }
+}
+
+@Module({
+  providers: [ServerConfigResolver],
+})
+export class ServerConfigModule {}

packages/backend/server/src/modules/doc/history.ts

@@ -90,7 +90,7 @@ export class DocHistoryManager {
         workspaceId,
         id,
         timestamp: {
-          lte: before,
+          lt: before,
         },
         // only include the ones has not expired
         expiredAt: {

packages/backend/server/src/modules/index.ts

@@ -3,9 +3,10 @@ import { EventEmitterModule } from '@nestjs/event-emitter';
 import { ScheduleModule } from '@nestjs/schedule';
 
 import { GqlModule } from '../graphql.module';
-import { AuthModule } from './auth';
+import { ServerConfigModule } from './config';
 import { DocModule } from './doc';
 import { PaymentModule } from './payment';
+import { SelfHostedModule } from './self-hosted';
 import { SyncModule } from './sync';
 import { UsersModule } from './users';
 import { WorkspaceModule } from './workspaces';
@@ -22,13 +23,25 @@ switch (SERVER_FLAVOR) {
   case 'sync':
     BusinessModules.push(SyncModule, DocModule.forSync());
     break;
-  case 'graphql':
+  case 'selfhosted':
     BusinessModules.push(
+      ServerConfigModule,
+      SelfHostedModule,
+      ScheduleModule.forRoot(),
+      GqlModule,
+      WorkspaceModule,
+      UsersModule,
+      SyncModule,
+      DocModule.forRoot()
+    );
+    break;
+  case 'graphql':
+    BusinessModules.push(
+      ServerConfigModule,
       ScheduleModule.forRoot(),
       GqlModule,
       WorkspaceModule,
       UsersModule,
-      AuthModule,
       DocModule.forRoot(),
       PaymentModule
     );
@@ -36,11 +49,11 @@ switch (SERVER_FLAVOR) {
   case 'allinone':
   default:
     BusinessModules.push(
+      ServerConfigModule,
       ScheduleModule.forRoot(),
       GqlModule,
       WorkspaceModule,
       UsersModule,
-      AuthModule,
       SyncModule,
       DocModule.forRoot(),
       PaymentModule
@@ -48,4 +61,4 @@ switch (SERVER_FLAVOR) {
     break;
 }
 
-export { BusinessModules };
+export { BusinessModules, SERVER_FLAVOR };

packages/backend/server/src/modules/payment/resolver.ts

@@ -52,7 +52,7 @@ class SubscriptionPrice {
 }
 
 @ObjectType('UserSubscription')
-class UserSubscriptionType implements Partial<UserSubscription> {
+export class UserSubscriptionType implements Partial<UserSubscription> {
   @Field({ name: 'id' })
   stripeSubscriptionId!: string;
 

packages/backend/server/src/modules/payment/service.ts

@@ -30,6 +30,7 @@ export enum SubscriptionPlan {
   Pro = 'pro',
   Team = 'team',
   Enterprise = 'enterprise',
+  SelfHosted = 'selfhosted',
 }
 
 export function encodeLookupKey(

packages/backend/server/src/modules/self-hosted.ts

@@ -0,0 +1,38 @@
+import { Module } from '@nestjs/common';
+import { ResolveField, Resolver } from '@nestjs/graphql';
+
+import { UserSubscriptionType } from './payment/resolver';
+import {
+  SubscriptionPlan,
+  SubscriptionRecurring,
+  SubscriptionStatus,
+} from './payment/service';
+import { UserType } from './users';
+
+const YEAR = 1000 * 60 * 60 * 24 * 30 * 12;
+
+@Resolver(() => UserType)
+export class SelfHostedDummyResolver {
+  private readonly start = new Date();
+  private readonly end = new Date(Number(this.start) + YEAR);
+  constructor() {}
+
+  @ResolveField(() => UserSubscriptionType)
+  async subscription() {
+    return {
+      stripeSubscriptionId: 'dummy',
+      plan: SubscriptionPlan.SelfHosted,
+      recurring: SubscriptionRecurring.Yearly,
+      status: SubscriptionStatus.Active,
+      start: this.start,
+      end: this.end,
+      createdAt: this.start,
+      updatedAt: this.start,
+    };
+  }
+}
+
+@Module({
+  providers: [SelfHostedDummyResolver],
+})
+export class SelfHostedModule {}