Merge pull request #3173 from RedisInsight/feature/RI-5041-subpath-proxy

RI-5041: Static Subpath proxy support

Author: vlad-dargel

redisinsight/api/config/default.ts

@@ -1,5 +1,6 @@
 import { join } from 'path';
 import * as os from 'os';
+import { trim } from 'lodash';
 import { version } from '../package.json';
 
 const homedir = join(__dirname, '..');
@@ -15,15 +16,17 @@ const defaultsDir = process.env.RI_BUILD_TYPE === 'ELECTRON' && process['resourc
   ? join(process['resourcesPath'], 'defaults')
   : join(__dirname, '..', 'defaults');
 
-const customPluginsUri = process.env.RI_PROXY_PATH ? `/${process.env.RI_PROXY_PATH}/plugins` : '/plugins';
-const staticUri = process.env.RI_PROXY_PATH ? `/${process.env.RI_PROXY_PATH}/static` : '/static';
-const tutorialsUri = process.env.RI_PROXY_PATH ? `/${process.env.RI_PROXY_PATH}/static/tutorials` : '/static/tutorials';
-const customTutorialsUri = process.env.RI_PROXY_PATH ? `/${process.env.RI_PROXY_PATH}/static/custom-tutorials` : '/static/custom-tutorials';
-const contentUri = process.env.RI_PROXY_PATH ? `/${process.env.RI_PROXY_PATH}/static/content` : '/static/content';
-const defaultPluginsUri = process.env.RI_PROXY_PATH ? `/${process.env.RI_PROXY_PATH}/static/plugins` : '/static/plugins';
-const pluginsAssetsUri = process.env.RI_PROXY_PATH ? `/${process.env.RI_PROXY_PATH}/static/resources/plugins` : '/static/resources/plugins';
+const proxyPath = trim(process.env.RI_PROXY_PATH, '/');
 
-const socketPath = process.env.RI_PROXY_PATH ? `/${process.env.RI_PROXY_PATH}/socket.io` : '/socket.io';
+const customPluginsUri = join('/', proxyPath, 'plugins');
+const staticUri = join('/', proxyPath, 'static');
+const tutorialsUri = join('/', proxyPath, 'static', 'tutorials');
+const customTutorialsUri = join('/', proxyPath, 'static', 'custom-tutorials');
+const contentUri = join('/', proxyPath, 'static', 'content');
+const defaultPluginsUri = join('/', proxyPath, 'static', 'plugins');
+const pluginsAssetsUri = join('/', proxyPath, 'static', 'resources', 'plugins');
+
+const socketPath = join('/', proxyPath, 'socket.io');
 const dataDir = process.env.RI_BUILD_TYPE === 'ELECTRON' && process['resourcesPath']
   ? join(process['resourcesPath'], 'data')
   : join(__dirname, '..', 'data');
@@ -65,7 +68,7 @@ export default {
     defaultPluginsUri,
     pluginsAssetsUri,
     base: process.env.RI_BASE || '/',
-    proxyPath: process.env.RI_PROXY_PATH || '',
+    proxyPath,
     secretStoragePassword: process.env.RI_SECRET_STORAGE_PASSWORD,
     encryptionKey: process.env.RI_ENCRYPTION_KEY,
     tlsCert: process.env.RI_SERVER_TLS_CERT,

redisinsight/api/src/main.ts

@@ -1,3 +1,4 @@
+import { join } from 'path';
 import 'dotenv/config';
 import { NestFactory } from '@nestjs/core';
 import { SwaggerModule } from '@nestjs/swagger';
@@ -46,7 +47,7 @@ export default async function bootstrap(apiPort?: number): Promise<IApp> {
   if (process.env.RI_APP_TYPE !== 'electron') {
     let prefix = serverConfig.globalPrefix;
     if (serverConfig.proxyPath) {
-      prefix = `${serverConfig.proxyPath}/${prefix}`;
+      prefix = join(serverConfig.proxyPath, prefix);
     }
 
     app.setGlobalPrefix(prefix, { exclude: ['/'] });

redisinsight/api/src/middleware/subpath-proxy.middleware.ts

@@ -1,12 +1,13 @@
 import { NestMiddleware, Injectable } from '@nestjs/common';
 import { Request, Response, NextFunction } from 'express';
+import { trim } from 'lodash';
 import * as fs from 'fs';
 
 @Injectable()
 export default class SubpathProxyMiddleware implements NestMiddleware {
   async use(req: Request, res: Response, next: NextFunction) {
     const originalSendFile = res.sendFile;
-    const proxyPath = process.env.RI_PROXY_PATH || '';
+    const proxyPath = trim(process.env.RI_PROXY_PATH, '/');
     res.sendFile = function (this: Response, path: string, options: any, callback?: (err?: Error) => void) {
       if (path.endsWith('.html')) {
         let content = fs.readFileSync(path, 'utf8');