Self hosted FLOSS fitness/workout, nutrition and weight tracker
Build the OIDC schema URLs via make_absolute_url
Roland Geider3f19084808e3
diff --git a/wger/core/tests/test_api_schema.py b/wger/core/tests/test_api_schema.pyindex ba87c0a60..1a9aa9bb6 100644--- a/wger/core/tests/test_api_schema.py+++ b/wger/core/tests/test_api_schema.py@@ -13,6 +13,8 @@# You should have received a copy of the GNU Affero General Public License# Django+from django.conf import settings+from django.test import override_settingsfrom django.urls import reverse# wger@@ -30,6 +32,15 @@ class ApiSchemaTestCase(WgerTestCase):response = self.client.get(reverse('schema'))self.assertEqual(response.status_code, 200)+ def test_schema_without_site_url(self):+ """The schema is generated even when SITE_URL is not configured"""++ with override_settings():+ del settings.SITE_URL+ response = self.client.get(reverse('schema'))++ self.assertEqual(response.status_code, 200)+def test_swagger_ui(self):"""The swagger UI page renders"""diff --git a/wger/utils/oidc_auth.py b/wger/utils/oidc_auth.pyindex 338e66a02..4905872b8 100644--- a/wger/utils/oidc_auth.py+++ b/wger/utils/oidc_auth.py@@ -29,6 +29,9 @@ from drf_spectacular.extensions import OpenApiAuthenticationExtensionfrom rest_framework.exceptions import PermissionDeniedfrom rest_framework.permissions import SAFE_METHODS+# wger+from wger.utils.url import make_absolute_url+SCOPE_READ = 'api:read'SCOPE_WRITE = 'api:write'@@ -124,15 +127,15 @@ class OidcTokenScheme(OpenApiAuthenticationExtension):def get_security_definition(self, auto_schema):# OpenAPI 3.0 wants absolute URLs here, a relative path makes code- # generators build a broken one- site = settings.SITE_URL.rstrip('/')+ # generators build a broken one. Without SITE_URL the paths stay+ # relative: a degraded schema beats one that can't be generated.return {'type': 'oauth2','description': 'Access token issued by the OAuth2/OIDC provider','flows': {'authorizationCode': {- 'authorizationUrl': f'{site}{reverse("idp:oidc:authorization")}',- 'tokenUrl': f'{site}{reverse("idp:oidc:token")}',+ 'authorizationUrl': make_absolute_url(reverse('idp:oidc:authorization')),+ 'tokenUrl': make_absolute_url(reverse('idp:oidc:token')),'scopes': {str(name): str(label) for name, label in API_SCOPES.items()},}},