Feature/ri 7091 add an environment variable to skip the eula screen

redisinsight/api/src/constants/agreements-spec.json

@@ -7,6 +7,7 @@
       "required": false,
       "editable": true,
       "disabled": false,
+      "linkToPrivacyPolicy": true,
       "category": "privacy",
       "since": "1.0.1",
       "title": "Usage Data",
@@ -19,6 +20,7 @@
       "required": false,
       "editable": true,
       "disabled": false,
+      "linkToPrivacyPolicy": false,
       "category": "notifications",
       "since": "1.0.6",
       "title": "Notification",
@@ -37,6 +39,7 @@
           "required": false,
           "editable": true,
           "disabled": false,
+          "linkToPrivacyPolicy": false,
           "category": "privacy",
           "since": "1.0.3",
           "title": "Encryption",
@@ -49,6 +52,7 @@
           "required": false,
           "editable": true,
           "disabled": true,
+          "linkToPrivacyPolicy": false,
           "category": "privacy",
           "since": "1.0.3",
           "title": "Encryption",
@@ -61,6 +65,7 @@
           "required": false,
           "editable": true,
           "disabled": true,
+          "linkToPrivacyPolicy": false,
           "category": "privacy",
           "since": "1.0.5",
           "title": "Encryption",
@@ -75,6 +80,7 @@
       "required": true,
       "editable": false,
       "disabled": false,
+      "linkToPrivacyPolicy": false,
       "since": "1.0.4",
       "title": "Server Side Public License",
       "label": "I have read and understood the Terms",

redisinsight/api/src/modules/settings/repositories/local.agreements.repository.ts

