Merge branch 'ce-release-group-cve' of github.com:ToolJet/ToolJet into ce-release-group-cve

.env.example

@@ -48,7 +48,8 @@ GOOGLE_CLIENT_SECRET=
 
 # EMAIL CONFIGURATION
 DEFAULT_FROM_EMAIL=hello@tooljet.io
-SMTP_ENABLED=
+# Set this value true to get preview email on cevelopment env
+SMTP_DISABLED=
 SMTP_USERNAME=
 SMTP_PASSWORD=
 SMTP_DOMAIN=
@@ -89,5 +90,5 @@ DISABLE_APP_EMBED=
 # if true then private app embed is allowed
 ENABLE_PRIVATE_APP_EMBED=
 
-#Enable cors else restricted to TOOLJET_HOST
+#Enable cors else restricted to TOOLJET_HOST. Set the value true if you are serving front end from diffrent host
 ENABLE_CORS=

deploy/ec2/.env

@@ -58,6 +58,3 @@ SSO_GOOGLE_OAUTH2_CLIENT_ID=
 SSO_GIT_OAUTH2_CLIENT_ID=
 SSO_GIT_OAUTH2_CLIENT_SECRET=
 SSO_GIT_OAUTH2_HOST=
-
-#Enable cors else restricted to TOOLJET_HOST
-ENABLE_CORS=true

server/ce/instance-settings/constants.ts

@@ -32,16 +32,18 @@ export const defaultWhiteLabellingSettings = {
   WHITE_LABEL_LOGO_URL: 'https://app.tooljet.com/logo.svg',
 };
 
-export const defaultInstanceSettings = {
+export function getDefaultInstanceSettings() {
-  [INSTANCE_SYSTEM_SETTINGS.ENABLE_SIGNUP]: process.env.SSO_DISABLE_SIGNUPS,
+  return {
-  [INSTANCE_SYSTEM_SETTINGS.ENABLE_WORKSPACE_LOGIN_CONFIGURATION]: 'true',
+    [INSTANCE_SYSTEM_SETTINGS.ENABLE_SIGNUP]: process.env.SSO_DISABLE_SIGNUPS,
-  [INSTANCE_USER_SETTINGS.ALLOW_PERSONAL_WORKSPACE]: 'true',
+    [INSTANCE_SYSTEM_SETTINGS.ENABLE_WORKSPACE_LOGIN_CONFIGURATION]: 'true',
-  [INSTANCE_USER_SETTINGS.ENABLE_MULTIPLAYER_EDITING]: process.env.ENABLE_MULTIPLAYER_EDITING,
+    [INSTANCE_USER_SETTINGS.ALLOW_PERSONAL_WORKSPACE]: 'true',
-  [INSTANCE_USER_SETTINGS.ENABLE_COMMENTS]: process.env.COMMENT_FEATURE_ENABLE,
+    [INSTANCE_USER_SETTINGS.ENABLE_MULTIPLAYER_EDITING]: process.env.ENABLE_MULTIPLAYER_EDITING,
-  [INSTANCE_SYSTEM_SETTINGS.SMTP_PORT]: process.env.SMTP_PORT,
+    [INSTANCE_USER_SETTINGS.ENABLE_COMMENTS]: process.env.COMMENT_FEATURE_ENABLE,
-  [INSTANCE_SYSTEM_SETTINGS.SMTP_DOMAIN]: process.env.SMTP_DOMAIN,
+    [INSTANCE_SYSTEM_SETTINGS.SMTP_PORT]: process.env.SMTP_PORT,
-  [INSTANCE_SYSTEM_SETTINGS.SMTP_USERNAME]: process.env.SMTP_USERNAME,
+    [INSTANCE_SYSTEM_SETTINGS.SMTP_DOMAIN]: process.env.SMTP_DOMAIN,
-  [INSTANCE_SYSTEM_SETTINGS.SMTP_PASSWORD]: process.env.SMTP_PASSWORD,
+    [INSTANCE_SYSTEM_SETTINGS.SMTP_USERNAME]: process.env.SMTP_USERNAME,
-  [INSTANCE_SYSTEM_SETTINGS.SMTP_ENABLED]: process.env.SMTP_ENABLED,
+    [INSTANCE_SYSTEM_SETTINGS.SMTP_PASSWORD]: process.env.SMTP_PASSWORD,
-  [INSTANCE_SYSTEM_SETTINGS.SMTP_FROM_EMAIL]: process.env.DEFAULT_FROM_EMAIL
+    [INSTANCE_SYSTEM_SETTINGS.SMTP_ENABLED]: process.env.SMTP_DISABLED === 'true' ? 'false' : 'true',
-};
+    [INSTANCE_SYSTEM_SETTINGS.SMTP_FROM_EMAIL]: process.env.DEFAULT_FROM_EMAIL,
+  };
+}

server/ce/instance-settings/service.ts

@@ -1,9 +1,10 @@
 import { Injectable } from '@nestjs/common';
