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

Namespace default secret storage key methods

Browse Source
This commit is contained in:
J. Ryan Stinnett
2019-11-18 15:17:06 +00:00
parent 730f7d3dff
commit 5f02c4b5ad
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/unit/crypto/secrets.spec.js
View File

@@ -168,7 +168,7 @@ describe("Secrets", function() {
); );
// we don't await on this because it waits for the event to come down the sync // we don't await on this because it waits for the event to come down the sync
// which won't happen in the test setup // which won't happen in the test setup
alice.setDefaultKeyId(newKeyId); alice.setDefaultSecretStorageKeyId(newKeyId);
await alice.storeSecret("foo", "bar"); await alice.storeSecret("foo", "bar");
const accountData = alice.getAccountData('foo'); const accountData = alice.getAccountData('foo');

8
src/client.js
View File

@@ -1115,7 +1115,7 @@ MatrixClient.prototype.checkEventSenderTrust = async function(event) {
* Get the current default key ID for encrypting secrets. * Get the current default key ID for encrypting secrets.
* The Secure Secret Storage API is currently UNSTABLE and may change without notice. * The Secure Secret Storage API is currently UNSTABLE and may change without notice.
* *
* @function module:client~MatrixClient#getDefaultKeyId * @function module:client~MatrixClient#getDefaultSecretStorageKeyId
* *
* @return {string} The default key ID or null if no default key ID is set * @return {string} The default key ID or null if no default key ID is set
*/ */
@@ -1124,7 +1124,7 @@ MatrixClient.prototype.checkEventSenderTrust = async function(event) {
* Set the current default key ID for encrypting secrets. * Set the current default key ID for encrypting secrets.
* The Secure Secret Storage API is currently UNSTABLE and may change without notice. * The Secure Secret Storage API is currently UNSTABLE and may change without notice.
* *
* @function module:client~MatrixClient#setDefaultKeyId * @function module:client~MatrixClient#setDefaultSecretStorageKeyId
* @param {string} keyId The new default key ID * @param {string} keyId The new default key ID
*/ */
@@ -1134,8 +1134,8 @@ wrapCryptoFuncs(MatrixClient, [
"getSecret", "getSecret",
"isSecretStored", "isSecretStored",
"requestSecret", "requestSecret",
"getDefaultKeyId", "getDefaultSecretStorageKeyId",
"setDefaultKeyId", "setDefaultSecretStorageKeyId",
]); ]);
/** /**

4
src/crypto/index.js
View File

@@ -299,11 +299,11 @@ Crypto.prototype.requestSecret = function(name, devices) {
return this._secretStorage.request(name, devices); return this._secretStorage.request(name, devices);
}; };
Crypto.prototype.getDefaultKeyId = function() { Crypto.prototype.getDefaultSecretStorageKeyId = function() {
return this._secretStorage.getDefaultKeyId(); return this._secretStorage.getDefaultKeyId();
}; };
Crypto.prototype.setDefaultKeyId = function(k) { Crypto.prototype.setDefaultSecretStorageKeyId = function(k) {
return this._secretStorage.setDefaultKeyId(k); return this._secretStorage.setDefaultKeyId(k);
}; };