mirror of
https://github.com/ToolJet/ToolJet
synced 2026-04-21 21:47:17 +00:00
* Cloud Blocker bugfixes (#13160) * fix * minor email fixes * settings menu fix * fixes * Bugfixes/whitelabelling apis (#13180) * white-labelling apis * removed consoles logs * reverts * fixes for white-labelling * fixes * reverted breadcrumb changes (#13194) * fixes for getting public sso configurations * fix for enable signup on cloud * Cloud Trial and Banners (#13182) * Cloud Blocker bugfixes (#13160) * fix * minor email fixes * settings menu fix * fixes * Cloud Trial and Banners * revert * initial commit * Added website onboarding APIs * moved ai onboarding controller to auth module * ee banners * fix --------- Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com> Co-authored-by: gsmithun4 <gsmithun4@gmail.com> * Bugfixes/minor UI fixes-CLoud (#13203) * Bugfixes/UI bugs platform 1 (#13205) * cleanup * Audit logs fix * gitignore changes * postgrest configs removed * removed unused import * improvements * fix * improved startup logs * Platform cypress fix (#13192) * Cloud Blocker bugfixes (#13160) * fix * minor email fixes * settings menu fix * fixes * Bugfixes/whitelabelling apis (#13180) * white-labelling apis * removed consoles logs * reverts * fixes for white-labelling * fixes * Cypress fix * reverted breadcrumb changes (#13194) * cypress fix * title fix * fixes for getting public sso configurations --------- Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com> Co-authored-by: gsmithun4 <gsmithun4@gmail.com> * deployment fix * added interfaces and permissions * Bugfixes/lts 3.6 branch 1 platform (#13238) * fix * Licensing Banners Fixes Cloud and EE (#13241) * design: Adds license buttons to header * Refactor header actions * Cloud Blocker bugfixes (#13160) * fix * minor email fixes * settings menu fix * fixes * subscription page * fix banners --------- Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com> Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com> * fix for public apps * fix * CE Instance Signup bug (#13254) * CE Instance Signup bug * improvement * fix * Add WEBSITE_SIGNUP_URL to deployment environment variables * Add WEBSITE_SIGNUP_URL to environment variables for deployment * Super admin banner fix (#13262) * Git Sync Fixes (#13249) * git-sync module changes * git sync fixes * added app resource guard * git-sync fixes * removed require feature * fix * review comment changes * ypress fix * App logo fix inside app builder * fix for subpath cache * fix (#13274) * platform-cypress-fix (#13271) * git sync fixes (#13277) * fix * Add data-cy for new components (#13289) --------- Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com> Co-authored-by: Rudhra Deep Biswas <98055396+rudeUltra@users.noreply.github.com> Co-authored-by: Ajith KV <ajith.jaban@gmail.com> Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com> Co-authored-by: rohanlahori <rohanlahori99@gmail.com> Co-authored-by: Adish M <adish.madhu@gmail.com> Co-authored-by: Rudra deep Biswas <rudra21ultra@gmail.com>
118 lines
4 KiB
TypeScript
118 lines
4 KiB
TypeScript
import { Organization } from '@entities/organization.entity';
|
|
import { SSOConfigs, SSOType } from '@entities/sso_config.entity';
|
|
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
import { getImportPath, TOOLJET_EDITIONS } from '@modules/app/constants';
|
|
import { getTooljetEdition } from '@helpers/utils.helper';
|
|
import { NestFactory } from '@nestjs/core';
|
|
import { AppModule } from '@modules/app/module';
|
|
import { getEnvVars } from 'scripts/database-config-utils';
|
|
|
|
export class PopulateSSOConfigs1650485473528 implements MigrationInterface {
|
|
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
const entityManager = queryRunner.manager;
|
|
const nestApp = await NestFactory.createApplicationContext(await AppModule.register({ IS_GET_CONTEXT: true }));
|
|
|
|
const edition = getTooljetEdition() as TOOLJET_EDITIONS;
|
|
const { EncryptionService } = await import(`${await getImportPath(true, edition)}/encryption/service`);
|
|
const encryptionService = nestApp.get(EncryptionService);
|
|
|
|
const envVars = getEnvVars();
|
|
|
|
const isSingleOrganization = envVars.DISABLE_MULTI_WORKSPACE === 'true';
|
|
const enableSignUp = envVars.SSO_DISABLE_SIGNUP !== 'true';
|
|
const domain = envVars.SSO_RESTRICTED_DOMAIN;
|
|
|
|
const googleEnabled = !!envVars.SSO_GOOGLE_OAUTH2_CLIENT_ID;
|
|
const googleConfigs = {
|
|
clientId: envVars.SSO_GOOGLE_OAUTH2_CLIENT_ID,
|
|
};
|
|
|
|
const gitEnabled = !!envVars.SSO_GIT_OAUTH2_CLIENT_ID;
|
|
|
|
const gitConfigs = {
|
|
clientId: envVars.SSO_GIT_OAUTH2_CLIENT_ID,
|
|
clientSecret:
|
|
envVars.SSO_GIT_OAUTH2_CLIENT_SECRET &&
|
|
(await encryptionService.encryptColumnValue(
|
|
'ssoConfigs',
|
|
'clientSecret',
|
|
envVars.SSO_GIT_OAUTH2_CLIENT_SECRET
|
|
)),
|
|
};
|
|
|
|
const passwordEnabled = envVars.DISABLE_PASSWORD_LOGIN !== 'true';
|
|
|
|
const organizations: Organization[] = await entityManager.find(Organization, {
|
|
relations: ['ssoConfigs'],
|
|
select: ['ssoConfigs', 'id'],
|
|
});
|
|
|
|
if (organizations && organizations.length > 0) {
|
|
for (const organization of organizations) {
|
|
await entityManager.update(
|
|
Organization,
|
|
{ id: organization.id },
|
|
{ enableSignUp, ...(domain ? { domain } : {}) }
|
|
);
|
|
// adding form configs for organizations which does not have any
|
|
if (
|
|
!organization.ssoConfigs?.some((og) => {
|
|
og?.sso === 'form';
|
|
})
|
|
) {
|
|
await entityManager
|
|
.createQueryBuilder()
|
|
.insert()
|
|
.into(SSOConfigs, ['organizationId', 'sso', 'enabled'])
|
|
.values({
|
|
organizationId: organization.id,
|
|
sso: SSOType.FORM,
|
|
enabled: !isSingleOrganization ? true : passwordEnabled,
|
|
})
|
|
.execute();
|
|
}
|
|
if (
|
|
isSingleOrganization &&
|
|
googleEnabled &&
|
|
!organization.ssoConfigs?.some((og) => {
|
|
og?.sso === 'google';
|
|
})
|
|
) {
|
|
await entityManager
|
|
.createQueryBuilder()
|
|
.insert()
|
|
.into(SSOConfigs, ['organizationId', 'sso', 'enabled', 'configs'])
|
|
.values({
|
|
organizationId: organization.id,
|
|
sso: SSOType.GOOGLE,
|
|
enabled: googleEnabled,
|
|
configs: googleConfigs,
|
|
})
|
|
.execute();
|
|
}
|
|
|
|
if (
|
|
isSingleOrganization &&
|
|
gitEnabled &&
|
|
!organization.ssoConfigs?.some((og) => {
|
|
og?.sso === 'git';
|
|
})
|
|
) {
|
|
await entityManager
|
|
.createQueryBuilder()
|
|
.insert()
|
|
.into(SSOConfigs, ['organizationId', 'sso', 'enabled', 'configs'])
|
|
.values({
|
|
organizationId: organization.id,
|
|
sso: SSOType.GIT,
|
|
enabled: gitEnabled,
|
|
configs: gitConfigs,
|
|
})
|
|
.execute();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public async down(queryRunner: QueryRunner): Promise<void> {}
|
|
}
|