Remove remaining support for outdated .well-known settings (#30702)
* Remove remaining support for `secure_backup_setup_methods` option Support for this .well-known setting had been removed everywhere except in a rather obscure corner of the code. There are many other problems with this area (https://github.com/element-hq/element-web/issues/29171) but removing support for the outdated option is an easy step. * Remove remaining `secure_backup_required` setting support Again, this setting was only honoured in the obscure "New Recovery Method" flow.
This commit is contained in:
@@ -30,8 +30,6 @@ export interface IE2EEWellKnown {
|
||||
* Disables the option to enable encryption in room settings for all new and existing rooms
|
||||
*/
|
||||
force_disable?: boolean;
|
||||
secure_backup_required?: boolean;
|
||||
secure_backup_setup_methods?: SecureBackupSetupMethod[];
|
||||
}
|
||||
|
||||
export interface ITileServerWellKnown {
|
||||
@@ -74,28 +72,3 @@ export function getEmbeddedPagesWellKnown(matrixClient: MatrixClient | undefined
|
||||
export function embeddedPagesFromWellKnown(clientWellKnown?: IClientWellKnown): IEmbeddedPagesWellKnown {
|
||||
return clientWellKnown?.[EMBEDDED_PAGES_WK_PROPERTY];
|
||||
}
|
||||
|
||||
export function isSecureBackupRequired(matrixClient: MatrixClient): boolean {
|
||||
return getE2EEWellKnown(matrixClient)?.["secure_backup_required"] === true;
|
||||
}
|
||||
|
||||
export enum SecureBackupSetupMethod {
|
||||
Key = "key",
|
||||
Passphrase = "passphrase",
|
||||
}
|
||||
|
||||
export function getSecureBackupSetupMethods(matrixClient: MatrixClient): SecureBackupSetupMethod[] {
|
||||
const wellKnown = getE2EEWellKnown(matrixClient);
|
||||
if (
|
||||
!wellKnown ||
|
||||
!wellKnown["secure_backup_setup_methods"] ||
|
||||
!wellKnown["secure_backup_setup_methods"].length ||
|
||||
!(
|
||||
wellKnown["secure_backup_setup_methods"].includes(SecureBackupSetupMethod.Key) ||
|
||||
wellKnown["secure_backup_setup_methods"].includes(SecureBackupSetupMethod.Passphrase)
|
||||
)
|
||||
) {
|
||||
return [SecureBackupSetupMethod.Key, SecureBackupSetupMethod.Passphrase];
|
||||
}
|
||||
return wellKnown["secure_backup_setup_methods"];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user