Merge pull request #4039 from RedisInsight/latest

Latest to main

Author: vlad-dargel

.circleci/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.58.0)
+-v - Semver (2.60.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

.circleci/config.yml

@@ -121,7 +121,8 @@ aliases:
     - oss-st-5            # OSS Standalone v5
     - oss-st-5-pass       # OSS Standalone v5 with admin pass required
     - oss-st-6            # OSS Standalone v6 and all modules
-    - oss-st-big          # OSS Standalone v6 and all modules and predefined amount of data inside (~3-4M)
+    # TODO: Investigate why it randomly fails
+    # - oss-st-big          # OSS Standalone v6 and all modules and predefined amount of data inside (~3-4M)
     - mods-preview        # OSS Standalone and all preview modules
     - oss-st-6-tls        # OSS Standalone v6 with TLS enabled
     - oss-st-6-tls-auth   # OSS Standalone v6 with TLS auth required

.github/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.58.0)
+-v - Semver (2.60.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

redisinsight/api/config/default.ts

@@ -80,7 +80,7 @@ export default {
     migrateOldFolders: process.env.RI_MIGRATE_OLD_FOLDERS ? process.env.RI_MIGRATE_OLD_FOLDERS === 'true' : true,
     autoBootstrap: process.env.RI_AUTO_BOOTSTRAP ? process.env.RI_AUTO_BOOTSTRAP === 'true' : true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.58.0',
+    appVersion: process.env.RI_APP_VERSION || '2.60.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -279,7 +279,7 @@ export default {
     },
   },
   ai: {
-    convAiApiUrl: process.env.RI_AI_CONVAI_API_URL || 'https://staging.redis.io/convai/api',
+    convAiApiUrl: process.env.RI_AI_CONVAI_API_URL || 'https://staging.learn.redis.com/convai/api',
     convAiToken: process.env.RI_AI_CONVAI_TOKEN,
     querySocketUrl: process.env.RI_AI_QUERY_SOCKET_URL || 'https://app-sm.k8s-cloudapi.sm-qa.qa.redislabs.com',
     querySocketPath: process.env.RI_AI_QUERY_SOCKET_PATH || '/api/v1/cloud-copilot-service/socket.io/',

redisinsight/api/config/swagger.ts

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'Redis Insight Backend API',
     description: 'Redis Insight Backend API',
-    version: '2.58.0',
+    version: '2.60.0',
   },
   tags: [],
 };

redisinsight/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.58.0",
+  "version": "2.60.0",
   "description": "Redis Insight API",
   "private": true,
   "author": {
@@ -28,7 +28,7 @@
     "start:prod": "cross-env NODE_ENV=production node dist/src/main",
     "test": "cross-env NODE_ENV=test ./node_modules/.bin/jest -w 1",
     "test:watch": "cross-env NODE_ENV=test jest --watch -w 1",
-    "test:cov": "cross-env NODE_ENV=test ./node_modules/.bin/jest --forceExit --coverage -w 4",
+    "test:cov": "cross-env NODE_ENV=test ./node_modules/.bin/jest --forceExit --coverage --runInBand",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand -w 1",
     "test:e2e": "jest --config ./test/jest-e2e.json -w 1",
     "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js -d ./config/ormconfig.ts",

redisinsight/api/src/modules/cloud/auth/cloud-auth.service.ts

@@ -35,6 +35,8 @@ export class CloudAuthService {
 
   private authRequests: Map<string, CloudAuthRequest> = new Map();
 
+  private inProgressRequests: Map<string, CloudAuthRequest> = new Map();
+
   constructor(
     private readonly sessionService: CloudSessionService,
     private readonly googleIdpAuthStrategy: GoogleIdpCloudAuthStrategy,
@@ -185,6 +187,8 @@ export class CloudAuthService {
     // delete authRequest on this step
     // allow to redirect with authorization code only once
     this.authRequests.delete(query.state);
+    // Track in progress auth requests to avoid errors when for some reason many we receive many the same calls
+    this.inProgressRequests.set(query.state, authRequest);
 
     const tokens = await this.exchangeCode(authRequest, query.code);
 
@@ -297,4 +301,12 @@ export class CloudAuthService {
       throw wrapHttpError(e);
     }
   }
+
+  isRequestInProgress(query) {
+    return !!this.inProgressRequests.has(query?.state);
+  }
+
+  finishInProgressRequest(query) {
+    this.inProgressRequests.delete(query?.state);
+  }
 }

redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts

@@ -8,7 +8,7 @@ const ICON_PATH = app.isPackaged
 
 export const AboutPanelOptions = {
   applicationName: 'Redis Insight',
-  applicationVersion: `${app.getVersion() || '2.58.0'}${
+  applicationVersion: `${app.getVersion() || '2.60.0'}${
     !config.isProduction ? `-dev-${process.getCreationTime()}` : ''
   }`,
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,

redisinsight/desktop/src/lib/cloud/cloud-oauth.handlers.ts

@@ -76,13 +76,22 @@ export const initCloudOauthHandlers = () => {
 export const cloudOauthCallback = async (url: UrlWithParsedQuery) => {
   try {
     const authService: CloudAuthService = getBackendApp()?.get?.(CloudAuthService)
+
+    // Ignore xdg-open when the same request is being processed.
+    if (authService.isRequestInProgress(url.query)) {
+      return
+    }
+
     const result = await authService.handleCallback(url.query)
 
     if (result.status === CloudAuthStatus.Failed) {
       const [currentWindow] = getWindows().values()
 
       currentWindow?.webContents.send(IpcOnEvent.cloudOauthCallback, result)
     }
+
+    // complete auth request processing
+    authService.finishInProgressRequest(url.query)
   } catch (e) {
     log.error(wrapErrorMessageSensitiveData(e as Error))
   }

redisinsight/package.json

@@ -3,7 +3,7 @@
   "appName": "Redis Insight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.58.0",
+  "version": "2.60.0",
   "description": "Redis Insight",
   "main": "./dist/main/main.js",
   "author": {