matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

Rename device signing auth param

Browse Source
This commit is contained in:
J. Ryan Stinnett
2019-11-29 17:50:59 +00:00
parent ce2059a4b9
commit 14907065d7
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.js
View File

@@ -1051,8 +1051,8 @@ MatrixClient.prototype.checkEventSenderTrust = async function(event) {
* for use. * for use.
* *
* @function module:client~MatrixClient#bootstrapSecretStorage * @function module:client~MatrixClient#bootstrapSecretStorage
* @param {function} [opts.doInteractiveAuthFlow] Optional. Function called to * @param {function} [opts.authUploadDeviceSigningKeys] Optional. Function
* await an interactive auth request. * called to await an interactive auth flow when uploading device signing keys.
* Args: * Args:
* {function} A function that makes the request requiring auth. Receives the * {function} A function that makes the request requiring auth. Receives the
* auth data as an object. * auth data as an object.

16
src/crypto/index.js
View File

@@ -323,14 +323,14 @@ Crypto.prototype.init = async function() {
* up, then no changes are made, so this is safe to run to ensure secret storage * up, then no changes are made, so this is safe to run to ensure secret storage
* is ready for use. * is ready for use.
* *
* @param {function} [opts.doInteractiveAuthFlow] Optional. Function called to * @param {function} [opts.authUploadDeviceSigningKeys] Optional. Function
* await an interactive auth request. * called to await an interactive auth flow when uploading device signing keys.
* Args: * Args:
* {function} A function that makes the request requiring auth. Receives the * {function} A function that makes the request requiring auth. Receives the
* auth data as an object. * auth data as an object.
*/ */
Crypto.prototype.bootstrapSecretStorage = async function({ Crypto.prototype.bootstrapSecretStorage = async function({
doInteractiveAuthFlow, authUploadDeviceSigningKeys,
} = {}) { } = {}) {
logger.log("Bootstrapping Secure Secret Storage"); logger.log("Bootstrapping Secure Secret Storage");
@@ -354,7 +354,7 @@ Crypto.prototype.bootstrapSecretStorage = async function({
); );
await this.resetCrossSigningKeys( await this.resetCrossSigningKeys(
CrossSigningLevel.MASTER, CrossSigningLevel.MASTER,
{ doInteractiveAuthFlow }, { authUploadDeviceSigningKeys },
); );
crossSigningKeysReset = true; crossSigningKeysReset = true;
} }
@@ -440,14 +440,14 @@ Crypto.prototype.checkPrivateKey = function(privateKey, expectedPublicKey) {
* @param {CrossSigningLevel} [level] the level of cross-signing to reset. New * @param {CrossSigningLevel} [level] the level of cross-signing to reset. New
* keys will be created for the given level and below. Defaults to * keys will be created for the given level and below. Defaults to
* regenerating all keys. * regenerating all keys.
* @param {function} [opts.doInteractiveAuthFlow] Optional. Function called to * @param {function} [opts.authUploadDeviceSigningKeys] Optional. Function
* await an interactive auth request. * called to await an interactive auth flow when uploading device signing keys.
* Args: * Args:
* {function} A function that makes the request requiring auth. Receives the * {function} A function that makes the request requiring auth. Receives the
* auth data as an object. * auth data as an object.
*/ */
Crypto.prototype.resetCrossSigningKeys = async function(level, { Crypto.prototype.resetCrossSigningKeys = async function(level, {
doInteractiveAuthFlow = async func => await func(), authUploadDeviceSigningKeys = async func => await func(),
} = {}) { } = {}) {
logger.info(`Resetting cross-signing keys at level ${level}`); logger.info(`Resetting cross-signing keys at level ${level}`);
// Copy old keys (usually empty) in case we need to revert // Copy old keys (usually empty) in case we need to revert
@@ -462,7 +462,7 @@ Crypto.prototype.resetCrossSigningKeys = async function(level, {
for (const [name, key] of Object.entries(this._crossSigningInfo.keys)) { for (const [name, key] of Object.entries(this._crossSigningInfo.keys)) {
keys[name + "_key"] = key; keys[name + "_key"] = key;
} }
await doInteractiveAuthFlow(async authDict => { await authUploadDeviceSigningKeys(async authDict => {
await this._baseApis.uploadDeviceSigningKeys(authDict, keys); await this._baseApis.uploadDeviceSigningKeys(authDict, keys);
}); });