Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

add logging for keytar/pickle key #5057

Merged
merged 2 commits into from
Jul 29, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/Lifecycle.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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".
//
Expand Down