Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix key error after the first login #7359

Merged
merged 1 commit into from
Aug 9, 2024
Merged

Fix key error after the first login #7359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions src/common/api/main/PageContextLoginListener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,16 @@ export class PageContextLoginListener implements LoginListener {
// Update the credentials after the full login.
// It is needed because we added encryptedPassphraseKey to credentials which is only
// available after the full login which happens async.
const storedCredentials = await this.credentialsProvider.getDecryptedCredentialsByUserId(credentials.userId)
if (storedCredentials != null) {
const updatedCredentials = credentialsToUnencrypted(credentials, storedCredentials.databaseKey)
await this.credentialsProvider.store(updatedCredentials)

// First try to fetch credentials info and only then try to get decrypted credentials as it is not valid to
// call `getDecryptedCredentialsByUserId()` without storing any credentials first.
wec43 marked this conversation as resolved.
Show resolved Hide resolved
const areCredentialsStored = (await this.credentialsProvider.getCredentialsInfoByUserId(credentials.userId)) != null
if (areCredentialsStored) {
const storedCredentials = await this.credentialsProvider.getDecryptedCredentialsByUserId(credentials.userId)
if (storedCredentials != null) {
const updatedCredentials = credentialsToUnencrypted(credentials, storedCredentials.databaseKey)
await this.credentialsProvider.store(updatedCredentials)
}
}

this.loginPromise.resolve()
Expand Down