Add test for sso2

fastapi_opa/auth/auth_saml.py

@@ -44,7 +44,7 @@ async def authenticate(
         elif 'sso2' in request.query_params:
             logger.debug(datetime.utcnow(), '--sso2--')
             return_to = '%sattrs/' % request.base_url
-            return RedirectResponse(auth.login(return_to))
+            return await self.single_sign_on(auth, return_to)
         elif "acs" in request.query_params:
             logger.debug(datetime.utcnow(), '--acs--')
             return await self.assertion_consumer_service(auth, request_args, request)
@@ -93,8 +93,8 @@ async def single_log_out(auth: OneLogin_Saml2_Auth) -> RedirectResponse:
                         spnq=name_id_spnq))
 
     @staticmethod
-    async def single_sign_on(auth: OneLogin_Saml2_Auth) -> RedirectResponse:
-        redirect_url = auth.login()
+    async def single_sign_on(auth: OneLogin_Saml2_Auth, url: str = None) -> RedirectResponse:
+        redirect_url = auth.login(url)
         return RedirectResponse(redirect_url)
 
     @staticmethod

tests/test_saml_auth.py

@@ -15,12 +15,30 @@ async def test_single_sign_on():
 
     saml_auth_mock = Mock()
     saml_auth_mock.login.return_value = "http://idp.com/cryptic-stuff"
-    response = await saml_auth.single_sign_on(saml_auth_mock)
+    url = r"http://idp.com/cryptic-stuff/attrs"
+    response = await saml_auth.single_sign_on(saml_auth_mock, url)
 
     assert isinstance(response, RedirectResponse)
     assert response.headers.get("location") == "http://idp.com/cryptic-stuff"
 
 
+@pytest.mark.asyncio
+async def test_single_sign_on_with_parameter():
+    saml_conf = SAMLConfig(settings_directory="./tests/test_data/saml")
+    saml_auth = SAMLAuthentication(saml_conf)
+
+    def side_effect(url):
+        return url
+
+    saml_auth_mock = Mock()
+    saml_auth_mock.login = Mock(side_effect=side_effect)
+    attr_url = "http://idp.com/cryptic-stuff/attrs"
+    response = await saml_auth.single_sign_on(saml_auth_mock, attr_url)
+
+    assert isinstance(response, RedirectResponse)
+    assert response.headers.get("location") == attr_url
+
+
 @pytest.mark.asyncio
 @patch("fastapi_opa.auth.auth_saml.OneLogin_Saml2_Utils")
 async def test_assertion_consumer_service(saml_util_mock):
@@ -74,3 +92,26 @@ async def test_assertion_consumer_service(saml_util_mock):
 
     request_mock.session.__setitem__.assert_called()
     assert expected == response
+
+
+@pytest.mark.asyncio
+async def test_single_log_out():
+    saml_conf = SAMLConfig(settings_directory="./tests/test_data/saml")
+    saml_auth = SAMLAuthentication(saml_conf)
+
+    saml_auth_mock = Mock()
+    saml_auth_mock.get_slo_url.return_value = "http://idp.com"
+    saml_auth_mock.get_nameid.return_value = "alice"
+    saml_auth_mock.get_nameid_format.return_value = (
+        "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"
+    )
+    saml_auth_mock.get_nameid_nq.return_value = None
+    saml_auth_mock.get_nameid_spnq.return_value = None
+    saml_auth_mock.get_session_index.return_value = "8167416b-6a10-4a4c-889c-7574074e3fc5::f1eaf88b-2bb9-4d2e-8d3d-39587ba1ef37"  # noqa
+
+    response = await saml_auth.single_log_out(
+        saml_auth_mock
+    )
+    assert isinstance(response, RedirectResponse)
+    # TODO:
+    assert response