pass port from electron + fix agreements spec to support encryption key

Author: Artem

redisinsight/api/src/main.ts

@@ -22,7 +22,7 @@ interface IApp {
   gracefulShutdown: Function;
 }
 
-export default async function bootstrap(): Promise<IApp> {
+export default async function bootstrap(apiPort?: number): Promise<IApp> {
   await migrateHomeFolder();
 
   const { port, host } = serverConfig;
@@ -62,7 +62,7 @@ export default async function bootstrap(): Promise<IApp> {
 
   const logFileProvider = app.get(LogFileProvider);
 
-  await app.listen(port, host);
+  await app.listen(apiPort || port, host);
   logger.log({
     message: `Server is running on http(s)://${host}:${port}`,
     context: 'bootstrap',

redisinsight/api/src/modules/encryption/encryption.module.ts

@@ -20,6 +20,7 @@ export class EncryptionModule {
         // todo: rework to not export strategies
         PlainEncryptionStrategy,
         KeytarEncryptionStrategy,
+        KeyEncryptionStrategy,
       ],
     };
   }

redisinsight/api/src/modules/settings/settings.service.spec.ts

@@ -3,7 +3,7 @@ import { InternalServerErrorException } from '@nestjs/common';
 import {
   mockAgreements,
   mockAgreementsRepository, mockAppSettings,
-  mockEncryptionStrategyInstance, mockSettings,
+  mockEncryptionStrategyInstance, mockKeyEncryptionStrategyInstance, mockSettings,
   mockSettingsAnalyticsService, mockSettingsRepository,
   MockType, mockUserId,
 } from 'src/__mocks__';
@@ -20,6 +20,7 @@ import { Agreements } from 'src/modules/settings/models/agreements';
 import { Settings } from 'src/modules/settings/models/settings';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { FeatureServerEvents } from 'src/modules/feature/constants';
+import { KeyEncryptionStrategy } from 'src/modules/encryption/strategies/key-encryption.strategy';
 
 const REDIS_SCAN_CONFIG = config.get('redis_scan');
 const WORKBENCH_CONFIG = config.get('workbench');
@@ -37,6 +38,7 @@ describe('SettingsService', () => {
   let settingsRepository: MockType<SettingsRepository>;
   let analyticsService: SettingsAnalytics;
   let keytarStrategy: MockType<KeytarEncryptionStrategy>;
+  let keyStrategy: MockType<KeyEncryptionStrategy>;
   let eventEmitter: EventEmitter2;
 
   beforeEach(async () => {
@@ -60,6 +62,10 @@ describe('SettingsService', () => {
           provide: KeytarEncryptionStrategy,
           useFactory: mockEncryptionStrategyInstance,
         },
+        {
+          provide: KeyEncryptionStrategy,
+          useFactory: mockKeyEncryptionStrategyInstance,
+        },
         {
           provide: EventEmitter2,
           useFactory: () => ({
@@ -72,6 +78,7 @@ describe('SettingsService', () => {
     agreementsRepository = await module.get(AgreementsRepository);
     settingsRepository = await module.get(SettingsRepository);
     keytarStrategy = await module.get(KeytarEncryptionStrategy);
+    keyStrategy = await module.get(KeyEncryptionStrategy);
     analyticsService = await module.get<SettingsAnalytics>(SettingsAnalytics);
     service = await module.get(SettingsService);
     eventEmitter = await module.get(EventEmitter2);

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

@@ -14,6 +14,7 @@ import * as AGREEMENTS_SPEC from 'src/constants/agreements-spec.json';
 import config, { Config } from 'src/utils/config';
 import { AgreementIsNotDefinedException } from 'src/constants';
 import { KeytarEncryptionStrategy } from 'src/modules/encryption/strategies/keytar-encryption.strategy';
+import { KeyEncryptionStrategy } from 'src/modules/encryption/strategies/key-encryption.strategy';
 import { SettingsAnalytics } from 'src/modules/settings/settings.analytics';
 import { SettingsRepository } from 'src/modules/settings/repositories/settings.repository';
 import { classToClass } from 'src/utils';
@@ -33,6 +34,7 @@ export class SettingsService {
     private readonly agreementRepository: AgreementsRepository,
     private readonly analytics: SettingsAnalytics,
     private readonly keytarEncryptionStrategy: KeytarEncryptionStrategy,
+    private readonly keyEncryptionStrategy: KeyEncryptionStrategy,
     private eventEmitter: EventEmitter2,
   ) {}
 
@@ -113,8 +115,11 @@ export class SettingsService {
    */
   private async getAgreementsOption(checker: string, defaultOption: string): Promise<string> {
     try {
+      // Check if any encryption strategy is available (not KEYTAR only)
+      // KEY has a precedence on KEYTAR strategy
       if (checker === 'KEYTAR') {
-        const isEncryptionAvailable = await this.keytarEncryptionStrategy.isAvailable();
+        const isEncryptionAvailable = await this.keyEncryptionStrategy.isAvailable()
+          || await this.keytarEncryptionStrategy.isAvailable();
 
         if (!isEncryptionAvailable && SERVER_CONFIG.buildType === 'REDIS_STACK') {
           return 'stack_false';

redisinsight/desktop/src/lib/server/server.ts

@@ -32,7 +32,7 @@ export const launchApiServer = async () => {
 
     log.info('Available port:', detectPortConst)
 
-    const { gracefulShutdown: gracefulShutdownFn, app: apiApp } = await server()
+    const { gracefulShutdown: gracefulShutdownFn, app: apiApp } = await server(detectPortConst)
     gracefulShutdown = gracefulShutdownFn
     beApp = apiApp