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.

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

Fix keyring error handling #1138

Merged
merged 14 commits into from Jan 2, 2021
Merged

Conversation

KarimPwnz
Copy link
Contributor

This code is intended to fix how jrnl handles keyring errors: if keyring retrieval fails, the user is now asked to enter the password manually. Additionally, the message "Failed to retrieve keyring" is displayed if the keyring exists. (This fixes #1020.)

I've also generalized the keyring tests and implemented those relevant here.

Checklist

  • I have read the contributing doc.
  • I have included a link to the relevant issue number.
  • I have tested this code locally.
  • I have checked to ensure there aren't other open pull requests
    for the same issue.
  • I have written new tests for these changes, as needed.
  • All tests pass.

features/password.feature Outdated Show resolved Hide resolved
Copy link
Member

@wren wren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both great PRs. Thank you!

@wren wren added the bug Something isn't working label Jan 2, 2021
@wren wren changed the title Fix keyring error handling and update its tests Fix keyring error handling Jan 2, 2021
@wren wren merged commit 57de4f9 into jrnl-org:develop Jan 2, 2021
@KarimPwnz KarimPwnz deleted the bugfix-keyringlocked branch January 2, 2021 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error if password exists in keyring, but retrieval fails for any reason
2 participants