Fix finding users by other indexes.
Fix finding users by other indexes.

Previously, if an email was given we would *only* query for email. But
for “upserts” we want to find a single match for any of the given
credentials, so adjust it to build all fields into one query.

DoSomething/northstar,DoSomething/northstar,DoSomething/northstar