Skip to content

Always pass account when specified #55

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

Merged
jscarle merged 1 commit into from
Nov 8, 2023
Merged

Always pass account when specified #55

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
6 changes: 4 additions & 2 deletions OnePassword.NET/OnePasswordManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,10 @@ private string Op(string command, IEnumerable<string> input, bool returnError)
case Mode.Interactive:
case Mode.AppIntegrated:
default:
var passAccount = !(_mode == Mode.AppIntegrated || IsExcludedCommand(command, _excludedAccountCommands));
if (passAccount && _account.Length == 0)
var excluded = IsExcludedCommand(command, _excludedAccountCommands);
var requireAccount = _mode != Mode.AppIntegrated && !excluded;
var passAccount = _account.Length != 0 && !excluded;
if (requireAccount && !passAccount)
throw new InvalidOperationException("Cannot execute command because account has not been set.");

var passSession = !(_mode == Mode.AppIntegrated || IsExcludedCommand(command, _excludedSessionCommands));
Expand Down