Skip to content

Commit

Permalink
Fixing formatting issues as reported by black output
Browse files Browse the repository at this point in the history
per recommendations, ran "black ." to fix formatting.
  • Loading branch information
cginmn committed Apr 20, 2021
1 parent 5969bd0 commit 3ca92d3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 1 addition & 3 deletions fence/blueprints/login/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,7 @@ def provider_info(login_details):

if "okta" in configured_idps:
blueprint_api.add_resource(OktaLogin, "/okta", strict_slashes=False)
blueprint_api.add_resource(
OktaCallback, "/okta/login", strict_slashes=False
)
blueprint_api.add_resource(OktaCallback, "/okta/login", strict_slashes=False)

if "cognito" in configured_idps:
blueprint_api.add_resource(CognitoLogin, "/cognito", strict_slashes=False)
Expand Down
2 changes: 1 addition & 1 deletion fence/resources/openid/okta_oauth2.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

OKTA_IDP_NAME = "okta"

class OktaOauth2Client(Oauth2ClientBase):

class OktaOauth2Client(Oauth2ClientBase):
def __init__(self, settings, logger, HTTP_PROXY=None):
super(OktaOauth2Client, self).__init__(
settings,
Expand Down
10 changes: 6 additions & 4 deletions tests/login/test_login_redirect.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def test_valid_redirect_base(mock_discovery, app, client, idp):
redirect = app.config["BASE_URL"]
response = client.get("/login/{}?redirect={}".format(idp, redirect))

if (idp=="okta"):
if idp == "okta":
assert response.status_code == 500
else:
assert response.status_code == 302
Expand All @@ -36,7 +36,8 @@ def test_valid_redirect_base(mock_discovery, app, client, idp):
assert response.status_code == 302
"""

@pytest.mark.parametrize("idp", ["google", "shib", "microsoft", "okta","orcid", "ras"])

@pytest.mark.parametrize("idp", ["google", "shib", "microsoft", "okta", "orcid", "ras"])
@mock.patch(
"fence.resources.openid.ras_oauth2.RASOauth2Client.get_value_from_discovery_doc"
)
Expand All @@ -49,15 +50,16 @@ def test_valid_redirect_oauth(mock_discovery, client, oauth_client, idp):

response = client.get("/login/{}?redirect={}".format(idp, oauth_client.url))

if (idp=="okta"):
if idp == "okta":
assert response.status_code == 500
else:
assert response.status_code == 302
"""
assert response.status_code == 302
"""

@pytest.mark.parametrize("idp", ["google", "shib", "microsoft", "okta","orcid", "ras"])

@pytest.mark.parametrize("idp", ["google", "shib", "microsoft", "okta", "orcid", "ras"])
def test_invalid_redirect_fails(client, idp):
"""
Check that giving a bogus redirect to the login endpoint returns an error.
Expand Down

0 comments on commit 3ca92d3

Please sign in to comment.