Merge pull request #9 from Selleo/jw/user-management

feat: user management view
Selleo · Jul 24, 2024 · 0f02e10 · 0f02e10
2 parents 59d4443 + 1566cfe
commit 0f02e10
Show file tree

Hide file tree

Showing 21 changed files with 498 additions and 15 deletions.
diff --git a/examples/common_nestjs_remix/apps/api/src/auth/__tests__/auth.controller.e2e-spec.ts b/examples/common_nestjs_remix/apps/api/src/auth/__tests__/auth.controller.e2e-spec.ts
@@ -1,6 +1,6 @@
 import { DatabasePg } from "../../common/index";
 import { INestApplication } from "@nestjs/common";
-import { isArray } from "lodash";
+import { isArray, omit } from "lodash";
 import request from "supertest";
 import { createUserFactory } from "../../../test/factory/user.factory";
 import { createE2ETest } from "../../../test/create-e2e-test";
@@ -137,6 +137,7 @@ describe("AuthController (e2e)", () => {
       const user = await userFactory.build();
       const password = "password123";
       await authService.register(user.email, password);
+      let refreshToken = "";
 
       const loginResponse = await request(app.getHttpServer())
         .post("/auth/login")
@@ -148,8 +149,6 @@ describe("AuthController (e2e)", () => {
 
       const cookies = loginResponse.headers["set-cookie"];
 
-      let refreshToken = "";
-
       if (isArray(cookies)) {
         cookies.forEach((cookie) => {
           if (cookie.startsWith("refresh_token=")) {
@@ -174,4 +173,43 @@ describe("AuthController (e2e)", () => {
         .expect(401);
     });
   });
+
+  describe("GET /auth/current-user", () => {
+    it("should return current user data for authenticated user", async () => {
+      let accessToken = "";
+
+      const user = await userFactory
+        .withCredentials({ password: "password123" })
+        .create();
+
+      const loginResponse = await request(app.getHttpServer())
+        .post("/auth/login")
+        .send({
+          email: user.email,
+          password: "password123",
+        });
+
+      const cookies = loginResponse.headers["set-cookie"];
+
+      if (Array.isArray(cookies)) {
+        cookies.forEach((cookieString) => {
+          const parsedCookie = cookie.parse(cookieString);
+          if ("access_token" in parsedCookie) {
+            accessToken = parsedCookie.access_token;
+          }
+        });
+      }
+
+      const response = await request(app.getHttpServer())
+        .get("/auth/current-user")
+        .set("Cookie", `access_token=${accessToken};`)
+        .expect(200);
+
+      expect(response.body.data).toStrictEqual(omit(user, "credentials"));
+    });
+
+    it("should return 401 for unauthenticated request", async () => {
+      await request(app.getHttpServer()).get("/auth/current-user").expect(401);
+    });
+  });
 });
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
@@ -1,4 +1,8 @@
-import { ConflictException, UnauthorizedException } from "@nestjs/common";
+import {
+  ConflictException,
+  NotFoundException,
+  UnauthorizedException,
+} from "@nestjs/common";
 import * as bcrypt from "bcrypt";
 import { eq } from "drizzle-orm";
 import { AuthService } from "src/auth/auth.service";
@@ -136,4 +140,24 @@ describe("AuthService", () => {
       expect(result).toBeNull();
     });
   });
+
+  describe("currentUser", () => {
+    it("should return current user data", async () => {
+      const user = await userFactory.create();
+
+      const result = await authService.currentUser(user.id);
+
+      expect(result).toBeDefined();
+      expect(result.id).toBe(user.id);
+      expect(result.email).toBe(user.email);
+    });
+
+    it("should throw UnauthorizedException for non-existent user", async () => {
+      const nonExistentUserId = crypto.randomUUID();
+
+      await expect(authService.currentUser(nonExistentUserId)).rejects.toThrow(
+        NotFoundException,
+      );
+    });
+  });
 });
diff --git a/examples/common_nestjs_remix/apps/api/src/auth/api/auth.controller.ts b/examples/common_nestjs_remix/apps/api/src/auth/api/auth.controller.ts
@@ -6,6 +6,7 @@ import {
   Res,
   UnauthorizedException,
   UseGuards,
+  Get,
 } from "@nestjs/common";
 import { AuthGuard } from "@nestjs/passport";
 import { Static } from "@sinclair/typebox";
