profile avatar

src/auth/auth.service.ts

@@ -39,6 +39,7 @@ export interface AuthTokensResponse {
     lastName: string;
     mobile: string;
     role: UserRole;
+    avatarUrl: string | null;
   };
 }
 
@@ -403,13 +404,7 @@ export class AuthService {
     const user = await this.usersService.findOne(authUser.id);
 
     const response: MeResponse = {
-      user: {
-        id: user.id,
-        firstName: user.firstName,
-        lastName: user.lastName,
-        mobile: user.mobile,
-        role: user.role,
-      },
+      user: this.toAuthUserResponse(user),
     };
 
     if (user.role === UserRole.SALON) {
@@ -477,13 +472,18 @@ export class AuthService {
     return {
       accessToken,
       refreshToken,
-      user: {
-        id: user.id,
-        firstName: user.firstName,
-        lastName: user.lastName,
-        mobile: user.mobile,
-        role: user.role,
-      },
+      user: this.toAuthUserResponse(user),
+    };
+  }
+
+  private toAuthUserResponse(user: User): AuthTokensResponse['user'] {
+    return {
+      id: user.id,
+      firstName: user.firstName,
+      lastName: user.lastName,
+      mobile: user.mobile,
+      role: user.role,
+      avatarUrl: user.avatarUrl ?? null,
     };
   }