Merge pull request #16 from import-ai/feature/collect

Feature/collect

Author: hewenguang

.env.example

@@ -1,13 +1,16 @@
-PORT=9005
+PORT=3000
+
 DB_HOST=host.docker.internal
 DB_PORT=5432
 DB_DATABASE=omnibox
 DB_USERNAME=omnibox
 DB_PASSWORD=omnibox
 DB_LOGGING=true
 DB_SYNC=true
+
 JWT_SECRET=your-secret-key
 JWT_EXPIRE=72000s
+
 # REDIS_URL=redis://redis:6379
 # REDIS_PORT=6379
 # REDIS_TTL=3600

compose.yaml

@@ -2,7 +2,7 @@ services:
   app:
     build: .
     ports:
-      - '8000:9005'
+      - "8000:${PORT}"
     env_file:
       - .env
     depends_on:

pnpm-lock.yaml

@@ -15,20 +15,20 @@ export class AuthController {
   }
 
   @Public()
-  @Post('register')
-  async register(@Body('url') url: string, @Body('email') email: string) {
-    return await this.authService.register(url, email);
+  @Post('sign-up')
+  async signUp(@Body('url') url: string, @Body('email') email: string) {
+    return await this.authService.signUp(url, email);
   }
 
   @Public()
-  @Post('register-confirm')
-  async registerComFirm(
+  @Post('sign-up/confirm')
+  async signUpConfirm(
     @Body('token') token: string,
     @Body('username') username: string,
     @Body('password') password: string,
     @Body('password_repeat') password_repeat: string,
   ) {
-    return await this.authService.registerConfirm(token, {
+    return await this.authService.signUpConfirm(token, {
       username,
       password,
       password_repeat,
@@ -45,7 +45,7 @@ export class AuthController {
   }
 
   @Public()
-  @Post('password-confirm')
+  @Post('password/confirm')
   async resetPassword(
     @Body('token') token: string,
     @Body('password') password: string,
@@ -71,8 +71,8 @@ export class AuthController {
     });
   }
 
-  @Post('invite-confirm')
-  async inviteComFirm(@Body('token') token: string) {
+  @Post('invite/confirm')
+  async inviteConfirm(@Body('token') token: string) {
     return await this.authService.inviteConfirm(token);
   }
 }

src/auth/auth.controller.ts

@@ -10,11 +10,12 @@ import { JwtAuthGuard } from 'src/auth/jwt-auth.guard';
 import { LocalStrategy } from 'src/auth/local.strategy';
 import { AuthController } from 'src/auth/auth.controller';
 import { ConfigService, ConfigModule } from '@nestjs/config';
+import { InternalAuthController } from 'src/auth/internal.auth.controller';
 import { NamespacesModule } from 'src/namespaces/namespaces.module';
 
 @Module({
   exports: [AuthService],
-  controllers: [AuthController],
+  controllers: [AuthController, InternalAuthController],
   providers: [
     AuthService,
     JwtStrategy,

src/auth/auth.module.ts

@@ -2,6 +2,7 @@ import { JwtService } from '@nestjs/jwt';
 import { MailService } from 'src/mail/mail.service';
 import { UserService } from 'src/user/user.service';
 import { NamespacesService } from 'src/namespaces/namespaces.service';
+import { CreateUserDto } from 'src/user/dto/create-user.dto';
 import {
   Injectable,
   ForbiddenException,
@@ -48,7 +49,23 @@ export class AuthService {
     };
   }
 
-  async register(url: string, email: string) {
+  async signUpWithoutConfirm(createUser: CreateUserDto) {
+    const account = await this.userService.findByEmail(createUser.email);
+    if (account) {
+      throw new BadRequestException('Email already registered');
+    }
+    const user = await this.userService.create(createUser);
+    return {
+      id: user.id,
+      username: user.username,
+      access_token: this.jwtService.sign({
+        sub: user.id,
+        email: user.email,
+      }),
+    };
+  }
+
+  async signUp(url: string, email: string) {
     const account = await this.userService.findByEmail(email);
     if (account) {
       throw new BadRequestException(
@@ -61,10 +78,10 @@ export class AuthService {
         expiresIn: '1h',
       },
     );
-    await this.mailService.sendRegisterEmail(email, `${url}?token=${token}`);
+    await this.mailService.sendSignUpEmail(email, `${url}?token=${token}`);
   }
 
-  async registerConfirm(
+  async signUpConfirm(
     token: string,
     data: {
       username: string;

src/auth/auth.service.ts

@@ -0,0 +1,15 @@
+import { AuthService } from 'src/auth/auth.service';
+import { Public } from 'src/auth/decorators/public.decorator';
+import { Controller, Body, Post } from '@nestjs/common';
+import { CreateUserDto } from 'src/user/dto/create-user.dto';
+
+@Controller('internal/api/v1')
+export class InternalAuthController {
+  constructor(private authService: AuthService) {}
+
+  @Public()
+  @Post('sign-up')
+  async signUp(@Body() createUserDto: CreateUserDto) {
+    return await this.authService.signUpWithoutConfirm(createUserDto);
+  }
+}

src/auth/internal.auth.controller.ts

@@ -5,12 +5,12 @@ import { MailerService } from '@nestjs-modules/mailer';
 export class MailService {
   constructor(private readonly mailerService: MailerService) {}
 
-  async sendRegisterEmail(email: string, resetUrl: string): Promise<void> {
+  async sendSignUpEmail(email: string, resetUrl: string): Promise<void> {
     try {
       await this.mailerService.sendMail({
         to: email,
         subject: 'Continue completing account registration',
-        template: './register',
+        template: './sign-up',
         context: {
           resetUrl,
         },

src/mail/mail.service.ts

@@ -14,4 +14,7 @@ export class Namespace extends Base {
 
   @Column('uuid', { array: true, default: [] })
   owner_id: string[];
+
+  @Column({ type: 'int', default: 1 })
+  max_running_tasks: number;
 }