@@ -23,6 +24,7 @@ import {
 } from "../schemas/create-account.schema";
 import { LoginBody, loginSchema } from "../schemas/login.schema";
 import { TokenService } from "../token.service";
+import { CurrentUser } from "src/common/decorators/user.decorator";
 
 @Controller("auth")
 export class AuthController {
@@ -97,4 +99,16 @@ export class AuthController {
 
     return null;
   }
+
+  @Get("current-user")
+  @Validate({
+    response: baseResponse(commonUserSchema),
+  })
+  async currentUser(
+    @CurrentUser() currentUser: { userId: string },
+  ): Promise<BaseResponse<Static<typeof commonUserSchema>>> {
+    const account = await this.authService.currentUser(currentUser.userId);
+
+    return new BaseResponse(account);
+  }
 }
diff --git a/examples/common_nestjs_remix/apps/api/src/auth/auth.service.ts b/examples/common_nestjs_remix/apps/api/src/auth/auth.service.ts
@@ -8,7 +8,7 @@ import { ConfigService } from "@nestjs/config";
 import { JwtService } from "@nestjs/jwt";
 import * as bcrypt from "bcrypt";
 import { eq } from "drizzle-orm";
-import { DatabasePg } from "src/common";
+import { DatabasePg, UUIDType } from "src/common";
 import { credentials, users } from "../storage/schema";
 import { UsersService } from "../users/users.service";
 import hashPassword from "src/common/helpers/hashPassword";
@@ -63,6 +63,16 @@ export class AuthService {
     };
   }
 
