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

Add null check for credentials without emails (#616)

Browse Source
This commit is contained in:
Kerem Yilmaz
2024-07-18 09:07:22 -07:00
committed by GitHub
parent c87aeddfcc
commit 51816c0f60
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,9 @@ from skyvern.exceptions import (
LOG = structlog.get_logger() LOG = structlog.get_logger()
def is_valid_email(email: str) -> bool: def is_valid_email(email: str | None) -> bool:
if not email:
return False
pattern = r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" pattern = r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"
return re.match(pattern, email) is not None return re.match(pattern, email) is not None
@@ -140,10 +142,9 @@ class BitwardenService:
# if no cred matches the rule, return the first one. # if no cred matches the rule, return the first one.
# TODO: For now hard code to choose the first valid email username # TODO: For now hard code to choose the first valid email username
for cred in credentials: for cred in credentials:
if is_valid_email(cred.get(BitwardenConstants.USERNAME, "")): if is_valid_email(cred.get(BitwardenConstants.USERNAME)):
return cred return cred
LOG.warning("No credential in Bitwarden matches the rule, returning the first match")
LOG.warning("No credential in Bitwarden matches the rule, returning the frist match")
return credentials[0] return credentials[0]
finally: finally:
# Step 4: Log out # Step 4: Log out