awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-14 17:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebase issue with deleted files

Browse Source
This commit is contained in:
carlosmonastyrski
2025-03-14 08:54:14 -03:00
parent c0de4ae3ee
commit 4f4764dfcd
11 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/db/migrations/20250311105617_add-share-to-anyone-setting-to-organizations.ts
+10 -4
View File
@@ -4,11 +4,14 @@ import { TableName } from "../schemas";
export async function up(knex: Knex): Promise<void> {
if (await knex.schema.hasTable(TableName.Organization)) {
const hasSecretShareToAnyoneCol = await knex.schema.hasColumn(TableName.Organization, "secretShareSendToAnyone");
const hasSecretShareToAnyoneCol = await knex.schema.hasColumn(
TableName.Organization,
"allowSecretSharingOutsideOrganization"
);
if (!hasSecretShareToAnyoneCol) {
await knex.schema.alterTable(TableName.Organization, (t) => {
t.boolean("secretShareSendToAnyone").defaultTo(true);
t.boolean("allowSecretSharingOutsideOrganization").defaultTo(true);
});
}
}
@@ -16,10 +19,13 @@ export async function up(knex: Knex): Promise<void> {
export async function down(knex: Knex): Promise<void> {
if (await knex.schema.hasTable(TableName.Organization)) {
const hasSecretShareToAnyoneCol = await knex.schema.hasColumn(TableName.Organization, "secretShareSendToAnyone");
const hasSecretShareToAnyoneCol = await knex.schema.hasColumn(
TableName.Organization,
"allowSecretSharingOutsideOrganization"
);
if (hasSecretShareToAnyoneCol) {
await knex.schema.alterTable(TableName.Organization, (t) => {
t.dropColumn("secretShareSendToAnyone");
t.dropColumn("allowSecretSharingOutsideOrganization");
});
}
}
backend/src/db/schemas/organizations.ts
+1 -1
View File
@@ -23,7 +23,7 @@ export const OrganizationsSchema = z.object({
defaultMembershipRole: z.string().default("member"),
enforceMfa: z.boolean().default(false),
selectedMfaMethod: z.string().nullable().optional(),
secretShareSendToAnyone: z.boolean().default(true).nullable().optional()
allowSecretSharingOutsideOrganization: z.boolean().default(true).nullable().optional()
});
export type TOrganizations = z.infer<typeof OrganizationsSchema>;