Skip to content
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

Finalize authorize_with_* methods #221

Merged
merged 3 commits into from
Nov 30, 2023
Merged

Finalize authorize_with_* methods #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c2a1b3
Finalize authorize_with_* methods
blairworkos Nov 30, 2023
052796c
Apply suggested changes
blairworkos Nov 30, 2023
1bbc208
Fix description of authenticate_with_code
blairworkos Nov 30, 2023
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
149 changes: 126 additions & 23 deletions tests/test_user_management.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,8 @@ def mock_organization_memberships(self):
@pytest.fixture
def mock_auth_response(self):
user = MockUser("user_01H7ZGXFP5C6BBQY6Z7277ZCT0").to_dict()
session = MockSession("session_01E4ZCR3C56J083X43JQXF3JK5").to_dict()

return {
"user": user,
}
return {"user": user, "organization_id": "org_12345"}

@pytest.fixture
def mock_password_challenge_response(self):
Expand Down Expand Up @@ -368,28 +365,80 @@ def test_delete_organization_membership(self, capture_and_mock_request):
assert url[0].endswith("user_management/organization_memberships/om_ABCDE")
assert user is None

def test_authenticate_with_password(
self, capture_and_mock_request, mock_auth_response
):
email = "marcelina@foo-corp.com"
password = "test123"
user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
ip_address = "192.0.0.1"

url, request = capture_and_mock_request("post", mock_auth_response, 200)

response = self.user_management.authenticate_with_password(
email=email,
password=password,
user_agent=user_agent,
ip_address=ip_address,
)

assert url[0].endswith("user_management/authenticate")
assert response["user"]["id"] == "user_01H7ZGXFP5C6BBQY6Z7277ZCT0"
assert response["organization_id"] == "org_12345"
assert request["json"]["email"] == email
assert request["json"]["password"] == password
assert request["json"]["user_agent"] == user_agent
assert request["json"]["ip_address"] == ip_address
assert request["json"]["client_id"] == "client_b27needthisforssotemxo"
assert request["json"]["client_secret"] == "sk_abdsomecharactersm284"
assert request["json"]["grant_type"] == "password"

def test_authenticate_with_code(self, capture_and_mock_request, mock_auth_response):
code = "test_code"
user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
ip_address = "192.0.0.1"

url, request = capture_and_mock_request("post", mock_auth_response, 200)

response = self.user_management.authenticate_with_code(
code=code,
user_agent=user_agent,
ip_address=ip_address,
)

assert url[0].endswith("user_management/authenticate")
assert response["user"]["id"] == "user_01H7ZGXFP5C6BBQY6Z7277ZCT0"
assert response["organization_id"] == "org_12345"
assert request["json"]["code"] == code
assert request["json"]["user_agent"] == user_agent
assert request["json"]["ip_address"] == ip_address
assert request["json"]["client_id"] == "client_b27needthisforssotemxo"
assert request["json"]["client_secret"] == "sk_abdsomecharactersm284"
assert request["json"]["grant_type"] == "authorization_code"

def test_authenticate_with_magic_auth(
self, capture_and_mock_request, mock_auth_response
):
code = "test_auth"
user_id = "user_01H7ZGXFP5C6BBQY6Z7277ZCT0"
email = "marcelina@foo-corp.com"
user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
ip_address = "192.0.0.1"

url, request = capture_and_mock_request("post", mock_auth_response, 200)

response = self.user_management.authenticate_with_magic_auth(
code=code,
user_id=user_id,
email=email,
user_agent=user_agent,
ip_address=ip_address,
)

assert url[0].endswith("users/authenticate")
assert url[0].endswith("user_management/authenticate")
assert response["user"]["id"] == "user_01H7ZGXFP5C6BBQY6Z7277ZCT0"
assert response["organization_id"] == "org_12345"
assert request["json"]["code"] == code
assert request["json"]["user_agent"] == user_agent
assert request["json"]["user_id"] == user_id
assert request["json"]["email"] == email
assert request["json"]["ip_address"] == ip_address
assert request["json"]["client_id"] == "client_b27needthisforssotemxo"
assert request["json"]["client_secret"] == "sk_abdsomecharactersm284"
Expand All @@ -398,54 +447,108 @@ def test_authenticate_with_magic_auth(
== "urn:workos:oauth:grant-type:magic-auth:code"
)

