awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make LDAP config fields not nullable

Browse Source
This commit is contained in:
Tuan Dang
2024-03-10 14:44:18 -07:00
parent b641bbf229
commit 06f3a6d262
3 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/db/migrations/20240305165532_ldap-config.ts
View File

@@ -11,16 +11,16 @@ export async function up(knex: Knex): Promise<void> {
t.foreign("orgId").references("id").inTable(TableName.Organization).onDelete("CASCADE"); t.foreign("orgId").references("id").inTable(TableName.Organization).onDelete("CASCADE");
t.boolean("isActive").notNullable(); t.boolean("isActive").notNullable();
t.string("url").notNullable(); t.string("url").notNullable();
t.string("encryptedBindDN"); t.string("encryptedBindDN").notNullable();
t.string("bindDNIV"); t.string("bindDNIV").notNullable();
t.string("bindDNTag"); t.string("bindDNTag").notNullable();
t.string("encryptedBindPass"); t.string("encryptedBindPass").notNullable();
t.string("bindPassIV"); t.string("bindPassIV").notNullable();
t.string("bindPassTag"); t.string("bindPassTag").notNullable();
t.string("searchBase").notNullable(); t.string("searchBase").notNullable();
t.text("encryptedCACert"); t.text("encryptedCACert").notNullable();
t.string("caCertIV"); t.string("caCertIV").notNullable();
t.string("caCertTag"); t.string("caCertTag").notNullable();
t.timestamps(true, true, true); t.timestamps(true, true, true);
}); });
} }

18
backend/src/db/schemas/ldap-configs.ts
View File

@@ -12,16 +12,16 @@ export const LdapConfigsSchema = z.object({
orgId: z.string().uuid(), orgId: z.string().uuid(),
isActive: z.boolean(), isActive: z.boolean(),
url: z.string(), url: z.string(),
encryptedBindDN: z.string().nullable().optional(), encryptedBindDN: z.string(),
bindDNIV: z.string().nullable().optional(), bindDNIV: z.string(),
bindDNTag: z.string().nullable().optional(), bindDNTag: z.string(),
encryptedBindPass: z.string().nullable().optional(), encryptedBindPass: z.string(),
bindPassIV: z.string().nullable().optional(), bindPassIV: z.string(),
bindPassTag: z.string().nullable().optional(), bindPassTag: z.string(),
searchBase: z.string(), searchBase: z.string(),
encryptedCACert: z.string().nullable().optional(), encryptedCACert: z.string(),
caCertIV: z.string().nullable().optional(), caCertIV: z.string(),
caCertTag: z.string().nullable().optional(), caCertTag: z.string(),
createdAt: z.date(), createdAt: z.date(),
updatedAt: z.date() updatedAt: z.date()
}); });

21
backend/src/ee/services/scim/scim-service.ts
View File

@@ -281,15 +281,18 @@ export const scimServiceFactory = ({
} }
const appCfg = getConfig(); const appCfg = getConfig();
await smtpService.sendMail({
template: SmtpTemplates.ScimUserProvisioned, if (email) {
subjectLine: "Infisical organization invitation", await smtpService.sendMail({
recipients: email ? [email] : [], template: SmtpTemplates.ScimUserProvisioned,
substitutions: { subjectLine: "Infisical organization invitation",
organizationName: org.name, recipients: [email],
callback_url: `${appCfg.SITE_URL}/api/v1/sso/redirect/saml2/organizations/${org.slug}` substitutions: {
} organizationName: org.name,
}); callback_url: `${appCfg.SITE_URL}/api/v1/sso/redirect/saml2/organizations/${org.slug}`
}
});
}
return buildScimUser({ return buildScimUser({
userId: user.id, userId: user.id,