Merge remote-tracking branch 'origin/be/feature/RI-4454_Restrict_loopback' into be/feature/RI-4454_Restrict_loopback

Author: egor-zalenski

redisinsight/api/src/modules/server/server.service.ts

@@ -51,7 +51,7 @@ export class ServerService implements OnApplicationBootstrap {
     this.eventEmitter.emit(AppAnalyticsEvents.Initialize, {
       anonymousId: server.id,
       sessionId: this.sessionId,
-      appType: this.getAppType(SERVER_CONFIG.buildType),
+      appType: ServerService.getAppType(SERVER_CONFIG.buildType),
       ...(await this.featuresConfigService.getControlInfo()),
     });
 
@@ -86,7 +86,7 @@ export class ServerService implements OnApplicationBootstrap {
         appVersion: SERVER_CONFIG.appVersion,
         osPlatform: process.platform,
         buildType: SERVER_CONFIG.buildType,
-        appType: this.getAppType(SERVER_CONFIG.buildType),
+        appType: ServerService.getAppType(SERVER_CONFIG.buildType),
         encryptionStrategies: await this.encryptionService.getAvailableEncryptionStrategies(),
         fixedDatabaseId: REDIS_STACK_CONFIG?.id,
         ...(await this.featuresConfigService.getControlInfo()),
@@ -99,7 +99,7 @@ export class ServerService implements OnApplicationBootstrap {
     }
   }
 
-  getAppType(buildType: string): AppType {
+  static getAppType(buildType: string): AppType {
     switch (buildType) {
       case BuildType.DockerOnPremise:
         return AppType.Docker;

redisinsight/api/test/api/analytics/analytics.test.ts

@@ -8,7 +8,6 @@ import {
 } from '../deps';
 const { analytics } = deps;
 
-
 describe('Analytics', () => {
   requirements('rte.serverType=local');
 
@@ -28,7 +27,7 @@ describe('Analytics', () => {
     const found = appStarted || appFirstStarted;
 
     if (!found) {
-      fail('APPLICATION_STARTED or APPLICATION_FIRST_START events were not found');
+      expect.fail('APPLICATION_STARTED or APPLICATION_FIRST_START events were not found');
     }
 
     expect(found?.properties).to.have.all.keys('appVersion', 'osPlatform', 'buildType', 'controlNumber', 'controlGroup', 'port');

redisinsight/api/test/api/cli/POST-databases-id-cli-uuid-send_command.test.ts

@@ -11,6 +11,7 @@ import {
   validateApiCall,
   requirements, serverConfig
 } from '../deps';
+import { ServerService } from 'src/modules/server/server.service';
 const { server, request, constants, rte, analytics } = deps;
 
 // endpoint to test
@@ -98,7 +99,7 @@ describe('POST /databases/:instanceId/cli/:uuid/send-command', () => {
                 capability: 'string',
                 command: 'SET',
                 outputFormat: 'TEXT',
-                buildType: serverConfig.get('server').buildType,
+                buildType: ServerService.getAppType(serverConfig.get('server').buildType),
               },
             });
           }

redisinsight/api/test/api/database/POST-databases.test.ts

@@ -10,6 +10,7 @@ import {
   generateInvalidDataTestCases, validateInvalidDataTestCase, getMainCheckFn, serverConfig,
 } from '../deps';
 import { databaseSchema } from './constants';
+import { ServerService } from 'src/modules/server/server.service';
 const { rte, request, server, localDb, constants, analytics } = deps;
 
 const endpoint = () => request(server).post(`/${constants.API.DATABASES}`);
@@ -167,7 +168,7 @@ describe('POST /databases', () => {
                   // RedisJSON: { loaded: false },
                   // RedisTimeSeries: { loaded: false },
                   // customModules: [],
-                  buildType: serverConfig.get('server').buildType,
+                  buildType: ServerService.getAppType(serverConfig.get('server').buildType),
                 },
               });
             },