✨ Add approve subnet endpoint

src/modules/auth/auth.controller.ts

@@ -11,6 +11,7 @@ import {
   TotpLoginDto,
   VerifyEmailDto,
 } from './auth.dto';
+import { TokenResponse } from './auth.interface';
 import { AuthService } from './auth.service';
 import { Public } from './public.decorator';
 
@@ -29,7 +30,7 @@ export class AuthController {
     @Body() data: LoginDto,
     @Ip() ip: string,
     @Headers('User-Agent') userAgent: string,
-  ): Promise<{ accessToken: string }> {
+  ): Promise<TokenResponse> {
     return this.authService.login(
       ip,
       userAgent,
@@ -62,7 +63,7 @@ export class AuthController {
     @Ip() ip: string,
     @Headers('User-Agent') userAgent: string,
     @Body('token') refreshToken: string,
-  ): Promise<{ accessToken: string }> {
+  ): Promise<TokenResponse> {
     return this.authService.refresh(ip, userAgent, refreshToken);
   }
 
@@ -76,6 +77,20 @@ export class AuthController {
     return this.authService.logout(refreshToken);
   }
 
+  @Post('approve-subnet')
+  @RateLimit({
+    points: 5,
+    duration: 60,
+    errorMessage: 'Wait for 60 seconds before trying to logout again',
+  })
+  async approveSubnet(
+    @Ip() ip: string,
+    @Headers('User-Agent') userAgent: string,
+    @Body('token') token: string,
+  ): Promise<TokenResponse> {
+    return this.authService.approveSubnet(ip, userAgent, token);
+  }
+
   @Post('resend-email-verification')
   @RateLimit({
     points: 1,
@@ -131,7 +146,7 @@ export class AuthController {
     @Body() data: TotpLoginDto,
     @Ip() ip: string,
     @Headers('User-Agent') userAgent: string,
-  ): Promise<{ accessToken: string }> {
+  ): Promise<TokenResponse> {
     return this.authService.loginWithTotp(ip, userAgent, data.token, data.code);
   }
 }

src/modules/auth/auth.interface.ts

@@ -6,6 +6,11 @@ export interface AccessTokenClaims {
   scopes: string[];
 }
 
+export interface TokenResponse {
+  accessToken: string;
+  refreshToken: string;
+}
+
 export interface AccessTokenParsed {
   id: number;
   scopes: string[];

src/modules/auth/auth.service.ts

@@ -13,25 +13,25 @@ import { JwtService } from '@nestjs/jwt';
 import { Authenticator } from '@otplib/core';
 import { emails, users } from '@prisma/client';
 import { compare, hash } from 'bcrypt';
+import anonymize from 'ip-anonymize';
 import { authenticator } from 'otplib';
 import qrcode from 'qrcode';
 import { safeEmail } from 'src/helpers/safe-email';
+import { ApprovedSubnetsService } from '../approved-subnets/approved-subnets.service';
 import { EmailService } from '../email/email.service';
+import { GeolocationService } from '../geolocation/geolocation.service';
 import { Expose } from '../prisma/prisma.interface';
 import { PrismaService } from '../prisma/prisma.service';
 import { PwnedService } from '../pwned/pwned.service';
 import {
+  APPROVE_SUBNET_TOKEN,
   EMAIL_VERIFY_TOKEN,
   PASSWORD_RESET_TOKEN,
   TWO_FACTOR_TOKEN,
-  APPROVE_SUBNET_TOKEN,
 } from '../tokens/tokens.constants';
 import { TokensService } from '../tokens/tokens.service';
 import { RegisterDto } from './auth.dto';
-import { AccessTokenClaims } from './auth.interface';
-import anonymize from 'ip-anonymize';
-import { GeolocationService } from '../geolocation/geolocation.service';
-import { ApprovedSubnetsService } from '../approved-subnets/approved-subnets.service';
+import { AccessTokenClaims, TokenResponse } from './auth.interface';
 
 @Injectable()
 export class AuthService {
@@ -184,7 +184,11 @@ export class AuthService {
     return { queued: true };
   }
 
-  async refresh(ipAddress: string, userAgent: string, token: string) {
+  async refresh(
+    ipAddress: string,
+    userAgent: string,
+    token: string,
+  ): Promise<TokenResponse> {
     if (!token) throw new UnprocessableEntityException();
     const session = await this.prisma.sessions.findFirst({
       where: { token },
@@ -215,6 +219,13 @@ export class AuthService {
     });
   }
 
+  async approveSubnet(ipAddress: string, userAgent: string, token: string) {
+    if (!token) throw new UnprocessableEntityException();
+    const id = this.tokensService.verify<number>(APPROVE_SUBNET_TOKEN, token);
+    await this.approvedSubnetsService.approveNewSubnet(id, ipAddress);
+    return this.loginResponse(ipAddress, userAgent, id);
+  }
+
   /** Get the two-factor authentication QR code */
   async getTotpQrCode(userId: number) {
     const secret = randomStringGenerator();
@@ -359,7 +370,7 @@ export class AuthService {
     ipAddress: string,
     userAgent: string,
     id: number,
-  ) {
+  ): Promise<TokenResponse> {
     const token = randomStringGenerator();
     await this.prisma.sessions.create({
       data: { token, ipAddress, userAgent, user: { connect: { id } } },