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

Jump to bottom

Change SAML start to be post #70

Merged
merged 3 commits into from
Oct 25, 2022
Merged

Change SAML start to be post #70

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
fe10cfb
Change saml start to be post
dorsha Oct 25, 2022
2832df5
Fix tests
dorsha Oct 25, 2022
0b6501a
Fix lint
dorsha Oct 25, 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
6 changes: 3 additions & 3 deletions descope/authmethod/saml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ def start(self, tenant: str, return_url: str = None) -> dict:
)

uri = EndpointsV1.authSAMLStart
params = SAML._compose_start_params(tenant, return_url)
response = self._auth.do_get(uri, params)
body = SAML._compose_start_body(tenant, return_url)
response = self._auth.do_post(uri, body)

return response.json()

Expand All @@ -36,7 +36,7 @@ def exchange_token(
return self._auth.exchange_token(uri, code, loginOptions, refreshToken)

@staticmethod
def _compose_start_params(tenant: str, return_url: str) -> dict:
def _compose_start_body(tenant: str, return_url: str) -> dict:
res = {"tenant": tenant}
if return_url is not None and return_url != "":
res["redirectURL"] = return_url
Expand Down
24 changes: 13 additions & 11 deletions tests/test_saml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ def setUp(self) -> None:
"y": "N5n5jKZA5Wu7_b4B36KKjJf-VRfJ-XqczfCSYy9GeQLqF-b63idfE0SYaYk9cFqg",
}

def test_compose_start_params(self):
def test_compose_start_body(self):
self.assertEqual(
SAML._compose_start_params("tenant1", "http://dummy.com"),
SAML._compose_start_body("tenant1", "http://dummy.com"),
{"tenant": "tenant1", "redirectURL": "http://dummy.com"},
)

Expand All @@ -37,27 +37,29 @@ def test_saml_start(self):
self.assertRaises(AuthException, saml.start, "tenant1", "")
self.assertRaises(AuthException, saml.start, "tenant1", None)

with patch("requests.get") as mock_get:
mock_get.return_value.ok = False
with patch("requests.post") as mock_post:
mock_post.return_value.ok = False
self.assertRaises(AuthException, saml.start, "tenant1", "http://dummy.com")

# Test success flow
with patch("requests.get") as mock_get:
mock_get.return_value.ok = True
with patch("requests.post") as mock_post:
mock_post.return_value.ok = True
self.assertIsNotNone(saml.start("tenant1", "http://dummy.com"))

with patch("requests.get") as mock_get:
mock_get.return_value.ok = True
with patch("requests.post") as mock_post:
mock_post.return_value.ok = True
saml.start("tenant1", "http://dummy.com")
expected_uri = f"{DEFAULT_BASE_URL}{EndpointsV1.authSAMLStart}"
mock_get.assert_called_with(
mock_post.assert_called_with(
expected_uri,
headers={
"Content-Type": "application/json",
"Authorization": f"Bearer {self.dummy_project_id}",
},
params={"tenant": "tenant1", "redirectURL": "http://dummy.com"},
allow_redirects=None,
data=json.dumps(
{"tenant": "tenant1", "redirectURL": "http://dummy.com"}
),
allow_redirects=False,
verify=True,
)

Expand Down