matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

fix lint and merge issues

Browse Source
This commit is contained in:
Hubert Chathi
2020-09-18 18:08:17 -04:00
parent add36ca4ce
commit b1b7215532
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Login.js
View File

@@ -25,7 +25,7 @@ import {
cacheDehydrationKey, cacheDehydrationKey,
confirmToDismiss, confirmToDismiss,
getDehydrationKeyCache, getDehydrationKeyCache,
} from "./CrossSigningManager"; } from "./SecurityManager";
import Matrix from "matrix-js-sdk"; import Matrix from "matrix-js-sdk";
import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase'; import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase';
import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey'; import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
@@ -173,8 +173,8 @@ export async function sendLoginRequest(hsUrl, isUrl, loginType, loginParams) {
baseUrl: hsUrl, baseUrl: hsUrl,
idBaseUrl: isUrl, idBaseUrl: isUrl,
cryptoCallbacks: { cryptoCallbacks: {
getDehydrationKey getDehydrationKey,
} },
}); });
const data = await client.loginWithRehydration(null, loginType, loginParams); const data = await client.loginWithRehydration(null, loginType, loginParams);

2
src/SecurityManager.js
View File

@@ -91,7 +91,7 @@ async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
// if we dehydrated a device, see if that key works for SSSS // if we dehydrated a device, see if that key works for SSSS
if (dehydrationInfo.key) { if (dehydrationInfo.key) {
try { try {
if (await MatrixClientPeg.get().checkSecretStorageKey(dehydrationInfo.key, info)) { if (await MatrixClientPeg.get().checkSecretStorageKey(dehydrationInfo.key, keyInfo)) {
const key = dehydrationInfo.key; const key = dehydrationInfo.key;
// Save to cache to avoid future prompts in the current session // Save to cache to avoid future prompts in the current session
if (isCachingAllowed()) { if (isCachingAllowed()) {