♻️ Use safe email helper

src/helpers/safe-email.ts

@@ -0,0 +1 @@
+export const safeEmail = (email: string) => email;

src/modules/auth/auth.module.ts

@@ -4,7 +4,7 @@ import { JwtModule } from '@nestjs/jwt';
 import { PassportModule } from '@nestjs/passport';
 import { EmailModule } from '../email/email.module';
 import { PrismaModule } from '../prisma/prisma.module';
-import { UsersService } from '../user/user.service';
+import { PwnedModule } from '../pwned/pwned.module';
 import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
 import { JwtStrategy } from './jwt.strategy';
@@ -15,11 +15,13 @@ import { JwtStrategy } from './jwt.strategy';
     PrismaModule,
     EmailModule,
     ConfigModule,
+    PwnedModule,
     JwtModule.register({
       secret: process.env.JWT_SECRET ?? 'staart',
     }),
   ],
   controllers: [AuthController],
-  providers: [AuthService, UsersService, JwtStrategy],
+  exports: [AuthService],
+  providers: [AuthService, JwtStrategy],
 })
 export class AuthModule {}

src/modules/auth/auth.service.ts

@@ -17,20 +17,20 @@ import { JwtService } from '@nestjs/jwt';
 import { randomStringGenerator } from '@nestjs/common/utils/random-string-generator.util';
 import { AccessTokenClaims } from './auth.interface';
 import { PwnedService } from '../pwned/pwned.service';
+import { safeEmail } from 'src/helpers/safe-email';
 
 @Injectable()
 export class AuthService {
   constructor(
     private prisma: PrismaService,
-    private users: UsersService,
     private email: EmailService,
     private configService: ConfigService,
     private jwtService: JwtService,
     private pwnedService: PwnedService,
   ) {}
 
   async validateUser(email: string, password?: string): Promise<number> {
-    const emailSafe = this.users.getSafeEmail(email);
+    const emailSafe = safeEmail(email);
     const user = await this.prisma.users.findFirst({
       where: { emails: { some: { emailSafe } } },
       select: { id: true, password: true, emails: true },
@@ -67,7 +67,7 @@ export class AuthService {
 
   async register(data: RegisterDto): Promise<Expose<users>> {
     const email = data.email;
-    const emailSafe = this.users.getSafeEmail(email);
+    const emailSafe = safeEmail(email);
     const ignorePwnedPassword = !!data.ignorePwnedPassword;
     delete data.email;
     delete data.ignorePwnedPassword;
@@ -98,7 +98,7 @@ export class AuthService {
   }
 
   async sendEmailVerification(email: string, resend = false) {
-    const emailSafe = this.users.getSafeEmail(email);
+    const emailSafe = safeEmail(email);
     const emailDetails = await this.prisma.emails.findFirst({
       where: { emailSafe },
       include: { user: true },

src/modules/emails/emails.module.ts

@@ -4,6 +4,7 @@ import { JwtModule } from '@nestjs/jwt';
 import { AuthService } from '../auth/auth.service';
 import { EmailModule } from '../email/email.module';
 import { PrismaModule } from '../prisma/prisma.module';
+import { PwnedModule } from '../pwned/pwned.module';
 import { UsersService } from '../user/user.service';
 import { EmailController } from './emails.controller';
 import { EmailsService } from './emails.service';
@@ -13,6 +14,7 @@ import { EmailsService } from './emails.service';
     PrismaModule,
     EmailModule,
     ConfigModule,
+    PwnedModule,
     JwtModule.register({
       secret: process.env.JWT_SECRET ?? 'staart',
     }),

src/modules/emails/emails.service.ts

@@ -11,6 +11,7 @@ import {
   emailsWhereInput,
   emailsWhereUniqueInput,
 } from '@prisma/client';
+import { safeEmail } from 'src/helpers/safe-email';
 import { Expose } from 'src/modules/prisma/prisma.interface';
 import { AuthService } from '../auth/auth.service';
 import { PrismaService } from '../prisma/prisma.service';
@@ -28,7 +29,7 @@ export class EmailsService {
     userId: number,
     data: Omit<Omit<emailsCreateInput, 'emailSafe'>, 'user'>,
   ): Promise<emails> {
-    const emailSafe = this.users.getSafeEmail(data.email);
+    const emailSafe = safeEmail(data.email);
     const result = await this.prisma.emails.create({
       data: { ...data, emailSafe, user: { connect: { id: userId } } },
     });

src/modules/memberships/memberships.service.ts

@@ -12,6 +12,7 @@ import {
   membershipsWhereInput,
   membershipsWhereUniqueInput,
 } from '@prisma/client';
+import { safeEmail } from 'src/helpers/safe-email';
 import { Expose } from 'src/modules/prisma/prisma.interface';
 import { AuthService } from '../auth/auth.service';
 import { PrismaService } from '../prisma/prisma.service';
@@ -135,7 +136,7 @@ export class MembershipsService {
   }
 
   async createGroupMembership(groupId: number, data: CreateMembershipInput) {
-    const emailSafe = this.users.getSafeEmail(data.email);
+    const emailSafe = safeEmail(data.email);
     let user = this.prisma.expose(
       await this.prisma.users.findFirst({
         where: { emails: { some: { emailSafe } } },

src/modules/user/user.module.ts

@@ -1,11 +1,13 @@
 import { Module } from '@nestjs/common';
+import { AuthModule } from '../auth/auth.module';
 import { PrismaModule } from '../prisma/prisma.module';
 import { UserController } from './user.controller';
 import { UsersService } from './user.service';
 
 @Module({
-  imports: [PrismaModule],
+  imports: [PrismaModule, AuthModule],
   controllers: [UserController],
   providers: [UsersService],
+  exports: [UsersService],
 })
 export class UsersModule {}

src/modules/user/user.service.ts

@@ -93,10 +93,4 @@ export class UsersService {
     });
     return this.prisma.expose<users>(user);
   }
-
-  getSafeEmail(email: string) {
-    email = email.toLowerCase();
-    email = `${email.split('@')[0].split('+')}@${email.split('@')[1]}`;
-    return email;
-  }
 }