From 4d0f14898da6c1a06534cdd170a5b802a0ba41e4 Mon Sep 17 00:00:00 2001 From: Liangjun Song <146005915+adai26@users.noreply.github.com> Date: Wed, 30 Jul 2025 17:05:07 +0100 Subject: [PATCH] Merge pull request #27518 from overleaf/tm-revert-scriptrunner-ensured-secondary Remove ScriptRunner usage in institution user checks and SSO ID migration scripts GitOrigin-RevId: 69bf575f879516e8daeb068f6911856c9d6f226c --- services/web/scripts/check_institution_users.mjs | 4 ++-- services/web/scripts/check_saml_emails.mjs | 1 + services/web/scripts/sso_id_migration_check.mjs | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/web/scripts/check_institution_users.mjs b/services/web/scripts/check_institution_users.mjs index 5cb4fb7973..e571ecaa47 100644 --- a/services/web/scripts/check_institution_users.mjs +++ b/services/web/scripts/check_institution_users.mjs @@ -1,7 +1,7 @@ import InstitutionsManager from '../app/src/Features/Institutions/InstitutionsManager.js' import { ensureRunningOnMongoSecondaryWithTimeout } from './helpers/env_variable_helper.mjs' -import { scriptRunner } from './lib/ScriptRunner.mjs' +// ScriptRunner can not be used when using this assertion ensureRunningOnMongoSecondaryWithTimeout(300000) const institutionId = parseInt(process.argv[2]) @@ -19,7 +19,7 @@ async function main() { } try { - await scriptRunner(main) + await main() } catch (error) { console.error(error) process.exit(1) diff --git a/services/web/scripts/check_saml_emails.mjs b/services/web/scripts/check_saml_emails.mjs index 03625b4f51..3043e5bd64 100644 --- a/services/web/scripts/check_saml_emails.mjs +++ b/services/web/scripts/check_saml_emails.mjs @@ -1,6 +1,7 @@ import SAMLEmailBatchCheck from '../modules/saas-authentication/app/src/SAML/SAMLEmailBatchCheck.mjs' import { ensureRunningOnMongoSecondaryWithTimeout } from './helpers/env_variable_helper.mjs' +// ScriptRunner can not be used when using this assertion ensureRunningOnMongoSecondaryWithTimeout(300000) const startInstitutionId = parseInt(process.argv[2]) diff --git a/services/web/scripts/sso_id_migration_check.mjs b/services/web/scripts/sso_id_migration_check.mjs index 9638f6b960..e8d0b03833 100644 --- a/services/web/scripts/sso_id_migration_check.mjs +++ b/services/web/scripts/sso_id_migration_check.mjs @@ -1,7 +1,7 @@ import SAMLUserIdMigrationHandler from '../modules/saas-authentication/app/src/SAML/SAMLUserIdMigrationHandler.mjs' import { ensureRunningOnMongoSecondaryWithTimeout } from './helpers/env_variable_helper.mjs' -import { scriptRunner } from './lib/ScriptRunner.mjs' +// ScriptRunner can not be used when using this assertion ensureRunningOnMongoSecondaryWithTimeout(300000) const institutionId = parseInt(process.argv[2]) @@ -11,7 +11,7 @@ const emitUsers = process.argv.includes('--emit-users') console.log('Checking SSO user ID migration for institution:', institutionId) try { - await scriptRunner(main) + await main() } catch (error) { console.error(error) process.exit(1)