fixing smart config url pattern

Author: bwang-icf

apps/wellknown/urls.py

@@ -2,7 +2,6 @@
 from waffle.decorators import waffle_switch
 from .views import (
     openid_configuration,
-    smart_configuration,
     ApplicationListView,
     ApplicationLabelView,
     PublicApplicationListView,
@@ -11,7 +10,6 @@
 
 urlpatterns = [
     path("openid-configuration", openid_configuration, name="openid-configuration"),
-    path("smart-configuration", smart_configuration, name="smart-configuration"),
     path(
         "applications",
         waffle_switch("wellknown_applications")(ApplicationListView.as_view()),
@@ -30,9 +28,6 @@
     path(
         "openid-configuration-v2", openid_configuration, name="openid-configuration-v2"
     ),
-    path(
-        "smart-configuration-v2", smart_configuration, name="smart-on-fhir-configuration-v2"
-    ),
     path(
         "applications-v2",
         waffle_switch("wellknown_applications")(ApplicationListView.as_view()),

apps/wellknown/views/openid.py

@@ -40,8 +40,7 @@ def smart_configuration(request):
     """
     data = OrderedDict()
     issuer = base_issuer(request)
-    v2 = request.path.endswith('smart-configuration-v2') or request.path.endswith('smartConfigV2')
-    data = build_smart_config_endpoint(data, issuer=issuer, v2=v2)
+    data = build_smart_config_endpoint(data, issuer=issuer)
     return JsonResponse(data)
 
 
@@ -108,7 +107,7 @@ def build_endpoint_info(data=OrderedDict(), issuer=""):
     return data
 
 
-def build_smart_config_endpoint(data=OrderedDict(), v2=False, issuer=""):
+def build_smart_config_endpoint(data=OrderedDict(), issuer=""):
     """
     construct the smart config endpoint response. Takes in output of build_endpoint_info since they share many fields
     issuer should be http: or https:// prefixed url.
@@ -117,7 +116,7 @@ def build_smart_config_endpoint(data=OrderedDict(), v2=False, issuer=""):
     :return:
     """
 
-    data = build_endpoint_info(data, issuer=issuer, v2=v2)
+    data = build_endpoint_info(data, issuer=issuer)
     del(data["userinfo_endpoint"])
     del(data["ui_locales_supported"])
     del(data["service_documentation"])

hhs_oauth_server/urls.py

@@ -6,6 +6,7 @@
 from django.contrib import admin
 from apps.accounts.views.oauth2_profile import openidconnect_userinfo
 from apps.fhir.bluebutton.views.home import fhir_conformance, fhir_conformance_v2
+from apps.wellknown.views.openid import smart_configuration
 from hhs_oauth_server.hhs_oauth_server_context import IsAppInstalled
 
 admin.autodiscover()
@@ -17,6 +18,7 @@
 urlpatterns = [
     path("health", include("apps.health.urls")),
     re_path(r"^.well-known/", include("apps.wellknown.urls")),
+    path("v1/fhir/.wellknown/smart-configuration", smart_configuration, name="smart_configuration"),
     path("forms/", include("apps.forms.urls")),
     path("v1/accounts/", include("apps.accounts.urls")),
     re_path(
@@ -32,6 +34,7 @@
         openidconnect_userinfo,
         name="openid_connect_userinfo_v2",
     ),
+    path("v2/fhir/.wellknown/smart-configuration", smart_configuration, name="smart_configuration"),
     path("v2/fhir/metadata", fhir_conformance_v2, name="fhir_conformance_metadata_v2"),
     path("v2/fhir/", include("apps.fhir.bluebutton.v2.urls")),
     path("v2/o/", include("apps.dot_ext.v2.urls")),