@@ -20,7 +20,7 @@ export class LocalAgreementsRepository extends AgreementsRepository {
     defaultOptions: DefaultAgreementsOptions = {}
   ): Promise<Agreements> {
     let entity = await this.repository.findOneBy({});
-    if (!entity) {
+    if (!entity?.data) {
       try {
         entity = await this.repository.save(
           classToClass(AgreementsEntity, plainToInstance(Agreements, {

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

@@ -5,6 +5,7 @@ import {
   Injectable,
   InternalServerErrorException,
   Logger,
+  OnApplicationBootstrap,
 } from '@nestjs/common';
 import { difference, isEmpty, map, cloneDeep } from 'lodash';
 import { readFile } from 'fs-extra';
@@ -35,8 +36,10 @@ import { EncryptionService } from '../encryption/encryption.service';
 const SERVER_CONFIG = config.get('server') as Config['server'];
 
 @Injectable()
-export class SettingsService {
+export class SettingsService implements OnApplicationBootstrap {
   private logger = new Logger('SettingsService');
+  private triggerAutoDiscoveryDueToEnv = false;
+  private autoDiscoveryDueToEnvTriggered = false;
 
   constructor(
     @Inject(forwardRef(() => DatabaseDiscoveryService))
@@ -51,6 +54,38 @@ export class SettingsService {
     private eventEmitter: EventEmitter2,
   ) {}
 
+  async onApplicationBootstrap() {
+    // Check if we need to run discovery due to environment variables
+    if (
+      SERVER_CONFIG.acceptTermsAndConditions
+      && this.triggerAutoDiscoveryDueToEnv
+      && !this.autoDiscoveryDueToEnvTriggered
+    ) {
+      this.autoDiscoveryDueToEnvTriggered = true;
+      process.nextTick(() => this.discoverDatabasesAfterEulaAccepted(null));
+    }
+  }
+
+  /**
+   * Discovers databases after EULA has been accepted
+   * @param sessionMetadata
+   * @private
+   */
+  private async discoverDatabasesAfterEulaAccepted(
+    sessionMetadata: SessionMetadata,
+  ): Promise<void> {
+    try {
+      await this.databaseDiscoveryService.discover(sessionMetadata, true);
+    } catch (e) {
+      // ignore error
+      this.logger.error(
+        'Failed discover databases after eula accepted.',
+        e,
+        sessionMetadata,
+      );
+    }
+  }
+
   /**
    * Method to get settings
    */
@@ -64,6 +99,7 @@ export class SettingsService {
 
       let defaultOptions: object;
       if (SERVER_CONFIG.acceptTermsAndConditions) {
+        this.triggerAutoDiscoveryDueToEnv = true;
         const isEncryptionAvailable = await this.encryptionService.isEncryptionAvailable();          
 
         defaultOptions = {
@@ -84,7 +120,6 @@ export class SettingsService {
         sessionMetadata,
       );
 
-
       return classToClass(GetAppSettingsResponse, {
         ...settings?.data,
         acceptTermsAndConditionsOverwritten: SERVER_CONFIG.acceptTermsAndConditions,
@@ -153,16 +188,7 @@ export class SettingsService {
 
       // Discover databases from envs or autodiscovery flow when eula accept
       if (!oldAppSettings?.agreements?.eula && results?.agreements?.eula) {
-        try {
-          await this.databaseDiscoveryService.discover(sessionMetadata, true);
-        } catch (e) {
-          // ignore error
-          this.logger.error(
-            'Failed discover databases after eula accepted.',
-            e,
-            sessionMetadata,
-          );
-        }
+        await this.discoverDatabasesAfterEulaAccepted(sessionMetadata);
       }
 
       return results;

redisinsight/ui/src/components/consents-settings/ConsentOption/ConsentOption.tsx

@@ -15,7 +15,6 @@ interface Props {
   checked: boolean
   isSettingsPage?: boolean
   withoutSpacer?: boolean
-  linkToPrivacyPolicy?: boolean
 }
 
 const ConsentOption = (props: Props) => {
@@ -25,7 +24,6 @@ const ConsentOption = (props: Props) => {
     checked,
     isSettingsPage = false,
     withoutSpacer = false,
-    linkToPrivacyPolicy = false,
   } = props
 
   return (
@@ -38,7 +36,7 @@ const ConsentOption = (props: Props) => {
             color="subdued"
             style={{ marginTop: '12px' }}
           >
-            <ItemDescription description={consent.description} withLink={linkToPrivacyPolicy} />
+            <ItemDescription description={consent.description} withLink={consent.linkToPrivacyPolicy} />
           </EuiText>
           <Spacer size="m" />
         </>
@@ -66,7 +64,7 @@ const ConsentOption = (props: Props) => {
               color="subdued"
               style={{ marginTop: '12px' }}
             >
-              <ItemDescription description={consent.description} withLink={linkToPrivacyPolicy} />
+              <ItemDescription description={consent.description} withLink={consent.linkToPrivacyPolicy} />
             </EuiText>
           )}
         </FlexItem>

redisinsight/ui/src/components/consents-settings/ConsentsPrivacy/ConsentsPrivacy.tsx

@@ -97,7 +97,6 @@ const ConsentsPrivacy = () => {
             onChangeAgreement={onChangeAgreement}
             isSettingsPage
             key={consent.agreementName}
-            linkToPrivacyPolicy
           />
         ))}
       </div>

redisinsight/ui/src/components/consents-settings/ConsentsSettings.tsx

@@ -38,6 +38,7 @@ export interface IConsent {
   required: boolean
   editable: boolean
   disabled: boolean
+  linkToPrivacyPolicy: boolean
   category?: string
   since: string
   title: string
@@ -222,17 +223,6 @@ const ConsentsSettings = ({ onSubmitted }: Props) => {
         <Spacer size="m" />
         {consents.length > 1 && (
           <>
-            <EuiCallOut>
-              <EuiText
-                size="s"
-                className={styles.smallText}
-                data-testid="plugin-section"
-              >
-                To avoid automatic execution of malicious code, when adding new
-                Workbench plugins, use files from trusted authors only.
-              </EuiText>
-            </EuiCallOut>
-            <Spacer />
             <FlexItem>
               <Row gap="m">
                 <FlexItem>
@@ -287,7 +277,6 @@ const ConsentsSettings = ({ onSubmitted }: Props) => {
             checked={formik.values[consent.agreementName] ?? false}
             onChangeAgreement={onChangeAgreement}
             key={consent.agreementName}
-            linkToPrivacyPolicy
           />
         ))}
         {!!notificationConsents.length && (

tests/e2e/tests/electron/critical-path/a-first-start-form/user-agreements-form.e2e.ts

@@ -17,14 +17,9 @@ test('Verify that user should accept User Agreements to continue working with th
         await t.expect(userAgreementDialog.submitButton.hasAttribute('disabled')).ok('Submit button not disabled by default');
         await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.customSettingsButton.exists).notOk('User can\'t add a database');
     });
-test('Verify that the encryption enabled by default and specific message', async t => {
-    const expectedPluginText = 'To avoid automatic execution of malicious code, when adding new Workbench plugins, use files from trusted authors only.';
-    // Verify that section with plugin warning is displayed
+test('Verify that the encryption enabled by default and specific message', async t => {   
     await t.expect(userAgreementDialog.pluginSectionWithText.exists).ok('Plugin text is not displayed');
     // Verify that text that is displayed in window is 'While adding new visualization plugins, use files only from trusted authors to avoid automatic execution of malicious code.'
-    const pluginText = userAgreementDialog.pluginSectionWithText.innerText;
-    await t.expect(pluginText).eql(expectedPluginText, 'Plugin text is incorrect');
-
     // unskip the verification when encription will be fixed for test builds
     // // Verify that encryption enabled by default
     // await t.expect(userAgreementDialog.switchOptionEncryption.withAttribute('aria-checked', 'true').exists).ok('Encryption enabled by default');

tests/e2e/tests/web/critical-path/a-first-start-form/user-agreements-form.e2e.ts

@@ -22,12 +22,7 @@ test('Verify that user should accept User Agreements to continue working with th
     await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.customSettingsButton.exists).notOk('User can\'t add a database');
 });
 test('Verify that the encryption enabled by default and specific message', async t => {
-    const expectedPluginText = 'To avoid automatic execution of malicious code, when adding new Workbench plugins, use files from trusted authors only.';
-    // Verify that section with plugin warning is displayed
     await t.expect(userAgreementDialog.pluginSectionWithText.exists).ok('Plugin text is not displayed');
-    // Verify that text that is displayed in window is 'While adding new visualization plugins, use files only from trusted authors to avoid automatic execution of malicious code.'
-    const pluginText = userAgreementDialog.pluginSectionWithText.innerText;
-    await t.expect(pluginText).eql(expectedPluginText, 'Plugin text is incorrect');
     // Verify that encryption enabled by default
     await t.expect(userAgreementDialog.switchOptionEncryption.withAttribute('aria-checked', 'true').exists).ok('Encryption enabled by default');
 });