RI-6884: RDI connect - make username and password optional (#4399)

* RI-6884: RDI connect - make username and password optional

* RI-6884: update rdi db model

* update migration

* update migration script

* update integration tests

Author: KrumTy

redisinsight/api/migration/1740579711635-rdi-optional-auth.ts

@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RdiOptionalAuth1740579711635 implements MigrationInterface {
+    name = 'RdiOptionalAuth1740579711635'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "temporary_rdi" ("id" varchar PRIMARY KEY NOT NULL, "url" varchar, "name" varchar NOT NULL, "username" varchar, "password" varchar, "lastConnection" datetime, "version" varchar NOT NULL, "encryption" varchar)`);
+        await queryRunner.query(`INSERT INTO "temporary_rdi"("id", "url", "name", "username", "password", "lastConnection", "version", "encryption") SELECT "id", "url", "name", "username", "password", "lastConnection", "version", "encryption" FROM "rdi"`);
+        await queryRunner.query(`DROP TABLE "rdi"`);
+        await queryRunner.query(`ALTER TABLE "temporary_rdi" RENAME TO "rdi"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "rdi" RENAME TO "temporary_rdi"`);
+        await queryRunner.query(`CREATE TABLE "rdi" ("id" varchar PRIMARY KEY NOT NULL, "url" varchar, "name" varchar NOT NULL, "username" varchar NOT NULL, "password" varchar NOT NULL, "lastConnection" datetime, "version" varchar NOT NULL, "encryption" varchar)`);
+        await queryRunner.query(`INSERT INTO "rdi"("id", "url", "name", "username", "password", "lastConnection", "version", "encryption") SELECT "id", "url", "name", "username", "password", "lastConnection", "version", "encryption" FROM "temporary_rdi"`);
+        await queryRunner.query(`DROP TABLE "temporary_rdi"`);
+    }
+
+}

redisinsight/api/migration/index.ts

@@ -47,6 +47,7 @@ import { CommandExecution1726058563737 } from './1726058563737-command-execution
 import { DatabaseCreatedAt1733740794737 } from './1733740794737-database-createdAt';
 import { DbSettings1737362130798 } from './1737362130798-db-settings';
 import { DatabaseForceStandalone1738829743482 } from './1738829743482-database-forceStandalone';
+import { RdiOptionalAuth1740579711635 } from './1740579711635-rdi-optional-auth';
 
 export default [
   initialMigration1614164490968,
@@ -98,4 +99,5 @@ export default [
   DatabaseCreatedAt1733740794737,
   DbSettings1737362130798,
   DatabaseForceStandalone1738829743482,
+  RdiOptionalAuth1740579711635,
 ];

redisinsight/api/src/modules/rdi/entities/rdi.entity.ts

@@ -16,11 +16,11 @@ export class RdiEntity {
   name: string;
 
   @Expose()
-  @Column({ nullable: false })
+  @Column({ nullable: true })
   username: string;
 
   @Expose()
-  @Column({ nullable: false })
+  @Column({ nullable: true })
   password: string;
 
   @Expose()

redisinsight/api/src/modules/rdi/models/rdi.ts

@@ -36,18 +36,19 @@ export class Rdi {
     description: 'RDI or API username',
     type: String,
   })
+  @IsOptional()
   @Expose()
   @IsString()
-  username: string;
+  username?: string;
 
   @ApiPropertyOptional({
     description: 'RDI or API password',
     type: String,
   })
+  @IsOptional()
   @Expose()
   @IsString()
-  @IsNotEmpty()
-  password: string;
+  password?: string;
 
   @ApiProperty({
     description: 'Time of the last connection to RDI.',

redisinsight/api/test/api/rdi/POST-rdi.test.ts

@@ -15,8 +15,8 @@ const endpoint = () => request(server).post(`/${constants.API.RDI}`);
 const dataSchema = Joi.object().keys({
   url: Joi.string().required(),
   name: Joi.string().max(500).required(),
-  username: Joi.string(),
-  password: Joi.string().required(),
+  username: Joi.string().allow(null),
+  password: Joi.string().allow(null),
 }).messages({ 'any.required': '{#label} should not be empty' }).strict(true);
 
 const validInputData = {

redisinsight/ui/src/pages/rdi/home/connection-form/ConnectionForm.tsx

@@ -47,7 +47,7 @@ export interface Props {
 const getInitialValues = (values: RdiInstance | null): ConnectionFormValues => ({
   name: values?.name || '',
   url: values?.url || '',
-  username: values?.username || 'default',
+  username: values ? (values.username ?? '') : 'default',
   password: values ? null : ''
 })
 
@@ -83,13 +83,6 @@ const ConnectionForm = (props: Props) => {
     if (!values.url) {
       errors.url = 'URL'
     }
-    if (!values.username) {
-      errors.username = 'Username'
-    }
-    // password is security field we did not received it from BE
-    if (!values.password && !isNull(values.password)) {
-      errors.password = 'Password'
-    }
 
     return errors
   }
@@ -191,7 +184,7 @@ const ConnectionForm = (props: Props) => {
               <EuiFormRow>
                 <EuiFlexGroup responsive={false}>
                   <EuiFlexItem grow={1}>
-                    <EuiFormRow label="Username*">
+                    <EuiFormRow label="Username">
                       <Field name="username">
                         {({ field }: { field: FieldInputProps<string> }) => (
                           <EuiFieldText
@@ -207,7 +200,7 @@ const ConnectionForm = (props: Props) => {
                     </EuiFormRow>
                   </EuiFlexItem>
                   <EuiFlexItem grow={1}>
-                    <EuiFormRow label="Password*">
+                    <EuiFormRow label="Password">
                       <Field name="password">
                         {({ field, form, meta }: {
                           field: FieldInputProps<string>