From b749b34233a6affd13e7f9871356ba705520b44f Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk436@gmail.com>
Date: Mon, 15 Jul 2024 16:59:34 +0200
Subject: [PATCH] feat: update password change functionality and schema

---
 .../src/auth/__tests__/auth.service.spec.ts   | 42 +------------------
 .../users/schemas/change-password.schema.ts   |  3 +-
 .../apps/api/src/users/users.service.ts       | 21 +++++++++-
 3 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/examples/common_nestjs_remix/apps/api/src/auth/__tests__/auth.service.spec.ts b/examples/common_nestjs_remix/apps/api/src/auth/__tests__/auth.service.spec.ts
index 4af5c21..e087727 100644
--- a/examples/common_nestjs_remix/apps/api/src/auth/__tests__/auth.service.spec.ts
+++ b/examples/common_nestjs_remix/apps/api/src/auth/__tests__/auth.service.spec.ts
@@ -1,13 +1,7 @@
 import { ConflictException, UnauthorizedException } from "@nestjs/common";
 import * as bcrypt from "bcrypt";
 import { eq } from "drizzle-orm";
-import {
-  authService,
-  db,
-  jwtService,
-  userFactory,
-  usersService,
-} from "test/jest-setup";
+import { authService, db, jwtService, userFactory } from "test/jest-setup";
 import { credentials, users } from "../../storage/schema";
 
 describe("AuthService", () => {
@@ -112,40 +106,6 @@ describe("AuthService", () => {
     });
   });
 
-  describe.skip("refreshTokens", () => {
-    it("should refresh tokens successfully", async () => {
-      const userId = crypto.randomUUID();
-
-      (jwtService.verifyAsync as jest.Mock).mockResolvedValueOnce({ userId });
-      usersService.getUserById(userId);
-      (jwtService.signAsync as jest.Mock).mockResolvedValueOnce(
-        "new_access_token",
-      );
-      (jwtService.signAsync as jest.Mock).mockResolvedValueOnce(
-        "new_refresh_token",
-      );
-
-      const result = await authService.refreshTokens("refresh_token");
-
-      expect(result).toEqual({
-        accessToken: "new_access_token",
-        refreshToken: "new_refresh_token",
-      });
-    });
-
-    it("should throw UnauthorizedException for invalid refresh token", async () => {
-      (jwtService.verifyAsync as jest.Mock).mockRejectedValueOnce(new Error());
-
-      await expect(authService.refreshTokens("invalid_token")).rejects.toThrow(
-        UnauthorizedException,
-      );
-
-      await expect(authService.refreshTokens("invalid_token")).rejects.toThrow(
-        "Invalid refresh token",
-      );
-    });
-  });
-
   describe("validateUser", () => {
     it("should validate user successfully", async () => {
       const email = "test@example.com";
diff --git a/examples/common_nestjs_remix/apps/api/src/users/schemas/change-password.schema.ts b/examples/common_nestjs_remix/apps/api/src/users/schemas/change-password.schema.ts
index cfe3f84..efe27d1 100644
--- a/examples/common_nestjs_remix/apps/api/src/users/schemas/change-password.schema.ts
+++ b/examples/common_nestjs_remix/apps/api/src/users/schemas/change-password.schema.ts
@@ -1,7 +1,8 @@
 import { Static, Type } from "@sinclair/typebox";
 
 export const changePasswordSchema = Type.Object({
-  password: Type.String({ minLength: 8, maxLength: 64 }),
+  newPassword: Type.String({ minLength: 8, maxLength: 64 }),
+  oldPassword: Type.String({ minLength: 8, maxLength: 64 }),
 });
 
 export type ChangePasswordBody = Static<typeof changePasswordSchema>;
diff --git a/examples/common_nestjs_remix/apps/api/src/users/users.service.ts b/examples/common_nestjs_remix/apps/api/src/users/users.service.ts
index 1cc2351..a2d86d5 100644
--- a/examples/common_nestjs_remix/apps/api/src/users/users.service.ts
+++ b/examples/common_nestjs_remix/apps/api/src/users/users.service.ts
@@ -58,10 +58,27 @@ export class UsersService {
       throw new NotFoundException("User not found");
     }
 
-    const hashedPassword = await bcrypt.hash(password, 10);
+    const [userCredentials] = await this.db
+      .select()
+      .from(credentials)
+      .where(eq(credentials.userId, id));
+
+    if (!userCredentials) {
+      throw new NotFoundException("User credentials not found");
+    }
+
+    const isOldPasswordValid = await bcrypt.compare(
+      oldPassword,
+      userCredentials.password,
+    );
+    if (!isOldPasswordValid) {
+      throw new UnauthorizedException("Invalid old password");
+    }
+
+    const hashedNewPassword = await bcrypt.hash(newPassword, 10);
     await this.db
       .update(credentials)
-      .set({ password: hashedPassword })
+      .set({ password: hashedNewPassword })
       .where(eq(credentials.userId, id));
   }