access cross-signing callbacks via method

This commit is contained in:
Zoe 2020-03-05 10:45:37 +00:00
parent 4396d85d1f
commit 26177a19d5

View file

@ -142,13 +142,13 @@ const onSecretRequested = async function({
console.log(`CrossSigningManager: Ignoring request from untrusted device ${deviceId}`); console.log(`CrossSigningManager: Ignoring request from untrusted device ${deviceId}`);
return; return;
} }
const crossSigning = client._crypto._crossSigningInfo; const callbacks = client.getCrossSigningCacheCallbacks();
if (!crossSigning._cacheCallbacks.getCrossSigningKeyCache) return; if (!callbacks.getCrossSigningKeyCache) return;
if (name === "m.key.self_signing") { if (name === "m.key.self_signing") {
const key = await crossSigning._cacheCallbacks.getCrossSigningKeyCache("self_signing"); const key = await callbacks.getCrossSigningKeyCache("self_signing");
return key && encodeBase64(key); return key && encodeBase64(key);
} else if (name === "m.key.user_signing") { } else if (name === "m.key.user_signing") {
const key = await crossSigning._cacheCallbacks.getCrossSigningKeyCache("user_signing"); const key = await callbacks.getCrossSigningKeyCache("user_signing");
return key && encodeBase64(key); return key && encodeBase64(key);
} }
console.warn("onSecretRequested didn't recognise the secret named ", name); console.warn("onSecretRequested didn't recognise the secret named ", name);