From debf5e0ac74c2a08b0092fa9ec868f1036bcd941 Mon Sep 17 00:00:00 2001 From: Hugh Nimmo-Smith Date: Thu, 17 Aug 2023 18:24:15 +0100 Subject: [PATCH] All user_consent config must be disabled --- tools/syn2mas/src/advisor.mts | 4 ++-- tools/syn2mas/src/types/SynapseConfig.d.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/syn2mas/src/advisor.mts b/tools/syn2mas/src/advisor.mts index 2ac797cf..6d885fb6 100644 --- a/tools/syn2mas/src/advisor.mts +++ b/tools/syn2mas/src/advisor.mts @@ -78,8 +78,8 @@ export async function advisor(argv?: string[]): Promise { if (synapseConfig.enable_registration_captcha) { error("Synapse config has registration CAPTCHA enabled which isn't supported by MAS: https://github.com/matrix-org/matrix-authentication-service/issues/138"); } - if (synapseConfig.user_consent?.require_at_registration) { - warn("Synapse config has user_consent.require_at_registration enabled which will need to be disabled after migration"); + if (synapseConfig.user_consent) { + warn("Synapse config has user_consent configured which will need to be disabled after migration"); } const usersWithoutEmailAddress = await count(synapse.count("*").from("users").leftOuterJoin("user_threepids", "users.name", "user_threepids.user_id").whereNull("user_threepids.user_id")); diff --git a/tools/syn2mas/src/types/SynapseConfig.d.ts b/tools/syn2mas/src/types/SynapseConfig.d.ts index 9f3f741c..49de636d 100644 --- a/tools/syn2mas/src/types/SynapseConfig.d.ts +++ b/tools/syn2mas/src/types/SynapseConfig.d.ts @@ -48,4 +48,5 @@ export interface SynapseConfig { }; enable_registration_captcha?: boolean; enable_registration?: boolean; + user_consent?: {}; }