Merge pull request 'rc' (#31) from rc into main

Reviewed-on: http://git.enode/deployer3000/trust-module-backend/pulls/31

src/auth/auth.controller.ts

@@ -20,10 +20,14 @@ export class AuthController {
       throw new UnauthorizedException('Пользователь не аутентифицирован');
     }
 
-    const user = req.user as { userId: number; username: string; login?: string };
-    const userWithoutPassword = { ...user };
+    const user = req.user as { userId: number; username: string; login?: string; role?: string };
+    const userWithoutPassword = {
+      id: user.userId,
+      login: user.login || user.username,
+      role: user.role
+    };
 
-    this.logger.log(`Аутентифицированный пользователь: ${user.username}`);
+    this.logger.log(`Аутентифицированный пользователь: ${user.username}, роль: ${user.role}`);
     return {
       isAuthenticated: true,
       user: userWithoutPassword
@@ -58,7 +62,8 @@ export class AuthController {
       success: true,
       user: {
         id: user.id,
-        login: user.login
+        login: user.login,
+        role: user.role // Добавляем роль в ответ
       },
       access_token
     };

src/auth/auth.service.ts

@@ -17,7 +17,10 @@ export class AuthService {
 
         if (user && user.password === password) {
             const { password, ...result } = user;
-            return result;
+            return {
+                ...result,
+                role: user.role
+            };
         }
         return null;
     }
@@ -25,7 +28,8 @@ export class AuthService {
     async login(user: any) {
         const payload = {
             username: user.login,
-            sub: user.id 
+            sub: user.id,
+            role: user.role
         };
         return {
             access_token: this.jwtService.sign(payload),

src/auth/jwt.strategy.ts

@@ -22,7 +22,8 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
         return {
             userId: payload.sub,
             username: payload.username,
-            login: payload.username 
+            login: payload.username,
+            role: payload.role
         };
     }
 }

src/auth/user.entity.ts

@@ -10,4 +10,7 @@ export class User {
 
     @Column()
     password: string;
+
+    @Column({ default: 'user' })
+    role: 'user' | 'admin'; 
 }

src/prometheus.service.ts

@@ -224,11 +224,14 @@ export class PrometheusService {
   }
 
   async fetchAllMetricsWithValues(): Promise<any[]> {
-    const metricNames = await this.fetchAllMetrics();
-    const promises = metricNames.map(async (metric) => {
-      const data = await this.fetchMetrics(metric);
-      return { metric, data };
-    });
-    return Promise.all(promises);
-  }
+  const metricNames = await this.fetchAllMetrics();
+  const zvksMetrics = metricNames.filter(metric => metric.startsWith('zvks'));
+  
+  const promises = zvksMetrics.map(async (metric) => {
+    const data = await this.fetchMetrics(metric);
+    return { metric, data };
+  });
+  
+  return Promise.all(promises);
+}
 }