def test_authenticate_with_password(
def test_authenticate_with_email_verification(
self, capture_and_mock_request, mock_auth_response
):
email = "marcelina@foo-corp.com"
password = "test123"
code = "test_auth"
pending_authentication_token = "ql1AJgNoLN1tb9llaQ8jyC2dn"
user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
ip_address = "192.0.0.1"

url, request = capture_and_mock_request("post", mock_auth_response, 200)

response = self.user_management.authenticate_with_password(
email=email,
password=password,
response = self.user_management.authenticate_with_email_verification(
code=code,
pending_authentication_token=pending_authentication_token,
user_agent=user_agent,
ip_address=ip_address,
)

assert url[0].endswith("users/authenticate")
assert url[0].endswith("user_management/authenticate")
assert response["user"]["id"] == "user_01H7ZGXFP5C6BBQY6Z7277ZCT0"
assert request["json"]["email"] == email
assert request["json"]["password"] == password
assert response["organization_id"] == "org_12345"
assert request["json"]["code"] == code
assert request["json"]["user_agent"] == user_agent
assert (
request["json"]["pending_authentication_token"]
== pending_authentication_token
)
assert request["json"]["ip_address"] == ip_address
assert request["json"]["client_id"] == "client_b27needthisforssotemxo"
assert request["json"]["client_secret"] == "sk_abdsomecharactersm284"
assert request["json"]["grant_type"] == "password"
assert (
request["json"]["grant_type"]
== "urn:workos:oauth:grant-type:email-verification:code"
)

def test_authenticate_with_code(self, capture_and_mock_request, mock_auth_response):
code = "test_code"
def test_authenticate_with_totp(self, capture_and_mock_request, mock_auth_response):
code = "test_auth"
authentication_challenge_id = "auth_challenge_01FVYZWQTZQ5VB6BC5MPG2EYC5"
pending_authentication_token = "ql1AJgNoLN1tb9llaQ8jyC2dn"
user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
ip_address = "192.0.0.1"

url, request = capture_and_mock_request("post", mock_auth_response, 200)

response = self.user_management.authenticate_with_code(
response = self.user_management.authenticate_with_totp(
code=code,
authentication_challenge_id=authentication_challenge_id,
pending_authentication_token=pending_authentication_token,
user_agent=user_agent,
ip_address=ip_address,
)

assert url[0].endswith("users/authenticate")
assert url[0].endswith("user_management/authenticate")
assert response["user"]["id"] == "user_01H7ZGXFP5C6BBQY6Z7277ZCT0"
assert response["organization_id"] == "org_12345"
assert request["json"]["code"] == code
assert request["json"]["user_agent"] == user_agent
assert (
request["json"]["authentication_challenge_id"]
== authentication_challenge_id
)
assert (
request["json"]["pending_authentication_token"]
== pending_authentication_token
)
assert request["json"]["ip_address"] == ip_address
assert request["json"]["client_id"] == "client_b27needthisforssotemxo"
assert request["json"]["client_secret"] == "sk_abdsomecharactersm284"
assert request["json"]["grant_type"] == "urn:workos:oauth:grant-type:mfa-totp"

def test_authenticate_with_organization_selection(
self, capture_and_mock_request, mock_auth_response
):
organization_id = "org_12345"
pending_authentication_token = "ql1AJgNoLN1tb9llaQ8jyC2dn"
user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
ip_address = "192.0.0.1"

url, request = capture_and_mock_request("post", mock_auth_response, 200)

response = self.user_management.authenticate_with_organization_selection(
organization_id=organization_id,
pending_authentication_token=pending_authentication_token,
user_agent=user_agent,
ip_address=ip_address,
)

assert url[0].endswith("user_management/authenticate")
assert response["user"]["id"] == "user_01H7ZGXFP5C6BBQY6Z7277ZCT0"
assert response["organization_id"] == "org_12345"
assert request["json"]["organization_id"] == organization_id
assert request["json"]["user_agent"] == user_agent
assert (
request["json"]["pending_authentication_token"]
== pending_authentication_token
)
assert request["json"]["ip_address"] == ip_address
assert request["json"]["client_id"] == "client_b27needthisforssotemxo"
assert request["json"]["client_secret"] == "sk_abdsomecharactersm284"
assert request["json"]["grant_type"] == "authorization_code"
assert (
request["json"]["grant_type"]
== "urn:workos:oauth:grant-type:organization-selection"
)

def test_create_password_challenge(
self, capture_and_mock_request, mock_password_challenge_response
Expand Down
10 changes: 9 additions & 1 deletion workos/resources/user_management.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@


class WorkOSAuthenticationResponse(WorkOSBaseResource):
"""Representation of a User and Session response as returned by WorkOS through User Management features."""
"""Representation of a User and Organization ID response as returned by WorkOS through User Management features."""

"""Attributes:
OBJECT_FIELDS (list): List of fields a WorkOSAuthenticationResponse comprises.
"""

OBJECT_FIELDS = [
"organization_id",
]

@classmethod
def construct_from_response(cls, response):
Expand Down
Loading