mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 19:56:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5783 from uhoreg/fix_dehydration

Browse source 
Don't overwrite callback with undefined if no customization provided
This commit is contained in:
Hubert Chathi 2021-03-22 21:52:08 -04:00 committed by GitHub
commit 3f74c43fc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/MatrixClientPeg.ts
View file

@ -296,10 +296,11 @@ class _MatrixClientPeg implements IMatrixClientPeg {
// These are always installed regardless of the labs flag so that // These are always installed regardless of the labs flag so that
// cross-signing features can toggle on without reloading and also be // cross-signing features can toggle on without reloading and also be
// accessed immediately after login. // accessed immediately after login.
const customisedCallbacks = { Object.assign(opts.cryptoCallbacks, crossSigningCallbacks);
getDehydrationKey: SecurityCustomisations.getDehydrationKey, if (SecurityCustomisations.getDehydrationKey) {
}; opts.cryptoCallbacks.getDehydrationKey =
Object.assign(opts.cryptoCallbacks, crossSigningCallbacks, customisedCallbacks); SecurityCustomisations.getDehydrationKey;
}
this.matrixClient = createMatrixClient(opts); this.matrixClient = createMatrixClient(opts);