OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5057 from matrix-org/uhoreg/keytar_logging 

add logging for keytar/pickle key
pull/21833/head
Hubert Chathi 2020-07-29 12:08:30 -04:00 committed by GitHub
parent 79348b44cb 0cf10bb69a
commit 6a9fe35fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Lifecycle.js
View File

@ -306,6 +306,11 @@ async function _restoreFromLocalStorage(opts) {
}
const pickleKey = await PlatformPeg.get().getPickleKey(userId, deviceId);
if (pickleKey) {
console.log("Got pickle key");
} else {
console.log("No pickle key available");
}
console.log(`Restoring session for ${userId}`);
await _doSetLoggedIn({
@ -364,6 +369,12 @@ export async function setLoggedIn(credentials) {
? await PlatformPeg.get().createPickleKey(credentials.userId, credentials.deviceId)
: null;
if (pickleKey) {
console.log("Created pickle key");
} else {
console.log("Pickle key not created");
}
return _doSetLoggedIn(Object.assign({}, credentials, {pickleKey}), true);
}
@ -501,6 +512,14 @@ function _persistCredentialsToLocalStorage(credentials) {
localStorage.setItem("mx_access_token", credentials.accessToken);
localStorage.setItem("mx_is_guest", JSON.stringify(credentials.guest));
if (credentials.pickleKey) {
localStorage.setItem("mx_has_pickle_key", true);
} else {
if (localStorage.getItem("mx_has_pickle_key")) {
console.error("Expected a pickle key, but none provided. Encryption may not work.");
}
}
// if we didn't get a deviceId from the login, leave mx_device_id unset,
// rather than setting it to "undefined".
//