mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 20:38:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

doc fixes and minor code improvement

Browse source
This commit is contained in:
Hubert Chathi 2020-09-18 20:53:39 -04:00
parent b1b7215532
commit 4e2397a79d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/MatrixClientPeg.ts
View file

@ -271,11 +271,12 @@ class _MatrixClientPeg implements IMatrixClientPeg {
if (creds.olmAccount) { if (creds.olmAccount) {
console.log("got a dehydrated account"); console.log("got a dehydrated account");
const pickleKey = creds.pickleKey || "DEFAULT_KEY";
opts.deviceToImport = { opts.deviceToImport = {
olmDevice: { olmDevice: {
pickledAccount: creds.olmAccount.pickle(creds.pickleKey || "DEFAULT_KEY"), pickledAccount: creds.olmAccount.pickle(pickleKey),
sessions: [], sessions: [],
pickleKey: creds.pickleKey || "DEFAULT_KEY", pickleKey: pickleKey,
}, },
userId: creds.userId, userId: creds.userId,
deviceId: creds.deviceId, deviceId: creds.deviceId,
@ -293,7 +294,7 @@ class _MatrixClientPeg implements IMatrixClientPeg {
// set dehydration key after cross-signing gets set up -- we wait until // set dehydration key after cross-signing gets set up -- we wait until
// cross-signing is set up because we want to cross-sign the dehydrated // cross-signing is set up because we want to cross-sign the dehydrated
// key // device
const origGetSecretStorageKey = opts.cryptoCallbacks.getSecretStorageKey const origGetSecretStorageKey = opts.cryptoCallbacks.getSecretStorageKey
opts.cryptoCallbacks.getSecretStorageKey = async (keyinfo, ssssItemName) => { opts.cryptoCallbacks.getSecretStorageKey = async (keyinfo, ssssItemName) => {
const [name, key] = await origGetSecretStorageKey(keyinfo, ssssItemName); const [name, key] = await origGetSecretStorageKey(keyinfo, ssssItemName);
@ -302,6 +303,8 @@ class _MatrixClientPeg implements IMatrixClientPeg {
} }
if (creds.rehydrationKey) { if (creds.rehydrationKey) {
// cache the key so that the SSSS prompt tries using it without
// prompting the user
cacheDehydrationKey(creds.rehydrationKey, creds.rehydrationKeyInfo); cacheDehydrationKey(creds.rehydrationKey, creds.rehydrationKeyInfo);
} }