mirror of
https://github.com/docmost/docmost.git
synced 2025-11-18 22:01:11 +10:00
feat: cloud and ee (#805)
* stripe init git submodules for enterprise modules * * Cloud billing UI - WIP * Proxy websockets in dev mode * Separate workspace login and creation for cloud * Other fixes * feat: billing (cloud) * * add domain service * prepare links from workspace hostname * WIP * Add exchange token generation * Validate JWT token type during verification * domain service * add SkipTransform decorator * * updates (server) * add new packages * new sso migration file * WIP * Fix hostname generation * WIP * WIP * Reduce input error font-size * set max password length * jwt package * license page - WIP * * License management UI * Move license key store to db * add reflector * SSO enforcement * * Add default plan * Add usePlan hook * * Fix auth container margin in mobile * Redirect login and home to select page in cloud * update .gitignore * Default to yearly * * Trial messaging * Handle ended trials * Don't set to readonly on collab disconnect (Cloud) * Refine trial (UI) * Fix bug caused by using jotai optics atom in AppHeader component * configurable database maximum pool * Close SSO form on save * wip * sync * Only show sign-in in cloud * exclude base api part from workspaceId check * close db connection beforeApplicationShutdown * Add health/live endpoint * clear cookie on hostname change * reset currentUser atom * Change text * return 401 if workspace does not match * feat: show user workspace list in cloud login page * sync * Add home path * Prefetch to speed up queries * * Add robots.txt * Disallow login and forgot password routes * wildcard user-agent * Fix space query cache * fix * fix * use space uuid for recent pages * prefetch billing plans * enhance license page * sync
This commit is contained in:
21
apps/server/src/integrations/environment/domain.service.ts
Normal file
21
apps/server/src/integrations/environment/domain.service.ts
Normal file
@ -0,0 +1,21 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { EnvironmentService } from './environment.service';
|
||||
|
||||
@Injectable()
|
||||
export class DomainService {
|
||||
constructor(private environmentService: EnvironmentService) {}
|
||||
|
||||
getUrl(hostname?: string): string {
|
||||
if (!this.environmentService.isCloud()) {
|
||||
return this.environmentService.getAppUrl();
|
||||
}
|
||||
|
||||
const domain = this.environmentService.getSubdomainHost();
|
||||
if (!hostname || !domain) {
|
||||
return this.environmentService.getAppUrl();
|
||||
}
|
||||
|
||||
const protocol = this.environmentService.isHttps() ? 'https' : 'http';
|
||||
return `${protocol}://${hostname}.${domain}`;
|
||||
}
|
||||
}
|
||||
@ -3,6 +3,7 @@ import { EnvironmentService } from './environment.service';
|
||||
import { ConfigModule } from '@nestjs/config';
|
||||
import { validate } from './environment.validation';
|
||||
import { envPath } from '../../common/helpers';
|
||||
import { DomainService } from './domain.service';
|
||||
|
||||
@Global()
|
||||
@Module({
|
||||
@ -14,7 +15,7 @@ import { envPath } from '../../common/helpers';
|
||||
validate,
|
||||
}),
|
||||
],
|
||||
providers: [EnvironmentService],
|
||||
exports: [EnvironmentService],
|
||||
providers: [EnvironmentService, DomainService],
|
||||
exports: [EnvironmentService, DomainService],
|
||||
})
|
||||
export class EnvironmentModule {}
|
||||
|
||||
@ -10,10 +10,12 @@ export class EnvironmentService {
|
||||
}
|
||||
|
||||
getAppUrl(): string {
|
||||
return (
|
||||
const rawUrl =
|
||||
this.configService.get<string>('APP_URL') ||
|
||||
'http://localhost:' + this.getPort()
|
||||
);
|
||||
`http://localhost:${this.getPort()}`;
|
||||
|
||||
const { origin } = new URL(rawUrl);
|
||||
return origin;
|
||||
}
|
||||
|
||||
isHttps(): boolean {
|
||||
@ -26,6 +28,10 @@ export class EnvironmentService {
|
||||
}
|
||||
}
|
||||
|
||||
getSubdomainHost(): string {
|
||||
return this.configService.get<string>('SUBDOMAIN_HOST');
|
||||
}
|
||||
|
||||
getPort(): number {
|
||||
return parseInt(this.configService.get<string>('PORT', '3000'));
|
||||
}
|
||||
@ -38,6 +44,13 @@ export class EnvironmentService {
|
||||
return this.configService.get<string>('DATABASE_URL');
|
||||
}
|
||||
|
||||
getDatabaseMaxPool(): number {
|
||||
return parseInt(
|
||||
this.configService.get<string>('DATABASE_MAX_POOL', '10'),
|
||||
10,
|
||||
);
|
||||
}
|
||||
|
||||
getRedisUrl(): string {
|
||||
return this.configService.get<string>(
|
||||
'REDIS_URL',
|
||||
@ -146,6 +159,22 @@ export class EnvironmentService {
|
||||
return !this.isCloud();
|
||||
}
|
||||
|
||||
getStripePublishableKey(): string {
|
||||
return this.configService.get<string>('STRIPE_PUBLISHABLE_KEY');
|
||||
}
|
||||
|
||||
getStripeSecretKey(): string {
|
||||
return this.configService.get<string>('STRIPE_SECRET_KEY');
|
||||
}
|
||||
|
||||
getStripeWebhookSecret(): string {
|
||||
return this.configService.get<string>('STRIPE_WEBHOOK_SECRET');
|
||||
}
|
||||
|
||||
getEnterpriseKey(): string {
|
||||
return this.configService.get<string>('ENTERPRISE_KEY');
|
||||
}
|
||||
|
||||
getCollabUrl(): string {
|
||||
return this.configService.get<string>('COLLAB_URL');
|
||||
}
|
||||
|
||||
@ -54,6 +54,20 @@ export class EnvironmentVariables {
|
||||
@ValidateIf((obj) => obj.COLLAB_URL != '' && obj.COLLAB_URL != null)
|
||||
@IsUrl({ protocols: ['http', 'https'], require_tld: false })
|
||||
COLLAB_URL: string;
|
||||
|
||||
@IsOptional()
|
||||
CLOUD: boolean;
|
||||
|
||||
@IsOptional()
|
||||
@IsUrl(
|
||||
{ protocols: [], require_tld: true },
|
||||
{
|
||||
message:
|
||||
'SUBDOMAIN_HOST must be a valid FQDN domain without the http protocol. e.g example.com',
|
||||
},
|
||||
)
|
||||
@ValidateIf((obj) => obj.CLOUD === 'true'.toLowerCase())
|
||||
SUBDOMAIN_HOST: string;
|
||||
}
|
||||
|
||||
export function validate(config: Record<string, any>) {
|
||||
|
||||
@ -2,6 +2,7 @@ import { Controller, Get } from '@nestjs/common';
|
||||
import { HealthCheck, HealthCheckService } from '@nestjs/terminus';
|
||||
import { PostgresHealthIndicator } from './postgres.health';
|
||||
import { RedisHealthIndicator } from './redis.health';
|
||||
import { SkipTransform } from '../../common/decorators/skip-transform.decorator';
|
||||
|
||||
@Controller('health')
|
||||
export class HealthController {
|
||||
@ -11,6 +12,7 @@ export class HealthController {
|
||||
private redis: RedisHealthIndicator,
|
||||
) {}
|
||||
|
||||
@SkipTransform()
|
||||
@Get()
|
||||
@HealthCheck()
|
||||
async check() {
|
||||
@ -19,4 +21,9 @@ export class HealthController {
|
||||
() => this.redis.pingCheck('redis'),
|
||||
]);
|
||||
}
|
||||
|
||||
@Get('live')
|
||||
async checkLive() {
|
||||
return 'ok';
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
import { Controller, Get, HttpCode, HttpStatus } from '@nestjs/common';
|
||||
import { SkipTransform } from '../../common/decorators/skip-transform.decorator';
|
||||
|
||||
@Controller('robots.txt')
|
||||
export class RobotsTxtController {
|
||||
@SkipTransform()
|
||||
@HttpCode(HttpStatus.OK)
|
||||
@Get()
|
||||
async robotsTxt() {
|
||||
return 'User-Agent: *\nDisallow: /login\nDisallow: /forgot-password';
|
||||
}
|
||||
}
|
||||
7
apps/server/src/integrations/security/security.module.ts
Normal file
7
apps/server/src/integrations/security/security.module.ts
Normal file
@ -0,0 +1,7 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { RobotsTxtController } from './robots.txt.controller';
|
||||
|
||||
@Module({
|
||||
controllers: [RobotsTxtController],
|
||||
})
|
||||
export class SecurityModule {}
|
||||
@ -38,6 +38,9 @@ export class StaticModule implements OnModuleInit {
|
||||
FILE_UPLOAD_SIZE_LIMIT:
|
||||
this.environmentService.getFileUploadSizeLimit(),
|
||||
DRAWIO_URL: this.environmentService.getDrawioUrl(),
|
||||
SUBDOMAIN_HOST: this.environmentService.isCloud()
|
||||
? this.environmentService.getSubdomainHost()
|
||||
: undefined,
|
||||
COLLAB_URL: this.environmentService.getCollabUrl(),
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user