Skip to content

Commit 9f323b0

Browse files
committed
removing v1 response and changing all OIDC config responses to v2
1 parent 910390d commit 9f323b0

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

apps/wellknown/views/openid.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ def openid_configuration(request):
2929
"""
3030
data = OrderedDict()
3131
issuer = base_issuer(request)
32-
v2 = request.path.endswith('openid-configuration-v2') or request.path.endswith('openidConfigV2')
33-
data = build_endpoint_info(data, issuer=issuer, v2=v2)
32+
data = build_endpoint_info(data, issuer=issuer)
3433
return JsonResponse(data)
3534

3635

@@ -73,7 +72,7 @@ def base_issuer(request):
7372
return issuer
7473

7574

76-
def build_endpoint_info(data=OrderedDict(), v2=False, issuer=""):
75+
def build_endpoint_info(data=OrderedDict(), issuer=""):
7776
"""
7877
construct the data package
7978
issuer should be http: or https:// prefixed url.
@@ -83,12 +82,12 @@ def build_endpoint_info(data=OrderedDict(), v2=False, issuer=""):
8382
"""
8483
data["issuer"] = issuer
8584
data["authorization_endpoint"] = issuer + \
86-
reverse('oauth2_provider:authorize' if not v2 else 'oauth2_provider_v2:authorize-v2')
85+
reverse('oauth2_provider_v2:authorize-v2')
8786
data["revocation_endpoint"] = issuer + reverse('oauth2_provider:revoke')
8887
data["token_endpoint"] = issuer + \
89-
reverse('oauth2_provider:token' if not v2 else 'oauth2_provider_v2:token-v2')
88+
reverse('oauth2_provider_v2:token-v2')
9089
data["userinfo_endpoint"] = issuer + \
91-
reverse('openid_connect_userinfo' if not v2 else 'openid_connect_userinfo_v2')
90+
reverse('openid_connect_userinfo_v2')
9291
data["ui_locales_supported"] = ["en-US", ]
9392
data["service_documentation"] = getattr(settings,
9493
'DEVELOPER_DOCS_URI',
@@ -105,7 +104,7 @@ def build_endpoint_info(data=OrderedDict(), v2=False, issuer=""):
105104

106105
data["response_types_supported"] = ["code", "token"]
107106
data["fhir_metadata_uri"] = issuer + \
108-
reverse('fhir_conformance_metadata' if not v2 else 'fhir_conformance_metadata_v2')
107+
reverse('fhir_conformance_metadata_v2')
109108
return data
110109

111110

0 commit comments

Comments
 (0)