Merge pull request #2468 from RedisInsight/feature/RI-4617-sign-in-users

Feature/ri 4617 sign in users

Author: egor-zalenski

.circleci/config.yml

@@ -1041,6 +1041,18 @@ workflows:
               only:
                 - /^e2e/feature.*/
                 - /^e2e/bugfix.*/
+      - setup-sign-certificates:
+          name: Setup sign certificates (stage)
+          requires:
+            - Start E2E Tests
+      - setup-build:
+          name: Setup build (stage)
+          requires:
+            - Setup sign certificates (stage)
+      - linux:
+          name: Build app - Linux (stage)
+          requires:
+            - Setup build (stage)
       - docker:
           name: Build docker image
           requires:
@@ -1051,6 +1063,11 @@ workflows:
           parallelism: 4
           requires:
             - Build docker image
+      - e2e-app-image:
+          name: E2ETest (AppImage)
+          parallelism: 2
+          requires:
+            - Build app - Linux (stage)
   # Workflow for feature, bugfix, main branches
   feature-main-branch:
     jobs:

electron-builder.json

@@ -5,11 +5,7 @@
   "files": [
     "dist",
     "node_modules",
-    "package.json",
-    {
-      "from": "api/views",
-      "to": "dist/views"
-    }
+    "package.json"
   ],
   "afterSign": "electron-builder-notarize",
   "artifactName": "${productName}-${os}-${arch}.${ext}",

package.json

@@ -80,7 +80,9 @@
   "homepage": "https://github.com/RedisInsight/RedisInsight#readme",
   "resolutions": {
     "**/node-sass": "^8.0.0",
-    "**/trim": "0.0.3"
+    "**/trim": "0.0.3",
+    "word-wrap": "1.2.4",
+    "electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

redisinsight/api/config/default.ts

@@ -64,9 +64,7 @@ export default {
     appVersion: process.env.APP_VERSION || '2.30.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
-    excludeAuthRoutes: [
-      { path: 'cloud/oauth/callback', method: RequestMethod.GET },
-    ],
+    excludeAuthRoutes: [],
   },
   sockets: {
     cors: process.env.SOCKETS_CORS ? process.env.SOCKETS_CORS === 'true' : false,
@@ -199,8 +197,6 @@ export default {
       name: 'triggers_and_functions',
       url: process.env.COMMANDS_TRIGGERS_AND_FUNCTIONS_URL
         || 'https://raw.githubusercontent.com/RedisGears/RedisGears/master/commands.json',
-      defaultUrl: process.env.COMMANDS_TRIGGERS_AND_FUNCTIONS_DEFAULT_URL
-        || 'https://s3.amazonaws.com/redisinsight.download/public/commands/triggers_and_functions.json',
     },
   ],
   connections: {

redisinsight/api/nest-cli.json

@@ -7,10 +7,6 @@
         "include": "../static/**/*",
         "outDir": "dist/static"
       },
-      {
-        "include": "../views/**/*",
-        "outDir": "dist/views"
-      },
       {
         "include": "../defaults/**/*",
         "outDir": "dist/defaults"

redisinsight/api/package.json

@@ -37,6 +37,12 @@
     "typeorm:migrate": "cross-env NODE_ENV=staging yarn typeorm migration:generate ./migration/migration",
     "typeorm:run": "yarn typeorm migration:run"
   },
+  "resolutions": {
+    "nanoid": "^3.1.31",
+    "word-wrap": "1.2.4",
+    "mocha/minimatch": "^3.0.5",
+    "@nestjs/platform-socket.io/socket.io": "^4.7.1"
+  },
   "dependencies": {
     "@nestjs/common": "^9.0.11",
     "@nestjs/core": "^9.0.11",
@@ -53,7 +59,7 @@
     "axios": "^0.25.0",
     "body-parser": "^1.19.0",
     "class-transformer": "^0.2.3",
-    "class-validator": "^0.12.2",
+    "class-validator": "^0.14.0",
     "connect-timeout": "^1.9.0",
     "date-fns": "^2.29.3",
     "detect-port": "^1.5.1",
@@ -70,7 +76,7 @@
     "node-version-compare": "^1.0.3",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.5.6",
-    "socket.io": "^4.4.0",
+    "socket.io": "^4.6.2",
     "source-map-support": "^0.5.19",
     "sqlite3": "5.1.6",
     "ssh2": "^1.14.0",
@@ -86,7 +92,6 @@
     "@nestjs/schematics": "^9.0.3",
     "@nestjs/testing": "^9.0.11",
     "@types/adm-zip": "^0.5.0",
-    "@types/axios": "^0.14.0",
     "@types/express": "^4.17.3",
     "@types/jest": "^26.0.15",
     "@types/lodash": "^4.14.167",

redisinsight/api/src/common/models/client-metadata.ts

@@ -21,7 +21,11 @@ export class ClientMetadata {
   databaseId: string;
 
   @IsNotEmpty()
-  @IsEnum(ClientContext)
+  @IsEnum(ClientContext, {
+    message: `context must be a valid enum value. Valid values: ${Object.values(
+      ClientContext,
+    )}.`,
+  })
   context: ClientContext;
 
   @IsOptional()

redisinsight/api/src/constants/error-messages.ts

@@ -28,6 +28,7 @@ export default {
   INVALID_SSH_BODY: 'Invalid SSH body',
   INVALID_CERTIFICATE_BODY: 'Invalid certificate body',
   INVALID_PRIVATE_KEY: 'Invalid private key',
+  INVALID_COMPRESSOR: 'Invalid compressor',
   CERTIFICATE_NAME_IS_NOT_DEFINED: 'Certificate name is not defined',
   CLIENT_CERT_EXIST: 'This client certificate name is already in use.',
   INVALID_CERTIFICATE_ID: 'Invalid certificate id.',

redisinsight/api/src/modules/browser/dto/browser-history/create.browser-history.dto.ts

@@ -20,6 +20,10 @@ export class CreateBrowserHistoryDto {
     example: BrowserHistoryMode.Pattern,
   })
   @IsOptional()
-  @IsEnum(BrowserHistoryMode)
+  @IsEnum(BrowserHistoryMode, {
+    message: `mode must be a valid enum value. Valid values: ${Object.values(
+      BrowserHistoryMode,
+    )}.`,
+  })
   mode?: BrowserHistoryMode = BrowserHistoryMode.Pattern;
 }

redisinsight/api/src/modules/browser/dto/browser-history/get.browser-history.dto.ts

@@ -12,7 +12,11 @@ export class ScanFilter {
   })
   @IsOptional()
   @Expose()
-  @IsEnum(RedisDataType)
+  @IsEnum(RedisDataType, {
+    message: `type must be a valid enum value. Valid values: ${Object.values(
+      RedisDataType,
+    )}.`,
+  })
   type?: RedisDataType = null;
 
   @ApiProperty({