feat: new auth

docker-compose.yml

@@ -30,6 +30,7 @@ services:
     command: yarn start:prod
     ports:
       - 8000:8000
+      - 8001:8001
     env_file:
       - .env
     depends_on:

package.json

@@ -34,6 +34,7 @@
     "bcrypt": "^5.1.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
+    "crypto": "^1.0.1",
     "handlebars": "^4.7.8",
     "jose": "^5.9.6",
     "lodash": "^4.17.21",

src/auth/auth.controller.ts

@@ -10,9 +10,7 @@ import {
   UseGuards,
 } from "@nestjs/common";
 import { Request, Response } from "express";
-import { SignUpDto } from "./dto/sign-up.dto";
 import { AuthService } from "./auth.service";
-import { SignInDto } from "./dto/sign-in.dto";
 import { VerifyEmailDto } from "./dto/verify-email.dto";
 import { ResendOtpEmailDto } from "./dto/resend-otp-email.dto";
 import { AuthGuard } from "./auth.guard";
@@ -26,38 +24,14 @@ import { RefreshTokenDto } from "./dto/refresh-token.dto";
 export class AuthController {
   constructor(private authService: AuthService) {}
 
-  @Post("/sign-up")
-  async signUp(
-    @Body() signUpData: SignUpDto,
-    @Res({ passthrough: true }) response: Response,
-  ): Promise<{ message: string; accessToken: string; user: UserDto }> {
-    const userAccess = await this.authService.signUpEmail(signUpData);
-    response
-      .status(HttpStatus.CREATED)
-      .cookie("refreshToken", userAccess.refreshToken, {
-        httpOnly: true,
-      });
-    return {
-      message: "Signup Successful",
-      ...userAccess,
-    };
-  }
-
-  @Post("/sign-in")
+  @Post("/sign-in-passwordless")
   async signIn(
-    @Body() signInData: SignInDto,
+    @Body() signInData: ResendOtpEmailDto,
     @Res({ passthrough: true }) response: Response,
-  ): Promise<{ message: string; accessToken: string; user: UserDto }> {
-    const userAccess = await this.authService.signInEmail(signInData);
-    response
-      .status(HttpStatus.OK)
-      .cookie("refreshToken", userAccess.refreshToken, {
-        httpOnly: true,
-      });
-    return {
-      message: "Signin Successful",
-      ...userAccess,
-    };
+  ): Promise<{ message: string; data: { isNew: boolean } }> {
+    const userAccess = await this.authService.signInPasswordless(signInData);
+    response.status(HttpStatus.OK);
+    return userAccess;
   }
 
   @Post("/refresh-tokens")
@@ -81,6 +55,9 @@ export class AuthController {
       .status(HttpStatus.OK)
       .cookie("refreshToken", userAccess.refreshToken, {
         httpOnly: true,
+        expires: new Date(userAccess.refreshTokenExpiry),
+        sameSite: "none",
+        secure: true,
       });
     return {
       message: "Token refresh successful",
@@ -93,9 +70,18 @@ export class AuthController {
     @Body() data: VerifyEmailDto,
     @Res({ passthrough: true }) response: Response,
   ): Promise<{ message: string }> {
-    const resp = await this.authService.verifyEmail(data);
-    response.status(HttpStatus.OK);
-    return resp;
+    const userAccess = await this.authService.verifyEmail(data);
+    const { refreshToken, refreshTokenExpiry, ...rest } = userAccess;
+    response.status(HttpStatus.OK).cookie("refreshToken", refreshToken, {
+      httpOnly: true,
+      expires: new Date(refreshTokenExpiry),
+      sameSite: "none",
+      secure: true,
+    });
+    return {
+      message: "Signin Successful",
+      ...rest,
+    };
   }
 
   @UseGuards(AuthGuard)
@@ -116,17 +102,16 @@ export class AuthController {
   ): Promise<{ message: string }> {
     const userData = await this.authService.verifyGoogleAuthToken(data.token);
     const userAccess = await this.authService.signGoogle(userData);
-    response
-      .status(HttpStatus.OK)
-      .cookie("refreshToken", userAccess.refreshToken, {
-        httpOnly: true,
-        expires: new Date(userAccess.refreshTokenExpiry),
-        sameSite: "none",
-        secure: false,
-      });
+    const { refreshToken, refreshTokenExpiry, ...rest } = userAccess;
+    response.status(HttpStatus.OK).cookie("refreshToken", refreshToken, {
+      httpOnly: true,
+      expires: new Date(refreshTokenExpiry),
+      sameSite: "none",
+      secure: true,
+    });
     return {
       message: "Google Auth Successful",
-      ...userAccess,
+      ...rest,
     };
   }
 

src/auth/auth.service.ts

@@ -116,9 +116,7 @@ export class AuthService {
     };
   }
 
-  async refreshTokens(
-    refreshToken: string,
-  ): Promise<{ accessToken: string; refreshToken: string; user: UserDto }> {
+  async refreshTokens(refreshToken: string) {
     const storedToken = await this.refreshTokenModel.findOne({
       token: refreshToken,
     });
@@ -139,7 +137,7 @@ export class AuthService {
   async signGoogle(userData: GoogleUser) {
     let user = await this.userService.findOne({
       authId: userData.id,
-      authType: AuthType.GOOGLE,
+      email: userData.email,
     });
 
     if (!user) {
@@ -153,6 +151,10 @@ export class AuthService {
       });
     }
 
+    if (user.authType !== AuthType.GOOGLE) {
+      throw new UnauthorizedException("Sign in with email");
+    }
+
     return await this.generateTokensForUser(user);
   }
 
@@ -194,6 +196,37 @@ export class AuthService {
     return await this.generateTokensForUser(user);
   }
 
+  async signInPasswordless(data: ResendOtpEmailDto) {
+    let isNew = false;
+    let user = await this.userService.findOneByEmail(data.email);
+    if (!user) {
+      user = await this.userService.create({
+        email: data.email,
+        authType: AuthType.EMAIL,
+        password: data.email,
+      });
+    }
+    if (!user.name) {
+      isNew = true;
+    }
+    if (user.authType !== AuthType.EMAIL) {
+      throw new UnauthorizedException("Sign in with google");
+    }
+    const otp = await this.otpService.generateOtpForUser(user);
+    this.mailService.send(
+      [{ name: user.name, email: user.email }],
+      "Verify your Email",
+      "verify-email.template.html",
+      { code: otp },
+    );
+    return {
+      message: "Email Sent",
+      data: {
+        isNew,
+      },
+    };
+  }
+
   // TODO: Protect with Auth
   async resendEmailVerificationOtp(data: ResendOtpEmailDto): Promise<{
     message: string;
@@ -217,19 +250,22 @@ export class AuthService {
     };
   }
 
-  async verifyEmail(verifyEmailData: VerifyEmailDto): Promise<{
-    message: string;
-  }> {
+  async verifyEmail(verifyEmailData: VerifyEmailDto) {
     const validOtp = await this.otpService.verifyOTP(
       verifyEmailData.email,
       verifyEmailData.code,
     );
     if (!validOtp) {
       throw new UnauthorizedException();
     }
-    await this.userService.verifyEmail(verifyEmailData.email);
-    return {
-      message: "Email Verified",
-    };
+    await this.userService.verifyEmail(
+      verifyEmailData.email,
+      verifyEmailData.name,
+    );
+    const user = await this.userService.findOneByEmail(verifyEmailData.email);
+    if (!user) {
+      throw new NotFoundException();
+    }
+    return await this.generateTokensForUser(user);
   }
 }

src/auth/dto/sign-up.dto.ts

@@ -1,10 +1,4 @@
-import {
-  IsEmail,
-  IsNotEmpty,
-  IsString,
-  MinLength,
-  IsPhoneNumber,
-} from "class-validator";
+import { IsEmail, IsNotEmpty, IsString, MinLength } from "class-validator";
 import { ApiProperty } from "@nestjs/swagger";
 
 export class SignUpDto {
@@ -18,11 +12,6 @@ export class SignUpDto {
   @IsEmail()
   email: string;
 
-  @ApiProperty()
-  @IsNotEmpty()
-  @IsPhoneNumber()
-  phoneNumber: string;
-
   @ApiProperty()
   @IsNotEmpty()
   @MinLength(8)

src/auth/dto/verify-email.dto.ts

@@ -1,4 +1,4 @@
-import { IsEmail, IsNotEmpty, IsNumber } from "class-validator";
+import { IsEmail, IsNotEmpty, IsNumber, IsString } from "class-validator";
 import { ApiProperty } from "@nestjs/swagger";
 
 export class VerifyEmailDto {
@@ -7,6 +7,11 @@ export class VerifyEmailDto {
   @IsEmail()
   email: string;
 
+  @ApiProperty()
+  @IsNotEmpty()
+  @IsString()
+  name?: string;
+
   @ApiProperty()
   @IsNotEmpty()
   @IsNumber()

src/mail/clients/brevo.client.ts

@@ -9,7 +9,7 @@ export const sendEmailBrevo = async (
 ) => {
   const url = "https://api.sendinblue.com/v3/smtp/email";
   const body = {
-    sender: { email: "fastpoint@psami.com", name: "Fast Point" },
+    sender: { email: "copyyt@psami.com", name: "Copyyt" },
     to: addresses,
     subject,
     htmlContent: htmlString,

src/mail/clients/zeptomail.client.ts

@@ -9,7 +9,7 @@ export const sendEmailZepto = async (
 ) => {
   const url = "https://api.zeptomail.com/v1.1/email";
   const body = JSON.stringify({
-    from: { address: "fastpoint@psami.com", name: "Fast Point" },
+    from: { address: "copyyt@psami.com", name: "Copyyt" },
     to: addresses.map((address) => ({
       email_address: { address: address.email, name: address.name },
     })),

src/mail/mail.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@nestjs/common";
-import path from "path";
-import fs from "fs";
+import * as path from "path";
+import * as fs from "fs";
 import handlebars from "handlebars";
 import { MailAddress } from "./interfaces/mail-address.interface";
 import { sendEmailZepto } from "./clients/zeptomail.client";

src/main.ts

@@ -7,7 +7,10 @@ async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   app.useGlobalPipes(new ValidationPipe());
   app.enableCors({
-    origin: ["chrome-extension://ophadgignfjigkbdcmicnklokjeknnbd"],
+    origin: [
+      "chrome-extension://ophadgignfjigkbdcmicnklokjeknnbd",
+      "http://localhost:5173",
+    ],
     credentials: true,
     methods: "GET,HEAD,PUT,PATCH,POST,DELETE",
   });

src/otp/otp.service.ts

@@ -3,7 +3,7 @@ import { Injectable } from "@nestjs/common";
 import { InjectModel } from "@nestjs/mongoose";
 import { OTP } from "./otp.schema";
 import { UserDocument } from "src/user/user.schema";
-import crypto from "crypto";
+import * as crypto from "crypto";
 
 const otpExpiryMinutes = 10;
 
@@ -27,8 +27,6 @@ export class OtpService {
   async verifyOTP(email: string, code: number): Promise<boolean> {
     const record = await this.otpModel.findOne({ email, code });
 
-    console.log(record);
-
     if (!record) {
       return false;
     }

src/socket/socket.gateway.ts

@@ -33,11 +33,30 @@ export class SocketGateway implements OnGatewayConnection, OnGatewayDisconnect {
     private userService: UserService,
   ) {}
 
+  isSocketActive(socketId: string): boolean {
+    if (!this.server) {
+      throw new Error("Socket.IO server instance is not initialized.");
+    }
+    const socket = this.server.sockets.sockets.get(socketId);
+    return socket ? socket.connected : false;
+  }
+
   private async initializeUserConnection(
     user: UserDocument,
     socket: Socket,
   ): Promise<void> {
     socket.data.user = user;
+
+    // delete disconnected connections
+    const connections = await this.userService.getConnections(user._id);
+    if (connections) {
+      const activeConnections = connections.filter((connection) =>
+        this.isSocketActive(connection),
+      );
+      if (activeConnections.length !== connections.length) {
+        await this.userService.setConnections(user._id, activeConnections);
+      }
+    }
     await this.userService.addConnection(user._id, socket.id);
     this.logger.log(
       `Client connected: ${socket.id} - User ID: ${user._id.toString()}`,
@@ -81,6 +100,9 @@ export class SocketGateway implements OnGatewayConnection, OnGatewayDisconnect {
       const connections = await this.userService.getConnections(
         currentUser._id,
       );
+      if (message) {
+        this.userService.setLastMessage(currentUser._id, String(message));
+      }
       uniq([...(connections ?? []), socket.id]).forEach((connection) => {
         this.server.to(connection).emit("message", message);
       });

src/user/dto/create-user.dto.ts

@@ -10,7 +10,7 @@ import { AuthType } from "../enum/auth-type.enum";
 export class CreateUserDto {
   @IsNotEmpty()
   @IsString()
-  name: string;
+  name?: string;
 
   @IsNotEmpty()
   @IsEmail()

src/user/user.controller.ts

@@ -1,4 +1,17 @@
-import { Controller } from '@nestjs/common';
+import { Controller, Get, Req, UseGuards } from "@nestjs/common";
+import { AuthGuard } from "src/auth/auth.guard";
+import { ApiBearerAuth } from "@nestjs/swagger";
+import { AuthenticatedRequest } from "src/auth/interfaces/request.interface";
 
-@Controller('user')
-export class UserController {}
+@Controller("api/v1/user")
+export class UserController {
+  @ApiBearerAuth()
+  @UseGuards(AuthGuard)
+  @Get("/last-message")
+  getProfile(@Req() req: AuthenticatedRequest) {
+    return {
+      messsage: "Last message",
+      data: req.user?.lastMessage ?? "",
+    };
+  }
+}