vodorod/Dorod-Sky
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bitwarden fix identity items (#1369)

Browse Source
This commit is contained in:
Shuchang Zheng
2024-12-10 22:12:45 -08:00
committed by GitHub
parent 3a626503b7
commit 4241cfe3f2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
skyvern/forge/sdk/services/bitwarden.py
View File

@@ -341,7 +341,6 @@ class BitwardenService:
items = json.loads(items_result.stdout) items = json.loads(items_result.stdout)
except json.JSONDecodeError: except json.JSONDecodeError:
raise BitwardenListItemsError("Failed to parse items JSON. Output: " + items_result.stdout) raise BitwardenListItemsError("Failed to parse items JSON. Output: " + items_result.stdout)
if not items: if not items:
raise BitwardenListItemsError( raise BitwardenListItemsError(
f"No items found in Bitwarden for identity key: {identity_key} in collection with ID: {collection_id}" f"No items found in Bitwarden for identity key: {identity_key} in collection with ID: {collection_id}"
@@ -349,14 +348,11 @@ class BitwardenService:
# Filter the identity items # Filter the identity items
# https://bitwarden.com/help/cli/#create lists the type of the identity items as 4 # https://bitwarden.com/help/cli/#create lists the type of the identity items as 4
identity_items = [item for item in items if item["type"] == 4]
if len(identity_items) != 1: # We may want to filter it by type in the future, but for now we just take the first item and check its identity fields
raise BitwardenListItemsError( # identity_items = [item for item in items if item["type"] == 4]
f"Expected exactly one identity item, but found {len(identity_items)} items for identity key: {identity_key} in collection with ID: {collection_id}"
)
identity_item = identity_items[0] identity_item = items[0]
sensitive_information: dict[str, str] = {} sensitive_information: dict[str, str] = {}
for field in identity_fields: for field in identity_fields:
@@ -368,7 +364,11 @@ class BitwardenService:
sensitive_information[field] = item["value"] sensitive_information[field] = item["value"]
break break
if field in identity_item["identity"] and field not in sensitive_information: if (
"identity" in identity_item
and field in identity_item["identity"]
and field not in sensitive_information
):
sensitive_information[field] = identity_item["identity"][field] sensitive_information[field] = identity_item["identity"][field]
return sensitive_information return sensitive_information