Merge pull request #38 from ToolJet/ecs-support

ALB/NLB Support

frontend/src/App/App.jsx

@@ -63,7 +63,7 @@ class App extends React.Component {
       link.rel = 'icon';
       document.getElementsByTagName('head')[0].appendChild(link);
     }
-    link.href = favicon_url ? favicon_url : '/assets/images/logo.svg';
+    link.href = favicon_url ? favicon_url : 'assets/images/logo.svg';
     document.title = `${retrieveWhiteLabelText()} - Dashboard`;
   }
 

frontend/src/HomePage/AppCard.jsx

@@ -6,6 +6,7 @@ import { ToolTip } from '@/_components';
 import useHover from '@/_hooks/useHover';
 import configs from './Configs/AppIcon.json';
 import { Link } from 'react-router-dom';
+import urlJoin from 'url-join';
 
 const { defaultIcon } = configs;
 
@@ -131,7 +132,7 @@ export default function AppCard({
                     disabled={app?.current_version_id === null || app?.is_maintenance_on}
                     onClick={() => {
                       if (app?.current_version_id) {
-                        window.open(`/applications/${app.slug}`);
+                        window.open(urlJoin(window.public_config?.TOOLJET_HOST, `/applications/${app.slug}`));
                       } else {
                         history.push(app?.current_version_id ? `/applications/${app.slug}` : '');
                       }

frontend/src/ManageSSO/OpenId.jsx

@@ -118,7 +118,7 @@ export function OpenId({ settings, updateData }) {
             <label className="form-label">
               Client Secret
               <small className="text-green mx-2">
-                <img className="mx-2 encrypted-icon" src="/assets/images/icons/padlock.svg" width="12" height="12" />
+                <img className="mx-2 encrypted-icon" src="assets/images/icons/padlock.svg" width="12" height="12" />
                 Encrypted
               </small>
             </label>
@@ -147,7 +147,7 @@ export function OpenId({ settings, updateData }) {
           {configId && (
             <div className="form-group mb-3">
               <label className="form-label">Redirect URL</label>
-              <div>{`${window.location.protocol}//${window.location.host}/sso/openid/${configId}`}</div>
+              <div>{`${window.public_config?.TOOLJET_HOST}/sso/openid/${configId}`}</div>
             </div>
           )}
           <div className="form-footer">

frontend/src/SignupPage/SignupPage.jsx

@@ -110,11 +110,15 @@ class SignupPage extends React.Component {
                     {this.ssoConfigs.configs?.openid?.enabled && (
                       <OidcSSOLoginButton text="Sign up with" configs={this.ssoConfigs.configs?.openid?.configs} />
                     )}
-                    <div className="mt-2 separator">
-                      <h2>
-                        <span>OR</span>
-                      </h2>
-                    </div>
+                    {(this.ssoConfigs.configs?.git?.enabled ||
+                      this.ssoConfigs.configs?.google?.enabled ||
+                      this.ssoConfigs.configs?.openid?.enabled) && (
+                      <div className="mt-2 separator">
+                        <h2>
+                          <span>OR</span>
+                        </h2>
+                      </div>
+                    )}
                   </div>
                 )}
                 <div className="mb-3">

server/src/app.module.ts

@@ -116,6 +116,8 @@ if (process.env.SERVE_CLIENT !== 'false') {
 
   imports.unshift(
     ServeStaticModule.forRoot({
+      // Have to remove trailing slash of SUB_PATH.
+      serveRoot: process.env.SUB_PATH === undefined ? '' : process.env.SUB_PATH.replace(/\/$/, ''),
       rootPath: join(__dirname, '../../../', 'frontend/build'),
     })
   );

server/src/controllers/app.controller.ts

@@ -61,4 +61,9 @@ export class AppController {
   async healthCheck(@Request() req) {
     return { works: 'yeah' };
   }
+
+  @Get('/')
+  async rootPage(@Request() req) {
+    return { message: 'Instance seems healthy but this is probably not the right URL to access.' };
+  }
 }

server/src/events/events.gateway.ts

@@ -9,8 +9,9 @@ import {
 import { Server } from 'ws';
 import { AuthService } from 'src/services/auth.service';
 import { isEmpty } from 'lodash';
+import { maybeSetSubPath } from '../helpers/utils.helper';
 
-@WebSocketGateway({ path: '/ws' })
+@WebSocketGateway({ path: maybeSetSubPath('/ws') })
 export class EventsGateway implements OnGatewayConnection, OnGatewayDisconnect {
   constructor(private authService: AuthService) {}
   @WebSocketServer()

server/src/events/yjs.gateway.ts

@@ -2,9 +2,10 @@ import http from 'http';
 import { WebSocketGateway, WebSocketServer, OnGatewayConnection, OnGatewayDisconnect } from '@nestjs/websockets';
 import { Server } from 'ws';
 import { AuthService } from 'src/services/auth.service';
-import { isEmpty } from 'lodash';
 import { setupWSConnection, setPersistence } from 'y-websocket/bin/utils';
 import { RedisPubSub } from '../helpers/redis';
+import { maybeSetSubPath } from '../helpers/utils.helper';
+import { isEmpty } from 'lodash';
 
 // TODO: Mock redis for test env
 if (process.env.NODE_ENV !== 'test') {
@@ -34,7 +35,7 @@ if (process.env.NODE_ENV !== 'test') {
   });
 }
 
-@WebSocketGateway({ path: '/yjs' })
+@WebSocketGateway({ path: maybeSetSubPath('/yjs') })
 export class YjsGateway implements OnGatewayConnection, OnGatewayDisconnect {
   constructor(private authService: AuthService) {}
   @WebSocketServer()

server/src/helpers/utils.helper.ts

@@ -1,6 +1,7 @@
 import { QueryError } from 'src/modules/data_sources/query.errors';
 import * as sanitizeHtml from 'sanitize-html';
 import { EntityManager, getManager } from 'typeorm';
+import { isEmpty } from 'lodash';
 
 export function parseJson(jsonString: string, errorMessage?: string): object {
   try {
@@ -10,6 +11,18 @@ export function parseJson(jsonString: string, errorMessage?: string): object {
   }
 }
 
+export function maybeSetSubPath(path) {
+  const hasSubPath = process.env.SUB_PATH !== undefined;
+  const urlPrefix = hasSubPath ? process.env.SUB_PATH : '';
+
+  if (isEmpty(urlPrefix)) {
+    return path;
+  }
+
+  const pathWithoutLeadingSlash = path.replace(/^\/+/, '');
+  return urlPrefix + pathWithoutLeadingSlash;
+}
+
 export async function cacheConnection(dataSourceId: string, connection: any): Promise<any> {
   const updatedAt = new Date();
   globalThis.CACHED_CONNECTIONS[dataSourceId] = { connection, updatedAt };

server/src/main.ts

@@ -6,7 +6,7 @@ import * as helmet from 'helmet';
 import { Logger } from 'nestjs-pino';
 import { urlencoded, json } from 'express';
 import { AllExceptionsFilter } from './all-exceptions-filter';
-import { ValidationPipe } from '@nestjs/common';
+import { RequestMethod, ValidationPipe } from '@nestjs/common';
 import * as cookieParser from 'cookie-parser';
 import { ConfigService } from '@nestjs/config';
 import { bootstrap as globalAgentBootstrap } from 'global-agent';
@@ -33,7 +33,20 @@ async function bootstrap() {
   app.useGlobalFilters(new AllExceptionsFilter(app.get(Logger)));
   app.useGlobalPipes(new ValidationPipe({ whitelist: true, transform: true }));
   app.useWebSocketAdapter(new WsAdapter(app));
-  app.setGlobalPrefix('api');
+
+  const hasSubPath = process.env.SUB_PATH !== undefined;
+  const UrlPrefix = hasSubPath ? process.env.SUB_PATH : '';
+
+  // Exclude these endpoints from prefix. These endpoints are required for health checks.
+  const pathsToExclude = [];
+  if (hasSubPath) {
+    pathsToExclude.push({ path: 'health', method: RequestMethod.GET });
+    pathsToExclude.push({ path: '/', method: RequestMethod.GET });
+  }
+
+  app.setGlobalPrefix(UrlPrefix + 'api', {
+    exclude: pathsToExclude,
+  });
   app.enableCors({
     origin: true,
     credentials: true,