Skip to content

Update functional.py - fixes #102 #103

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
adorton-adobe merged 2 commits into from
Aug 5, 2022
Merged

Update functional.py - fixes #102 #103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5db47b
Update functional.py - fixes #102
Luci2015 Jul 29, 2022
a73a1ec
Update functional.py
Luci2015 Aug 3, 2022
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
10 changes: 6 additions & 4 deletions umapi_client/functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,15 @@ def __init__(self, id_type=IdentityTypes.adobeID, email=None, username=None, dom
raise ArgumentError("No user identity specified.")
elif not domain:
raise ArgumentError("Both username and domain must be specified")

if username:
Action.__init__(self, user=username, domain=self.domain, **kwargs)
elif id_type == IdentityTypes.adobeID:

if id_type == IdentityTypes.adobeID:
# by default if two users have the same email address, the UMAPI server will prefer the matching
# Federated or Enterprise ID user; so we use the undocumented option to prefer the AdobeID match
Action.__init__(self, user=email, useAdobeID=True, **kwargs)
elif username and '@' in username:
Action.__init__(self, user=username, **kwargs)
elif username and '@' not in username:
Action.__init__(self, user=username, domain=self.domain, **kwargs)
else:
Action.__init__(self, user=email, **kwargs)

Expand Down