+  public async currentUser(id: UUIDType) {
+    const user = await this.usersService.getUserById(id);
+
+    if (!user) {
+      throw new UnauthorizedException("User not found");
+    }
+
+    return user;
+  }
+
   public async refreshTokens(refreshToken: string) {
     try {
       const payload = await this.jwtService.verifyAsync(refreshToken, {

diff --git a/examples/common_nestjs_remix/apps/api/src/swagger/api-schema.json b/examples/common_nestjs_remix/apps/api/src/swagger/api-schema.json
@@ -89,6 +89,23 @@
         }
       }
     },
+    "/auth/current-user": {
+      "get": {
+        "operationId": "AuthController_currentUser",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CurrentUserResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/users": {
       "get": {
         "operationId": "UsersController_getUsers",
@@ -345,6 +362,37 @@
       "RefreshTokensResponse": {
         "type": "null"
       },
+      "CurrentUserResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "createdAt": {
+                "type": "string"
+              },
+              "updatedAt": {
+                "type": "string"
+              },
+              "email": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "id",
+              "createdAt",
+              "updatedAt",
+              "email"
+            ]
+          }
+        },
+        "required": [
+          "data"
+        ]
+      },
       "GetUsersResponse": {
         "type": "object",
         "properties": {

diff --git a/examples/common_nestjs_remix/apps/web/app/api/api-client.ts b/examples/common_nestjs_remix/apps/web/app/api/api-client.ts
@@ -10,16 +10,18 @@ export const ApiClient = new API({
 ApiClient.instance.interceptors.response.use(
   (response) => response,
   async (error) => {
-    const isLoggedIn = useAuthStore.getState().isLoggedIn;
     const originalRequest = error.config;
+    const isLoggedIn = useAuthStore.getState().isLoggedIn;
+
+    if (!isLoggedIn) {
+      return Promise.reject(error);
+    }
 
     if (error.response?.status === 401 && !originalRequest._retry) {
       originalRequest._retry = true;
-      if (!isLoggedIn) return;
 
       try {
         await ApiClient.auth.authControllerRefreshTokens();
-
         return ApiClient.instance(originalRequest);
       } catch (error) {
         return Promise.reject(error);

diff --git a/examples/common_nestjs_remix/apps/web/app/api/generated-api.ts b/examples/common_nestjs_remix/apps/web/app/api/generated-api.ts
@@ -51,6 +51,15 @@ export type LogoutResponse = null;
 
 export type RefreshTokensResponse = null;
 
+export interface CurrentUserResponse {
+  data: {
+    id: string;
+    createdAt: string;
+    updatedAt: string;
+    email: string;
+  };
+}
+
 export interface GetUsersResponse {
   data: {
     id: string;
@@ -88,7 +97,12 @@ export interface ChangePasswordBody {
    * @minLength 8
    * @maxLength 64
    */
-  password: string;
+  newPassword: string;
+  /**
+   * @minLength 8
+   * @maxLength 64
+   */
+  oldPassword: string;
 }
 
 export type ChangePasswordResponse = null;
@@ -297,6 +311,20 @@ export class API<SecurityDataType extends unknown> extends HttpClient<SecurityDa
         format: "json",
         ...params,
       }),
+
+    /**
+     * No description
+     *
+     * @name AuthControllerCurrentUser
+     * @request GET:/auth/current-user
+     */
+    authControllerCurrentUser: (params: RequestParams = {}) =>
+      this.request<CurrentUserResponse, any>({
+        path: `/auth/current-user`,
+        method: "GET",
+        format: "json",
+        ...params,
+      }),
   };
   users = {
     /**

diff --git a/examples/common_nestjs_remix/apps/web/app/api/mutations/useChangePassword.ts b/examples/common_nestjs_remix/apps/web/app/api/mutations/useChangePassword.ts
@@ -0,0 +1,34 @@
+import { useMutation } from "@tanstack/react-query";
+import { AxiosError } from "axios";
+import { toast } from "sonner";
+import { ApiClient } from "../api-client";
+import { ChangePasswordBody } from "../generated-api";
+import { useCurrentUserSuspense } from "../queries/useCurrentUser";
+
+type ChangePasswordOptions = {
+  data: ChangePasswordBody;
+};
+
+export function useChangePassword() {
+  const { data: currentUser } = useCurrentUserSuspense();
+
+  return useMutation({
+    mutationFn: async (options: ChangePasswordOptions) => {
+      const response = await ApiClient.users.usersControllerChangePassword(
+        currentUser.id,
+        options.data
+      );
+
+      return response.data;
+    },
+    onSuccess: () => {
+      toast.success("Password updated successfully");
+    },
+    onError: (error) => {
+      if (error instanceof AxiosError) {
+        return toast.error(error.response?.data.message);
+      }
+      toast.error(error.message);
+    },
+  });
+}
diff --git a/examples/common_nestjs_remix/apps/web/app/api/mutations/useLoginUser.ts b/examples/common_nestjs_remix/apps/web/app/api/mutations/useLoginUser.ts
@@ -1,16 +1,17 @@
 import { useMutation } from "@tanstack/react-query";
+import { AxiosError } from "axios";
+import { toast } from "sonner";
+import { useAuthStore } from "~/modules/Auth/authStore";
 import { ApiClient } from "../api-client";
 import { LoginBody } from "../generated-api";
-import { useAuthStore } from "~/modules/Auth/authStore";
-import { toast } from "sonner";
-import { AxiosError } from "axios";
 
 type LoginUserOptions = {
   data: LoginBody;
 };
 
 export function useLoginUser() {
-  const { setLoggedIn } = useAuthStore();
+  const setLoggedIn = useAuthStore((state) => state.setLoggedIn);
+
   return useMutation({
     mutationFn: async (options: LoginUserOptions) => {
       const response = await ApiClient.auth.authControllerLogin(options.data);

diff --git a/examples/common_nestjs_remix/apps/web/app/api/mutations/useLogoutUser.ts b/examples/common_nestjs_remix/apps/web/app/api/mutations/useLogoutUser.ts
@@ -3,6 +3,7 @@ import { useMutation } from "@tanstack/react-query";
 import { ApiClient } from "../api-client";
 import { toast } from "sonner";
 import { AxiosError } from "axios";
+import { queryClient } from "../queryClient";
 
 export function useLogoutUser() {
   const { setLoggedIn } = useAuthStore();
@@ -13,6 +14,7 @@ export function useLogoutUser() {
       return response.data;
     },
     onSuccess: () => {
+      queryClient.clear();
       setLoggedIn(false);
     },
     onError: (error) => {