-import { defaultInstanceSettings } from './constants';
+import { getDefaultInstanceSettings } from './constants';
 
 @Injectable()
 export class InstanceSettingsService {
   async getSettings(key?: string | string[], getAllData = false, type?: any): Promise<any> {
+    const defaultInstanceSettings = getDefaultInstanceSettings();
     let settings = Object.keys(defaultInstanceSettings)
       .filter((e) => (Array.isArray(key) ? key.includes(e) : key === e))
       .map((e) => ({ key: e, value: defaultInstanceSettings[e] }));
@@ -16,7 +17,7 @@ export class InstanceSettingsService {
         // Key is not included on settings, adding empty value
         settings.push({ key: s, value: null });
       }
-    })
+    });
 
     const instanceConfigs = {};
     settings?.forEach((config) => {
@@ -26,4 +27,4 @@ export class InstanceSettingsService {
     const res = Array.isArray(key) ? instanceConfigs : instanceConfigs[key];
     return res;
   }
-}
+}

server/migrations/1722437531652-AddTypeColumnToApps.ts

@@ -1,17 +0,0 @@
-import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
-
-export class AddTypeColumnToApps1722437531652 implements MigrationInterface {
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.addColumn(
-      'apps',
-      new TableColumn({
-        name: 'type',
-        type: 'varchar',
-        isNullable: false,
-        default: "'front-end'",
-      })
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {}
-}

server/src/controllers/metadata.controller.ts

@@ -22,25 +22,13 @@ export class MetadataController {
   async getMetadata() {
     const metadata = await this.metadataService.getMetaData();
     const data = metadata.data;
-    let latestVersion = data['latest_version'];
+    const latestVersion = data['latest_version'];
-    let versionIgnored = data['version_ignored'] || false;
+    const versionIgnored = data['version_ignored'] || false;
     const instanceId = metadata['id'];
     const onboarded = data['onboarded'];
 
-    if (process.env.NODE_ENV == 'production') {
+    if (process.env.NODE_ENV == 'production' && process.env.DISABLE_TOOLJET_TELEMETRY !== 'true') {
-      if (
+      void this.metadataService.sendTelemetryData(metadata);
-        process.env.CHECK_FOR_UPDATES === '1' ||
-        process.env.CHECK_FOR_UPDATES === 'true' ||
-        !process.env.CHECK_FOR_UPDATES
-      ) {
-        const result = await this.metadataService.checkForUpdates(metadata);
-        latestVersion = result.latestVersion;
-        versionIgnored = false;
-      }
-
-      if (process.env.DISABLE_TOOLJET_TELEMETRY !== 'true') {
-        void this.metadataService.sendTelemetryData(metadata);
-      }
     }
 
     return {

server/src/entities/app.entity.ts

@@ -25,8 +25,7 @@ export class App extends BaseEntity {
   @Column({ name: 'name' })
   name: string;
 
-  @Column({ name: 'type' })
+  type: string = 'front-end';
-  type: string;
 
   @Column({ name: 'slug', unique: true })
   slug: string;

server/src/main.ts

@@ -78,11 +78,6 @@ async function bootstrap() {
     defaultVersion: VERSION_NEUTRAL,
   });
 
-  app.enableVersioning({
-    type: VersioningType.URI,
-    defaultVersion: VERSION_NEUTRAL,
-  });
-
   const listen_addr = process.env.LISTEN_ADDR || '::';
   const port = parseInt(process.env.PORT) || 3000;
 

server/src/services/email.service.ts

@@ -337,15 +337,12 @@ export class EmailService {
   }
 
   async retrieveWhiteLabelText(whiteLabelSetting) {
-    return whiteLabelSetting?.[INSTANCE_SYSTEM_SETTINGS.WHITE_LABEL_TEXT] !== ''
+    const whiteLabelText = whiteLabelSetting?.[INSTANCE_SYSTEM_SETTINGS.WHITE_LABEL_TEXT];
-      ? whiteLabelSetting?.[INSTANCE_SYSTEM_SETTINGS.WHITE_LABEL_TEXT]
+    return whiteLabelText || defaultWhiteLabellingSettings.WHITE_LABEL_TEXT;
-      : defaultWhiteLabellingSettings.WHITE_LABEL_TEXT;
   }
-
   async retrieveWhiteLabelLogo(whiteLabelSetting) {
-    return whiteLabelSetting?.[INSTANCE_SYSTEM_SETTINGS.WHITE_LABEL_LOGO] !== ''
+    const whiteLabelLogo = whiteLabelSetting?.[INSTANCE_SYSTEM_SETTINGS.WHITE_LABEL_LOGO];
-      ? whiteLabelSetting?.[INSTANCE_SYSTEM_SETTINGS.WHITE_LABEL_LOGO]
+    return whiteLabelLogo || defaultWhiteLabellingSettings.WHITE_LABEL_LOGO;
-      : defaultWhiteLabellingSettings.WHITE_LABEL_LOGO;
   }
 
   checkDefaultWhiteLabelState() {