♻️ Use tokensService instead of jwtService

staart · Nov 14, 2020 · 163f170 · 163f170
1 parent 913806b
commit 163f170
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/src/modules/auth/auth.interface.ts b/src/modules/auth/auth.interface.ts
@@ -3,7 +3,6 @@ import { MfaMethod } from '@prisma/client';
 import { Request as ExpressRequest } from 'express';
 
 export interface AccessTokenClaims {
-  sub: string;
   id: number;
   scopes: string[];
 }

diff --git a/src/modules/auth/auth.module.ts b/src/modules/auth/auth.module.ts
@@ -1,6 +1,5 @@
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { JwtModule } from '@nestjs/jwt';
 import { PassportModule } from '@nestjs/passport';
 import { ApiKeysModule } from '../api-keys/api-keys.module';
 import { ApprovedSubnetsModule } from '../approved-subnets/approved-subnets.module';
@@ -27,9 +26,6 @@ import { StaartStrategy } from './staart.strategy';
     TwilioModule,
     GeolocationModule,
     ApprovedSubnetsModule,
-    JwtModule.register({
-      secret: process.env.JWT_SECRET ?? 'staart',
-    }),
   ],
   controllers: [AuthController],
   exports: [AuthService],

diff --git a/src/modules/auth/auth.service.ts b/src/modules/auth/auth.service.ts
@@ -7,7 +7,6 @@ import {
   UnprocessableEntityException,
 } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { JwtService } from '@nestjs/jwt';
 import { Authenticator } from '@otplib/core';
 import { emails, MfaMethod, users } from '@prisma/client';
 import { compare, hash } from 'bcrypt';
@@ -35,9 +34,8 @@ import {
   USER_NOT_FOUND,
 } from '../../errors/errors.constants';
 import { safeEmail } from '../../helpers/safe-email';
-import { ApprovedSubnetsService } from '../approved-subnets/approved-subnets.service';
-import { MailService } from '../../providers/mail/mail.service';
 import { GeolocationService } from '../../providers/geolocation/geolocation.service';
+import { MailService } from '../../providers/mail/mail.service';
 import { Expose } from '../../providers/prisma/prisma.interface';
 import { PrismaService } from '../../providers/prisma/prisma.service';
 import { PwnedService } from '../../providers/pwned/pwned.service';
@@ -51,6 +49,7 @@ import {
 } from '../../providers/tokens/tokens.constants';
 import { TokensService } from '../../providers/tokens/tokens.service';
 import { TwilioService } from '../../providers/twilio/twilio.service';
+import { ApprovedSubnetsService } from '../approved-subnets/approved-subnets.service';
 import { RegisterDto } from './auth.dto';
 import {
   AccessTokenClaims,
@@ -67,7 +66,6 @@ export class AuthService {
     private prisma: PrismaService,
     private email: MailService,
     private configService: ConfigService,
-    private jwtService: JwtService,
     private pwnedService: PwnedService,
     private tokensService: TokensService,
     private geolocationService: GeolocationService,
@@ -464,13 +462,14 @@ export class AuthService {
   private async getAccessToken(user: users): Promise<string> {
     const scopes = await this.getScopes(user);
     const payload: AccessTokenClaims = {
-      sub: LOGIN_ACCESS_TOKEN,
       id: user.id,
       scopes,
     };
-    return this.jwtService.sign(payload, {
-      expiresIn: this.configService.get<string>('security.accessTokenExpiry'),
-    });
+    return this.tokensService.signJwt(
+      LOGIN_ACCESS_TOKEN,
+      payload,
+      this.configService.get<string>('security.accessTokenExpiry'),
+    );
   }
 
   private async loginResponse(

diff --git a/src/modules/emails/emails.module.ts b/src/modules/emails/emails.module.ts
@@ -1,6 +1,5 @@
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { JwtModule } from '@nestjs/jwt';
 import { ApprovedSubnetsService } from '../approved-subnets/approved-subnets.service';
 import { AuthService } from '../auth/auth.service';
 import { MailModule } from '../../providers/mail/mail.module';
@@ -21,9 +20,6 @@ import { EmailsService } from './emails.service';
     TwilioModule,
     PwnedModule,
     TokensModule,
-    JwtModule.register({
-      secret: process.env.JWT_SECRET ?? 'staart',
-    }),
   ],
   controllers: [EmailController],
   providers: [