fix(auth): keep SSO compatibility route out of OpenAPI
This commit is contained in:
@@ -183,3 +183,9 @@ class SsoCallbackView(APIView):
|
|||||||
response = HttpResponse(status=303)
|
response = HttpResponse(status=303)
|
||||||
response["Location"] = redirect_path
|
response["Location"] = redirect_path
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
||||||
|
class SsoCallbackWithoutSlashView(SsoCallbackView):
|
||||||
|
"""Accept legacy callback URLs without duplicating the public API schema."""
|
||||||
|
|
||||||
|
swagger_schema = None
|
||||||
|
|||||||
@@ -11,7 +11,11 @@ from apps.core.views import (
|
|||||||
BackgroundJobStatusView,
|
BackgroundJobStatusView,
|
||||||
BackgroundJobStreamView,
|
BackgroundJobStreamView,
|
||||||
)
|
)
|
||||||
from apps.user.sso_views import SsoCallbackView, SsoStartView
|
from apps.user.sso_views import (
|
||||||
|
SsoCallbackView,
|
||||||
|
SsoCallbackWithoutSlashView,
|
||||||
|
SsoStartView,
|
||||||
|
)
|
||||||
from django.urls import include, path
|
from django.urls import include, path
|
||||||
|
|
||||||
app_name = "api_v1"
|
app_name = "api_v1"
|
||||||
@@ -24,7 +28,7 @@ jobs_urlpatterns = [
|
|||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
# Accept IAS POST forms without a slash without CommonMiddleware's 301.
|
# Accept IAS POST forms without a slash without CommonMiddleware's 301.
|
||||||
path("auth/sso", SsoCallbackView.as_view()),
|
path("auth/sso", SsoCallbackWithoutSlashView.as_view()),
|
||||||
path("auth/sso/", SsoCallbackView.as_view(), name="sso-callback"),
|
path("auth/sso/", SsoCallbackView.as_view(), name="sso-callback"),
|
||||||
path("auth/sso/start/", SsoStartView.as_view(), name="sso-start"),
|
path("auth/sso/start/", SsoStartView.as_view(), name="sso-start"),
|
||||||
path("analytics/", include("apps.organization.analytics_root_urls")),
|
path("analytics/", include("apps.organization.analytics_root_urls")),
|
||||||
|
|||||||
@@ -40,6 +40,26 @@ class SsoStartViewTest(SimpleTestCase):
|
|||||||
{"target": ["fkc_ecos"], "path": ["/open-data?scope=rosatom"]},
|
{"target": ["fkc_ecos"], "path": ["/open-data?scope=rosatom"]},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_callback_alias_does_not_duplicate_openapi_operations(self):
|
||||||
|
from core.api_v1_urls import urlpatterns
|
||||||
|
from drf_yasg import openapi
|
||||||
|
from drf_yasg.generators import OpenAPISchemaGenerator
|
||||||
|
|
||||||
|
schema = OpenAPISchemaGenerator(
|
||||||
|
info=openapi.Info(title="SSO", default_version="v1"),
|
||||||
|
patterns=[
|
||||||
|
item for item in urlpatterns if str(item.pattern).startswith("auth/sso")
|
||||||
|
],
|
||||||
|
).get_schema(request=None, public=True)
|
||||||
|
operations = [
|
||||||
|
operation.operation_id
|
||||||
|
for item in schema.paths.values()
|
||||||
|
for _, operation in item.operations
|
||||||
|
]
|
||||||
|
self.assertEqual(len(operations), len(set(operations)))
|
||||||
|
self.assertIn("/sso/", schema.paths)
|
||||||
|
self.assertNotIn("/sso", schema.paths)
|
||||||
|
|
||||||
def test_rejects_absolute_redirect_path(self):
|
def test_rejects_absolute_redirect_path(self):
|
||||||
response = self.client.get(
|
response = self.client.get(
|
||||||
"/api/v1/auth/sso/start/",
|
"/api/v1/auth/sso/start/",
|
||||||
|
|||||||
Reference in New Issue
Block a user