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(server): add administrator feature (#6995)
forehaloaff166a0efe0
diff --git a/packages/backend/server/src/core/auth/guard.ts b/packages/backend/server/src/core/auth/guard.tsindex c519418b27..cded1c5208 100644--- a/packages/backend/server/src/core/auth/guard.ts+++ b/packages/backend/server/src/core/auth/guard.ts@@ -22,6 +22,8 @@ function extractTokenFromHeader(authorization: string) {return authorization.substring(7);}+const PUBLIC_ENTRYPOINT_SYMBOL = Symbol('public');+@Injectable()export class AuthGuard implements CanActivate, OnModuleInit {private auth!: AuthService;@@ -72,9 +74,9 @@ export class AuthGuard implements CanActivate, OnModuleInit {}// api is public- const isPublic = this.reflector.get<boolean>(- 'isPublic',- context.getHandler()+ const isPublic = this.reflector.getAllAndOverride<boolean>(+ PUBLIC_ENTRYPOINT_SYMBOL,+ [context.getClass(), context.getHandler()]);if (isPublic) {@@ -110,4 +112,4 @@ export const Auth = () => {};// api is public accessible-export const Public = () => SetMetadata('isPublic', true);+export const Public = () => SetMetadata(PUBLIC_ENTRYPOINT_SYMBOL, true);diff --git a/packages/backend/server/src/core/auth/service.ts b/packages/backend/server/src/core/auth/service.tsindex 21d79e5215..59c1f95d1e 100644--- a/packages/backend/server/src/core/auth/service.ts+++ b/packages/backend/server/src/core/auth/service.ts@@ -89,6 +89,7 @@ export class AuthService implements OnApplicationBootstrap {});}await this.quota.switchUserQuota(devUser.id, QuotaType.ProPlanV1);+ await this.feature.addAdmin(devUser.id);await this.feature.addCopilot(devUser.id);} catch (e) {// ignorediff --git a/packages/backend/server/src/core/common/admin-guard.ts b/packages/backend/server/src/core/common/admin-guard.tsnew file mode 100644index 0000000000..360675f708--- /dev/null+++ b/packages/backend/server/src/core/common/admin-guard.ts@@ -0,0 +1,52 @@+import type {+ CanActivate,+ ExecutionContext,+ OnModuleInit,+} from '@nestjs/common';+import { Injectable, UnauthorizedException, UseGuards } from '@nestjs/common';+import { ModuleRef } from '@nestjs/core';++import { getRequestResponseFromContext } from '../../fundamentals';+import { FeatureManagementService } from '../features';++@Injectable()+export class AdminGuard implements CanActivate, OnModuleInit {+ private feature!: FeatureManagementService;++ constructor(private readonly ref: ModuleRef) {}++ onModuleInit() {+ this.feature = this.ref.get(FeatureManagementService, { strict: false });+ }++ async canActivate(context: ExecutionContext) {+ const { req } = getRequestResponseFromContext(context);+ let allow = false;+ if (req.user) {+ allow = await this.feature.isAdmin(req.user.id);+ }++ if (!allow) {+ throw new UnauthorizedException('Your operation is not allowed.');+ }++ return true;+ }+}++/**+ * This guard is used to protect routes/queries/mutations that require a user to be administrator.+ *+ * @example+ *+ * ```typescript+ * \@Admin()+ * \@Mutation(() => UserType)+ * createAccount(userInput: UserInput) {+ * // ...+ * }+ * ```+ */+export const Admin = () => {+ return UseGuards(AdminGuard);+};diff --git a/packages/backend/server/src/core/common/index.ts b/packages/backend/server/src/core/common/index.tsnew file mode 100644index 0000000000..c895b34d4c--- /dev/null+++ b/packages/backend/server/src/core/common/index.ts@@ -0,0 +1 @@+export * from './admin-guard';diff --git a/packages/backend/server/src/core/features/feature.ts b/packages/backend/server/src/core/features/feature.tsindex 8700ab9296..083d016870 100644--- a/packages/backend/server/src/core/features/feature.ts+++ b/packages/backend/server/src/core/features/feature.ts@@ -1,12 +1,14 @@import { PrismaTransaction } from '../../fundamentals';import { Feature, FeatureSchema, FeatureType } from './types';-class FeatureConfig {- readonly config: Feature;+class FeatureConfig<T extends FeatureType> {+ readonly config: Feature & { feature: T };constructor(data: any) {const config = FeatureSchema.safeParse(data);+if (config.success) {+ // @ts-expect-error allowthis.config = config.data;} else {throw new Error(`Invalid quota config: ${config.error.message}`);@@ -19,83 +21,15 @@ class FeatureConfig {}}-export class CopilotFeatureConfig extends FeatureConfig {- override config!: Feature & { feature: FeatureType.Copilot };- constructor(data: any) {- super(data);-- if (this.config.feature !== FeatureType.Copilot) {- throw new Error('Invalid feature config: type is not Copilot');- }- }-}--export class EarlyAccessFeatureConfig extends FeatureConfig {- override config!: Feature & { feature: FeatureType.EarlyAccess };-- constructor(data: any) {- super(data);-- if (this.config.feature !== FeatureType.EarlyAccess) {- throw new Error('Invalid feature config: type is not EarlyAccess');- }- }-}--export class UnlimitedWorkspaceFeatureConfig extends FeatureConfig {- override config!: Feature & { feature: FeatureType.UnlimitedWorkspace };-- constructor(data: any) {- super(data);-- if (this.config.feature !== FeatureType.UnlimitedWorkspace) {- throw new Error('Invalid feature config: type is not UnlimitedWorkspace');- }- }-}--export class UnlimitedCopilotFeatureConfig extends FeatureConfig {- override config!: Feature & { feature: FeatureType.UnlimitedCopilot };-- constructor(data: any) {- super(data);-- if (this.config.feature !== FeatureType.UnlimitedCopilot) {- throw new Error('Invalid feature config: type is not AIEarlyAccess');- }- }-}-export class AIEarlyAccessFeatureConfig extends FeatureConfig {- override config!: Feature & { feature: FeatureType.AIEarlyAccess };-- constructor(data: any) {- super(data);-- if (this.config.feature !== FeatureType.AIEarlyAccess) {- throw new Error('Invalid feature config: type is not AIEarlyAccess');- }- }-}--const FeatureConfigMap = {- [FeatureType.Copilot]: CopilotFeatureConfig,- [FeatureType.EarlyAccess]: EarlyAccessFeatureConfig,- [FeatureType.AIEarlyAccess]: AIEarlyAccessFeatureConfig,- [FeatureType.UnlimitedWorkspace]: UnlimitedWorkspaceFeatureConfig,- [FeatureType.UnlimitedCopilot]: UnlimitedCopilotFeatureConfig,-};--export type FeatureConfigType<F extends FeatureType> = InstanceType<- (typeof FeatureConfigMap)[F]->;+export type FeatureConfigType<F extends FeatureType> = FeatureConfig<F>;const FeatureCache = new Map<number, FeatureConfigType<FeatureType>>();export async function getFeature(prisma: PrismaTransaction, featureId: number) {- const cachedQuota = FeatureCache.get(featureId);+ const cachedFeature = FeatureCache.get(featureId);- if (cachedQuota) {- return cachedQuota;+ if (cachedFeature) {+ return cachedFeature;}const feature = await prisma.features.findFirst({@@ -107,13 +41,8 @@ export async function getFeature(prisma: PrismaTransaction, featureId: number) {// this should unreachablethrow new Error(`Quota config ${featureId} not found`);}- const ConfigClass = FeatureConfigMap[feature.feature as FeatureType];-- if (!ConfigClass) {- throw new Error(`Feature config ${featureId} not found`);- }- const config = new ConfigClass(feature);+ const config = new FeatureConfig(feature);// we always edit quota config as a new quota config// so we can cache it by featureIdFeatureCache.set(featureId, config);diff --git a/packages/backend/server/src/core/features/index.ts b/packages/backend/server/src/core/features/index.tsindex b11ec76994..3aaac50da7 100644--- a/packages/backend/server/src/core/features/index.ts+++ b/packages/backend/server/src/core/features/index.ts@@ -1,6 +1,8 @@import { Module } from '@nestjs/common';+import { UserModule } from '../user';import { EarlyAccessType, FeatureManagementService } from './management';+import { FeatureManagementResolver } from './resolver';import { FeatureService } from './service';/**@@ -10,7 +12,12 @@ import { FeatureService } from './service';* - feature statistics*/@Module({- providers: [FeatureService, FeatureManagementService],+ imports: [UserModule],+ providers: [+ FeatureService,+ FeatureManagementService,+ FeatureManagementResolver,+ ],exports: [FeatureService, FeatureManagementService],})export class FeatureModule {}diff --git a/packages/backend/server/src/core/features/management.ts b/packages/backend/server/src/core/features/management.tsindex 3b34c279d3..c41476b734 100644--- a/packages/backend/server/src/core/features/management.ts+++ b/packages/backend/server/src/core/features/management.ts@@ -1,11 +1,11 @@import { Injectable, Logger } from '@nestjs/common';-import { PrismaClient } from '@prisma/client';import { Config } from '../../fundamentals';+import { UserService } from '../user/service';import { FeatureService } from './service';import { FeatureType } from './types';-const STAFF = ['@toeverything.info'];+const STAFF = ['@toeverything.info', '@affine.pro'];export enum EarlyAccessType {App = 'app',@@ -18,22 +18,30 @@ export class FeatureManagementService {constructor(private readonly feature: FeatureService,- private readonly prisma: PrismaClient,+ private readonly user: UserService,private readonly config: Config) {}// ======== Admin ========- // todo(@darkskygit): replace this with abacisStaff(email: string) {for (const domain of STAFF) {if (email.endsWith(domain)) {return true;}}+return false;}+ isAdmin(userId: string) {+ return this.feature.hasUserFeature(userId, FeatureType.Admin);+ }++ addAdmin(userId: string) {+ return this.feature.addUserFeature(userId, FeatureType.Admin, 'Admin user');+ }+// ======== Early Access ========async addEarlyAccess(userId: string,@@ -69,31 +77,17 @@ export class FeatureManagementService {}async isEarlyAccessUser(- email: string,+ userId: string,type: EarlyAccessType = EarlyAccessType.App) {- const user = await this.prisma.user.findFirst({- where: {- email: {- equals: email,- mode: 'insensitive',- },- },- });-- if (user) {- const canEarlyAccess = await this.feature- .hasUserFeature(- user.id,- type === EarlyAccessType.App- ? FeatureType.EarlyAccess- : FeatureType.AIEarlyAccess- )- .catch(() => false);-- return canEarlyAccess;- }- return false;+ return await this.feature+ .hasUserFeature(+ userId,+ type === EarlyAccessType.App+ ? FeatureType.EarlyAccess+ : FeatureType.AIEarlyAccess+ )+ .catch(() => false);}/// check early access by email@@ -102,7 +96,11 @@ export class FeatureManagementService {type: EarlyAccessType = EarlyAccessType.App) {if (this.config.featureFlags.earlyAccessPreview && !this.isStaff(email)) {- return this.isEarlyAccessUser(email, type);+ const user = await this.user.findUserByEmail(email);+ if (!user) {+ return false;+ }+ return this.isEarlyAccessUser(user.id, type);} else {return true;}diff --git a/packages/backend/server/src/core/user/management.ts b/packages/backend/server/src/core/features/resolver.tssimilarity index 57%rename from packages/backend/server/src/core/user/management.tsrename to packages/backend/server/src/core/features/resolver.tsindex 786acbfba2..2be5425811 100644--- a/packages/backend/server/src/core/user/management.ts+++ b/packages/backend/server/src/core/features/resolver.ts@@ -1,4 +1,4 @@-import { BadRequestException, ForbiddenException } from '@nestjs/common';+import { BadRequestException } from '@nestjs/common';import {Args,Context,@@ -6,35 +6,43 @@ import {Mutation,Query,registerEnumType,+ ResolveField,Resolver,} from '@nestjs/graphql';import { CurrentUser } from '../auth/current-user';import { sessionUser } from '../auth/service';-import { EarlyAccessType, FeatureManagementService } from '../features';-import { UserService } from './service';-import { UserType } from './types';+import { Admin } from '../common';+import { UserService } from '../user/service';+import { UserType } from '../user/types';+import { EarlyAccessType, FeatureManagementService } from './management';+import { FeatureType } from './types';registerEnumType(EarlyAccessType, {name: 'EarlyAccessType',});@Resolver(() => UserType)-export class UserManagementResolver {+export class FeatureManagementResolver {constructor(private readonly users: UserService,private readonly feature: FeatureManagementService) {}+ @ResolveField(() => [FeatureType], {+ name: 'features',+ description: 'Enabled features of a user',+ })+ async userFeatures(@CurrentUser() user: CurrentUser) {+ return this.feature.getActivatedUserFeatures(user.id);+ }++ @Admin()@Mutation(() => Int)async addToEarlyAccess(- @CurrentUser() currentUser: CurrentUser,@Args('email') email: string,@Args({ name: 'type', type: () => EarlyAccessType }) type: EarlyAccessType): Promise<number> {- if (!this.feature.isStaff(currentUser.email)) {- throw new ForbiddenException('You are not allowed to do this');- }const user = await this.users.findUserByEmail(email);if (user) {return this.feature.addEarlyAccess(user.id, type);@@ -46,14 +54,9 @@ export class UserManagementResolver {}}+ @Admin()@Mutation(() => Int)- async removeEarlyAccess(- @CurrentUser() currentUser: CurrentUser,- @Args('email') email: string- ): Promise<number> {- if (!this.feature.isStaff(currentUser.email)) {- throw new ForbiddenException('You are not allowed to do this');- }+ async removeEarlyAccess(@Args('email') email: string): Promise<number> {const user = await this.users.findUserByEmail(email);if (!user) {throw new BadRequestException(`User ${email} not found`);@@ -61,18 +64,29 @@ export class UserManagementResolver {return this.feature.removeEarlyAccess(user.id);}+ @Admin()@Query(() => [UserType])async earlyAccessUsers(- @Context() ctx: { isAdminQuery: boolean },- @CurrentUser() user: CurrentUser+ @Context() ctx: { isAdminQuery: boolean }): Promise<UserType[]> {- if (!this.feature.isStaff(user.email)) {- throw new ForbiddenException('You are not allowed to do this');- }// allow query other user's subscriptionctx.isAdminQuery = true;return this.feature.listEarlyAccess().then(users => {return users.map(sessionUser);});}++ @Admin()+ @Mutation(() => Boolean)+ async addAdminister(@Args('email') email: string): Promise<boolean> {+ const user = await this.users.findUserByEmail(email);++ if (!user) {+ throw new BadRequestException(`User ${email} not found`);+ }++ await this.feature.addAdmin(user.id);++ return true;+ }}diff --git a/packages/backend/server/src/core/features/service.ts b/packages/backend/server/src/core/features/service.tsindex 4c27a22d9c..21e9e04d38 100644--- a/packages/backend/server/src/core/features/service.ts+++ b/packages/backend/server/src/core/features/service.ts@@ -8,9 +8,8 @@ import { FeatureKind, FeatureType } from './types';@Injectable()export class FeatureService {constructor(private readonly prisma: PrismaClient) {}- async getFeature<F extends FeatureType>(- feature: F- ): Promise<FeatureConfigType<F> | undefined> {++ async getFeature<F extends FeatureType>(feature: F) {const data = await this.prisma.features.findFirst({where: {feature,@@ -21,8 +20,9 @@ export class FeatureService {version: 'desc',},});+if (data) {- return getFeature(this.prisma, data.id) as FeatureConfigType<F>;+ return getFeature(this.prisma, data.id) as Promise<FeatureConfigType<F>>;}return undefined;}diff --git a/packages/backend/server/src/core/features/types/admin.ts b/packages/backend/server/src/core/features/types/admin.tsnew file mode 100644index 0000000000..4896415184--- /dev/null+++ b/packages/backend/server/src/core/features/types/admin.ts@@ -0,0 +1,8 @@+import { z } from 'zod';++import { FeatureType } from './common';++export const featureAdministrator = z.object({+ feature: z.literal(FeatureType.Admin),+ configs: z.object({}),+});diff --git a/packages/backend/server/src/core/features/types/common.ts b/packages/backend/server/src/core/features/types/common.tsindex 52ae5d0ef5..4cdfa05394 100644--- a/packages/backend/server/src/core/features/types/common.ts+++ b/packages/backend/server/src/core/features/types/common.ts@@ -2,6 +2,7 @@ import { registerEnumType } from '@nestjs/graphql';export enum FeatureType {// user feature+ Admin = 'administrator',EarlyAccess = 'early_access',AIEarlyAccess = 'ai_early_access',UnlimitedCopilot = 'unlimited_copilot',diff --git a/packages/backend/server/src/core/features/types/index.ts b/packages/backend/server/src/core/features/types/index.tsindex c2572b2400..9b156f45e7 100644--- a/packages/backend/server/src/core/features/types/index.ts+++ b/packages/backend/server/src/core/features/types/index.ts@@ -1,5 +1,6 @@import { z } from 'zod';+import { featureAdministrator } from './admin';import { FeatureType } from './common';import { featureCopilot } from './copilot';import { featureAIEarlyAccess, featureEarlyAccess } from './early-access';@@ -65,6 +66,12 @@ export const Features: Feature[] = [version: 1,configs: {},},+ {+ feature: FeatureType.Admin,+ type: FeatureKind.Feature,+ version: 1,+ configs: {},+ },];/// ======== schema infer ========@@ -80,6 +87,7 @@ export const FeatureSchema = commonFeatureSchemafeatureAIEarlyAccess,featureUnlimitedWorkspace,featureUnlimitedCopilot,+ featureAdministrator,]));diff --git a/packages/backend/server/src/core/quota/resolver.ts b/packages/backend/server/src/core/quota/resolver.tsnew file mode 100644index 0000000000..9acdc2b823--- /dev/null+++ b/packages/backend/server/src/core/quota/resolver.ts@@ -0,0 +1,68 @@+import {+ Field,+ ObjectType,+ registerEnumType,+ ResolveField,+ Resolver,+} from '@nestjs/graphql';+import { SafeIntResolver } from 'graphql-scalars';++import { CurrentUser } from '../auth/current-user';+import { EarlyAccessType } from '../features';+import { UserType } from '../user';+import { QuotaService } from './service';++registerEnumType(EarlyAccessType, {+ name: 'EarlyAccessType',+});++@ObjectType('UserQuotaHumanReadable')+class UserQuotaHumanReadableType {+ @Field({ name: 'name' })+ name!: string;++ @Field({ name: 'blobLimit' })+ blobLimit!: string;++ @Field({ name: 'storageQuota' })+ storageQuota!: string;++ @Field({ name: 'historyPeriod' })+ historyPeriod!: string;++ @Field({ name: 'memberLimit' })+ memberLimit!: string;+}++@ObjectType('UserQuota')+class UserQuotaType {+ @Field({ name: 'name' })+ name!: string;++ @Field(() => SafeIntResolver, { name: 'blobLimit' })+ blobLimit!: number;++ @Field(() => SafeIntResolver, { name: 'storageQuota' })+ storageQuota!: number;++ @Field(() => SafeIntResolver, { name: 'historyPeriod' })+ historyPeriod!: number;++ @Field({ name: 'memberLimit' })+ memberLimit!: number;++ @Field({ name: 'humanReadable' })+ humanReadable!: UserQuotaHumanReadableType;+}++@Resolver(() => UserType)+export class FeatureManagementResolver {+ constructor(private readonly quota: QuotaService) {}++ @ResolveField(() => UserQuotaType, { name: 'quota', nullable: true })+ async getQuota(@CurrentUser() me: UserType) {+ const quota = await this.quota.getUserQuota(me.id);++ return quota.feature;+ }+}diff --git a/packages/backend/server/src/core/quota/service.ts b/packages/backend/server/src/core/quota/service.tsindex 7ad6464dd4..5b6e6094cd 100644--- a/packages/backend/server/src/core/quota/service.ts+++ b/packages/backend/server/src/core/quota/service.ts@@ -4,7 +4,8 @@ import { PrismaClient } from '@prisma/client';import type { EventPayload } from '../../fundamentals';import { OnEvent, PrismaTransaction } from '../../fundamentals';import { SubscriptionPlan } from '../../plugins/payment/types';-import { FeatureKind, FeatureManagementService } from '../features';+import { FeatureManagementService } from '../features/management';+import { FeatureKind } from '../features/types';import { QuotaConfig } from './quota';import { QuotaType } from './types';diff --git a/packages/backend/server/src/core/user/index.ts b/packages/backend/server/src/core/user/index.tsindex def37f3ba1..da48739598 100644--- a/packages/backend/server/src/core/user/index.ts+++ b/packages/backend/server/src/core/user/index.ts@@ -1,16 +1,13 @@import { Module } from '@nestjs/common';-import { FeatureModule } from '../features';-import { QuotaModule } from '../quota';import { StorageModule } from '../storage';import { UserAvatarController } from './controller';-import { UserManagementResolver } from './management';import { UserResolver } from './resolver';import { UserService } from './service';@Module({- imports: [StorageModule, FeatureModule, QuotaModule],- providers: [UserResolver, UserManagementResolver, UserService],+ imports: [StorageModule],+ providers: [UserResolver, UserService],controllers: [UserAvatarController],exports: [UserService],})diff --git a/packages/backend/server/src/core/user/resolver.ts b/packages/backend/server/src/core/user/resolver.tsindex ff0b9ae553..96591a82fd 100644--- a/packages/backend/server/src/core/user/resolver.ts+++ b/packages/backend/server/src/core/user/resolver.ts@@ -7,30 +7,23 @@ import {ResolveField,Resolver,} from '@nestjs/graphql';-import type { User } from '@prisma/client';import { PrismaClient } from '@prisma/client';import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';import { isNil, omitBy } from 'lodash-es';import type { FileUpload } from '../../fundamentals';-import {- EventEmitter,- PaymentRequiredException,- Throttle,-} from '../../fundamentals';+import { EventEmitter, Throttle } from '../../fundamentals';import { CurrentUser } from '../auth/current-user';import { Public } from '../auth/guard';import { sessionUser } from '../auth/service';-import { FeatureManagementService, FeatureType } from '../features';-import { QuotaService } from '../quota';import { AvatarStorage } from '../storage';+import { validators } from '../utils/validators';import { UserService } from './service';import {DeleteAccount,RemoveAvatar,UpdateUserInput,UserOrLimitedUser,- UserQuotaType,UserType,} from './types';@@ -40,8 +33,6 @@ export class UserResolver {private readonly prisma: PrismaClient,private readonly storage: AvatarStorage,private readonly users: UserService,- private readonly feature: FeatureManagementService,- private readonly quota: QuotaService,private readonly event: EventEmitter) {}@@ -53,14 +44,10 @@ export class UserResolver {})@Public()async user(- @CurrentUser() currentUser?: CurrentUser,- @Args('email') email?: string+ @Args('email') email: string,+ @CurrentUser() currentUser?: CurrentUser): Promise<typeof UserOrLimitedUser | null> {- if (!email || !(await this.feature.canEarlyAccess(email))) {- throw new PaymentRequiredException(- `You don't have early access permission\nVisit https://community.affine.pro/c/insider-general/ for more information`- );- }+ validators.assertValidEmail(email);// TODO: need to limit a user can only get another user witch is in the same workspaceconst user = await this.users.findUserWithHashedPasswordByEmail(email);@@ -79,13 +66,6 @@ export class UserResolver {};}- @ResolveField(() => UserQuotaType, { name: 'quota', nullable: true })- async getQuota(@CurrentUser() me: User) {- const quota = await this.quota.getUserQuota(me.id);-- return quota.feature;- }-@ResolveField(() => Int, {name: 'invoiceCount',description: 'Get user invoice count',@@ -96,14 +76,6 @@ export class UserResolver {});}- @ResolveField(() => [FeatureType], {- name: 'features',- description: 'Enabled features of a user',- })- async userFeatures(@CurrentUser() user: CurrentUser) {- return this.feature.getActivatedUserFeatures(user.id);- }-@Mutation(() => UserType, {name: 'uploadAvatar',description: 'Upload user avatar',diff --git a/packages/backend/server/src/core/user/types.ts b/packages/backend/server/src/core/user/types.tsindex 2f297627ea..ab6ac51e85 100644--- a/packages/backend/server/src/core/user/types.ts+++ b/packages/backend/server/src/core/user/types.ts@@ -6,49 +6,9 @@ import {ObjectType,} from '@nestjs/graphql';import type { User } from '@prisma/client';-import { SafeIntResolver } from 'graphql-scalars';import { CurrentUser } from '../auth/current-user';-@ObjectType('UserQuotaHumanReadable')-export class UserQuotaHumanReadableType {- @Field({ name: 'name' })- name!: string;-- @Field({ name: 'blobLimit' })- blobLimit!: string;-- @Field({ name: 'storageQuota' })- storageQuota!: string;-- @Field({ name: 'historyPeriod' })- historyPeriod!: string;-- @Field({ name: 'memberLimit' })- memberLimit!: string;-}--@ObjectType('UserQuota')-export class UserQuotaType {- @Field({ name: 'name' })- name!: string;-- @Field(() => SafeIntResolver, { name: 'blobLimit' })- blobLimit!: number;-- @Field(() => SafeIntResolver, { name: 'storageQuota' })- storageQuota!: number;-- @Field(() => SafeIntResolver, { name: 'historyPeriod' })- historyPeriod!: number;-- @Field({ name: 'memberLimit' })- memberLimit!: number;-- @Field({ name: 'humanReadable' })- humanReadable!: UserQuotaHumanReadableType;-}-@ObjectType()export class UserType implements CurrentUser {@Field(() => ID)diff --git a/packages/backend/server/src/core/workspaces/management.ts b/packages/backend/server/src/core/workspaces/management.tsindex 942dc62df8..f171ddea94 100644--- a/packages/backend/server/src/core/workspaces/management.ts+++ b/packages/backend/server/src/core/workspaces/management.ts@@ -10,6 +10,7 @@ import {} from '@nestjs/graphql';import { CurrentUser } from '../auth';+import { Admin } from '../common';import { FeatureManagementService, FeatureType } from '../features';import { PermissionService } from './permission';import { WorkspaceType } from './types';@@ -21,41 +22,29 @@ export class WorkspaceManagementResolver {private readonly permission: PermissionService) {}+ @Admin()@Mutation(() => Int)async addWorkspaceFeature(- @CurrentUser() currentUser: CurrentUser,@Args('workspaceId') workspaceId: string,@Args('feature', { type: () => FeatureType }) feature: FeatureType): Promise<number> {- if (!this.feature.isStaff(currentUser.email)) {- throw new ForbiddenException('You are not allowed to do this');- }-return this.feature.addWorkspaceFeatures(workspaceId, feature);}+ @Admin()@Mutation(() => Int)async removeWorkspaceFeature(- @CurrentUser() currentUser: CurrentUser,@Args('workspaceId') workspaceId: string,@Args('feature', { type: () => FeatureType }) feature: FeatureType): Promise<boolean> {- if (!this.feature.isStaff(currentUser.email)) {- throw new ForbiddenException('You are not allowed to do this');- }-return this.feature.removeWorkspaceFeature(workspaceId, feature);}+ @Admin()@Query(() => [WorkspaceType])async listWorkspaceFeatures(- @CurrentUser() user: CurrentUser,@Args('feature', { type: () => FeatureType }) feature: FeatureType): Promise<WorkspaceType[]> {- if (!this.feature.isStaff(user.email)) {- throw new ForbiddenException('You are not allowed to do this');- }-return this.feature.listFeatureWorkspaces(feature);}diff --git a/packages/backend/server/src/data/migrations/99999999-self-host-admin.ts b/packages/backend/server/src/data/migrations/1-self-host-admin.tssimilarity index 66%rename from packages/backend/server/src/data/migrations/99999999-self-host-admin.tsrename to packages/backend/server/src/data/migrations/1-self-host-admin.tsindex 11c791f2fd..69097c36c3 100644--- a/packages/backend/server/src/data/migrations/99999999-self-host-admin.ts+++ b/packages/backend/server/src/data/migrations/1-self-host-admin.ts@@ -1,16 +1,18 @@import { ModuleRef } from '@nestjs/core';import { PrismaClient } from '@prisma/client';+import { FeatureManagementService } from '../../core/features';import { UserService } from '../../core/user';import { Config, CryptoHelper } from '../../fundamentals';-export class SelfHostAdmin99999999 {+export class SelfHostAdmin1 {// do the migration- static async up(_db: PrismaClient, ref: ModuleRef) {+ static async up(db: PrismaClient, ref: ModuleRef) {const config = ref.get(Config, { strict: false });- const crypto = ref.get(CryptoHelper, { strict: false });- const user = ref.get(UserService, { strict: false });if (config.isSelfhosted) {+ const crypto = ref.get(CryptoHelper, { strict: false });+ const user = ref.get(UserService, { strict: false });+ const feature = ref.get(FeatureManagementService, { strict: false });if (!process.env.AFFINE_ADMIN_EMAIL ||!process.env.AFFINE_ADMIN_PASSWORD@@ -19,6 +21,7 @@ export class SelfHostAdmin99999999 {'You have to set AFFINE_ADMIN_EMAIL and AFFINE_ADMIN_PASSWORD environment variables to generate the initial user for self-hosted AFFiNE Server.');}+await user.findOrCreateUser(process.env.AFFINE_ADMIN_EMAIL, {name: 'AFFINE First User',emailVerifiedAt: new Date(),@@ -26,6 +29,15 @@ export class SelfHostAdmin99999999 {process.env.AFFINE_ADMIN_PASSWORD),});++ const firstUser = await db.user.findFirst({+ orderBy: {+ createdAt: 'asc',+ },+ });+ if (firstUser) {+ await feature.addAdmin(firstUser.id);+ }}}diff --git a/packages/backend/server/src/data/migrations/1716195522794-administrator-feature.ts b/packages/backend/server/src/data/migrations/1716195522794-administrator-feature.tsnew file mode 100644index 0000000000..904363a397--- /dev/null+++ b/packages/backend/server/src/data/migrations/1716195522794-administrator-feature.ts@@ -0,0 +1,14 @@+import { PrismaClient } from '@prisma/client';++import { FeatureType } from '../../core/features';+import { upsertLatestFeatureVersion } from './utils/user-features';++export class AdministratorFeature1716195522794 {+ // do the migration+ static async up(db: PrismaClient) {+ await upsertLatestFeatureVersion(db, FeatureType.Admin);+ }++ // revert the migration+ static async down(_db: PrismaClient) {}+}diff --git a/packages/backend/server/src/plugins/payment/service.ts b/packages/backend/server/src/plugins/payment/service.tsindex f0a3ac59f0..d68092390f 100644--- a/packages/backend/server/src/plugins/payment/service.ts+++ b/packages/backend/server/src/plugins/payment/service.ts@@ -14,7 +14,7 @@ import Stripe from 'stripe';import { CurrentUser } from '../../core/auth';import { EarlyAccessType, FeatureManagementService } from '../../core/features';-import { EventEmitter } from '../../fundamentals';+import { Config, EventEmitter } from '../../fundamentals';import { ScheduleManager } from './schedule';import {InvoiceStatus,@@ -66,6 +66,7 @@ export class SubscriptionService {private readonly logger = new Logger(SubscriptionService.name);constructor(+ private readonly config: Config,private readonly stripe: Stripe,private readonly db: PrismaClient,private readonly scheduleManager: ScheduleManager,@@ -78,10 +79,10 @@ export class SubscriptionService {let canHaveAIEarlyAccessDiscount = false;if (user) {canHaveEarlyAccessDiscount = await this.features.isEarlyAccessUser(- user.email+ user.id);canHaveAIEarlyAccessDiscount = await this.features.isEarlyAccessUser(- user.email,+ user.id,EarlyAccessType.AI);@@ -154,6 +155,14 @@ export class SubscriptionService {redirectUrl: string;idempotencyKey: string;}) {+ if (+ this.config.deploy &&+ this.config.affine.canary &&+ !this.features.isStaff(user.email)+ ) {+ throw new BadRequestException('You are not allowed to do this.');+ }+const currentSubscription = await this.db.userSubscription.findFirst({where: {userId: user.id,@@ -631,7 +640,7 @@ export class SubscriptionService {private async getOrCreateCustomer(idempotencyKey: string,user: CurrentUser- ): Promise<UserStripeCustomer & { email: string }> {+ ): Promise<UserStripeCustomer> {let customer = await this.db.userStripeCustomer.findUnique({where: {userId: user.id,@@ -662,10 +671,7 @@ export class SubscriptionService {});}- return {- ...customer,- email: user.email,- };+ return customer;}private async retrieveUserFromCustomer(customerId: string) {@@ -737,11 +743,11 @@ export class SubscriptionService {* Get available for different plans with special early-access price and coupon*/private async getAvailablePrice(- customer: UserStripeCustomer & { email: string },+ customer: UserStripeCustomer,plan: SubscriptionPlan,recurring: SubscriptionRecurring): Promise<{ price: string; coupon?: string }> {- const isEaUser = await this.features.isEarlyAccessUser(customer.email);+ const isEaUser = await this.features.isEarlyAccessUser(customer.userId);const oldSubscriptions = await this.stripe.subscriptions.list({customer: customer.stripeCustomerId,status: 'all',@@ -771,7 +777,7 @@ export class SubscriptionService {};} else {const isAIEaUser = await this.features.isEarlyAccessUser(- customer.email,+ customer.userId,EarlyAccessType.AI);diff --git a/packages/backend/server/src/schema.gql b/packages/backend/server/src/schema.gqlindex cc1fc9a1a1..ed5dc4f94c 100644--- a/packages/backend/server/src/schema.gql+++ b/packages/backend/server/src/schema.gql@@ -96,6 +96,7 @@ enum EarlyAccessType {"""The type of workspace feature"""enum FeatureType {AIEarlyAccess+ AdminCopilotEarlyAccessUnlimitedCopilot@@ -184,6 +185,7 @@ type LimitedUserType {type Mutation {acceptInviteById(inviteId: String!, sendAcceptMail: Boolean, workspaceId: String!): Boolean!+ addAdminister(email: String!): Boolean!addToEarlyAccess(email: String!, type: EarlyAccessType!): Int!addWorkspaceFeature(feature: FeatureType!, workspaceId: String!): Int!cancelSubscription(idempotencyKey: String!, plan: SubscriptionPlan = Pro): UserSubscription!@@ -428,23 +430,6 @@ type UserInvoice {union UserOrLimitedUser = LimitedUserType | UserType-type UserQuota {- blobLimit: SafeInt!- historyPeriod: SafeInt!- humanReadable: UserQuotaHumanReadable!- memberLimit: Int!- name: String!- storageQuota: SafeInt!-}--type UserQuotaHumanReadable {- blobLimit: String!- historyPeriod: String!- memberLimit: String!- name: String!- storageQuota: String!-}-type UserSubscription {canceledAt: DateTimecreatedAt: DateTime!@@ -492,7 +477,6 @@ type UserType {"""User name"""name: String!- quota: UserQuotasubscription(plan: SubscriptionPlan = Pro): UserSubscription @deprecated(reason: "use `UserType.subscriptions`")subscriptions: [UserSubscription!]!token: tokenType! @deprecated(reason: "use [/api/auth/authorize]")diff --git a/packages/backend/server/tests/payment/service.spec.ts b/packages/backend/server/tests/payment/service.spec.tsindex e1f96fcff9..bca454ceb8 100644--- a/packages/backend/server/tests/payment/service.spec.ts+++ b/packages/backend/server/tests/payment/service.spec.ts@@ -178,10 +178,8 @@ test('should list normal price for unauthenticated user', async t => {test('should list normal prices for authenticated user', async t => {const { feature, service, u1, stripe } = t.context;- feature.isEarlyAccessUser.withArgs(u1.email).resolves(false);- feature.isEarlyAccessUser- .withArgs(u1.email, EarlyAccessType.AI)- .resolves(false);+ feature.isEarlyAccessUser.withArgs(u1.id).resolves(false);+ feature.isEarlyAccessUser.withArgs(u1.id, EarlyAccessType.AI).resolves(false);// @ts-expect-error stubSinon.stub(stripe.subscriptions, 'list').resolves({ data: [] });@@ -200,10 +198,8 @@ test('should list normal prices for authenticated user', async t => {test('should list early access prices for pro ea user', async t => {const { feature, service, u1, stripe } = t.context;- feature.isEarlyAccessUser.withArgs(u1.email).resolves(true);- feature.isEarlyAccessUser- .withArgs(u1.email, EarlyAccessType.AI)- .resolves(false);+ feature.isEarlyAccessUser.withArgs(u1.id).resolves(true);+ feature.isEarlyAccessUser.withArgs(u1.id, EarlyAccessType.AI).resolves(false);// @ts-expect-error stubSinon.stub(stripe.subscriptions, 'list').resolves({ data: [] });@@ -222,10 +218,8 @@ test('should list early access prices for pro ea user', async t => {test('should list normal prices for pro ea user with old subscriptions', async t => {const { feature, service, u1, stripe } = t.context;- feature.isEarlyAccessUser.withArgs(u1.email).resolves(true);- feature.isEarlyAccessUser- .withArgs(u1.email, EarlyAccessType.AI)- .resolves(false);+ feature.isEarlyAccessUser.withArgs(u1.id).resolves(true);+ feature.isEarlyAccessUser.withArgs(u1.id, EarlyAccessType.AI).resolves(false);Sinon.stub(stripe.subscriptions, 'list').resolves({data: [@@ -260,10 +254,8 @@ test('should list normal prices for pro ea user with old subscriptions', async ttest('should list early access prices for ai ea user', async t => {const { feature, service, u1, stripe } = t.context;- feature.isEarlyAccessUser.withArgs(u1.email).resolves(false);- feature.isEarlyAccessUser- .withArgs(u1.email, EarlyAccessType.AI)- .resolves(true);+ feature.isEarlyAccessUser.withArgs(u1.id).resolves(false);+ feature.isEarlyAccessUser.withArgs(u1.id, EarlyAccessType.AI).resolves(true);// @ts-expect-error stubSinon.stub(stripe.subscriptions, 'list').resolves({ data: [] });@@ -282,10 +274,8 @@ test('should list early access prices for ai ea user', async t => {test('should list early access prices for pro and ai ea user', async t => {const { feature, service, u1, stripe } = t.context;- feature.isEarlyAccessUser.withArgs(u1.email).resolves(true);- feature.isEarlyAccessUser- .withArgs(u1.email, EarlyAccessType.AI)- .resolves(true);+ feature.isEarlyAccessUser.withArgs(u1.id).resolves(true);+ feature.isEarlyAccessUser.withArgs(u1.id, EarlyAccessType.AI).resolves(true);// @ts-expect-error stubSinon.stub(stripe.subscriptions, 'list').resolves({ data: [] });@@ -304,10 +294,8 @@ test('should list early access prices for pro and ai ea user', async t => {test('should list normal prices for ai ea user with old subscriptions', async t => {const { feature, service, u1, stripe } = t.context;- feature.isEarlyAccessUser.withArgs(u1.email).resolves(false);- feature.isEarlyAccessUser- .withArgs(u1.email, EarlyAccessType.AI)- .resolves(true);+ feature.isEarlyAccessUser.withArgs(u1.id).resolves(false);+ feature.isEarlyAccessUser.withArgs(u1.id, EarlyAccessType.AI).resolves(true);Sinon.stub(stripe.subscriptions, 'list').resolves({data: [@@ -555,9 +543,9 @@ test('should get correct ai plan price for checking out', async t => {// pro ea user{- feature.isEarlyAccessUser.withArgs(u1.email).resolves(true);+ feature.isEarlyAccessUser.withArgs(u1.id).resolves(true);feature.isEarlyAccessUser- .withArgs(u1.email, EarlyAccessType.AI)+ .withArgs(u1.id, EarlyAccessType.AI).resolves(false);// @ts-expect-error stubsubListStub.resolves({ data: [] });@@ -574,9 +562,9 @@ test('should get correct ai plan price for checking out', async t => {// pro ea user, but has old subscription{- feature.isEarlyAccessUser.withArgs(u1.email).resolves(true);+ feature.isEarlyAccessUser.withArgs(u1.id).resolves(true);feature.isEarlyAccessUser- .withArgs(u1.email, EarlyAccessType.AI)+ .withArgs(u1.id, EarlyAccessType.AI).resolves(false);subListStub.resolves({data: [