diff --git a/server/setup/scriptsPg/1.19.0.ts b/server/setup/scriptsPg/1.19.0.ts index 91520a899..8d65d7807 100644 --- a/server/setup/scriptsPg/1.19.0.ts +++ b/server/setup/scriptsPg/1.19.0.ts @@ -619,6 +619,14 @@ export default async function migration() { `); } + // clear the sso, applyRules, and emailWhitelistEnabled columns on all resources since that information is now in the resource policies + await db.execute(sql` + UPDATE "resources" + SET "sso" = null, + "applyRules" = null, + "emailWhitelistEnabled" = null + `); + await db.execute(sql`COMMIT`); console.log( `Migrated inline resource policies for ${existingResources.length} resource(s)` diff --git a/server/setup/scriptsSqlite/1.19.0.ts b/server/setup/scriptsSqlite/1.19.0.ts index d76535225..809340d94 100644 --- a/server/setup/scriptsSqlite/1.19.0.ts +++ b/server/setup/scriptsSqlite/1.19.0.ts @@ -360,42 +360,6 @@ export default async function migration() { ALTER TABLE 'targets' ADD 'authToken' text; ` ).run(); - - // remove not null/default from sso, applyRules, and emailWhitelistEnabled in preparation for resource policies - db.prepare( - `ALTER TABLE 'resources' ADD COLUMN 'sso2' integer;` - ).run(); - db.prepare(`UPDATE 'resources' SET 'sso2' = 'sso';`).run(); - db.prepare(`ALTER TABLE 'resources' DROP COLUMN 'sso';`).run(); - db.prepare( - `ALTER TABLE 'resources' RENAME COLUMN 'sso2' TO 'sso';` - ).run(); - - db.prepare( - `ALTER TABLE 'resources' ADD COLUMN 'applyRules2' integer;` - ).run(); - db.prepare( - `UPDATE 'resources' SET 'applyRules2' = 'applyRules';` - ).run(); - db.prepare( - `ALTER TABLE 'resources' DROP COLUMN 'applyRules';` - ).run(); - db.prepare( - `ALTER TABLE 'resources' RENAME COLUMN 'applyRules2' TO 'applyRules';` - ).run(); - - db.prepare( - `ALTER TABLE 'resources' ADD COLUMN 'emailWhitelistEnabled2' integer;` - ).run(); - db.prepare( - `UPDATE 'resources' SET 'emailWhitelistEnabled2' = 'emailWhitelistEnabled';` - ).run(); - db.prepare( - `ALTER TABLE 'resources' DROP COLUMN 'emailWhitelistEnabled';` - ).run(); - db.prepare( - `ALTER TABLE 'resources' RENAME COLUMN 'emailWhitelistEnabled2' TO 'emailWhitelistEnabled';` - ).run(); })(); const existingResources = db @@ -716,6 +680,25 @@ export default async function migration() { deleteResourceRules.run(resource.resourceId); deleteResourceWhitelist.run(resource.resourceId); } + // remove not null/default from sso, applyRules, and emailWhitelistEnabled in preparation for resource policies + db.prepare(`ALTER TABLE 'resources' DROP COLUMN 'sso';`).run(); + db.prepare( + `ALTER TABLE 'resources' ADD COLUMN 'sso' integer;` + ).run(); + + db.prepare( + `ALTER TABLE 'resources' DROP COLUMN 'applyRules';` + ).run(); + db.prepare( + `ALTER TABLE 'resources' ADD COLUMN 'applyRules' integer;` + ).run(); + + db.prepare( + `ALTER TABLE 'resources' DROP COLUMN 'emailWhitelistEnabled';` + ).run(); + db.prepare( + `ALTER TABLE 'resources' ADD COLUMN 'emailWhitelistEnabled' integer;` + ).run(); }); migrateInlinePolicies();