Add support for separate V2/V3 BFD endpoints (#1359)

Author: jimmyfagan

apps/fhir/bluebutton/utils.py

@@ -702,7 +702,9 @@ def get_patient_by_id(id, request):
     headers = generate_info_headers(request)
     headers["BlueButton-Application"] = "BB2-Tools"
     headers["includeIdentifiers"] = "true"
-    url = "{}Patient/{}?_format={}".format(
+    # for now this will only work for v1/v2 patients, but we'll need to be able to
+    # determine if the user is V3 and use those endpoints later
+    url = "{}/v2/fhir/Patient/{}?_format={}".format(
         get_resourcerouter().fhir_url, id, settings.FHIR_PARAM_FORMAT
     )
     s = requests.Session()

apps/fhir/bluebutton/views/home.py

@@ -20,10 +20,14 @@
 
 
 def fhir_conformance_v2(request, via_oauth=False):
-    return fhir_conformance(request, via_oauth, True)
+    return fhir_conformance(request, via_oauth, "v2")
 
 
-def fhir_conformance(request, via_oauth=False, v2=False, *args):
+def fhir_conformance_v3(request, via_oauth=False):
+    return fhir_conformance(request, via_oauth, "v3")
+
+
+def fhir_conformance(request, via_oauth=False, ver_str="v1", *args):
     """ Pull and filter fhir Conformance statement
 
     BaseStu3 = "CapabilityStatement"
@@ -36,13 +40,14 @@ def fhir_conformance(request, via_oauth=False, v2=False, *args):
     """
     crosswalk = None
     resource_router = get_resourcerouter()
-    parsed_url = urlparse(resource_router.fhir_url)
+    fhir_url = resource_router.fhir_url_v3 if ver_str == "v3" else resource_router.fhir_url
+    parsed_url = urlparse(fhir_url)
     call_to = None
     if parsed_url.path is not None:
-        call_to = '{}://{}/{}/fhir/metadata'.format(parsed_url.scheme, parsed_url.netloc, 'v2' if v2 else 'v1')
+        call_to = '{}://{}/{}/fhir/metadata'.format(parsed_url.scheme, parsed_url.netloc, ver_str)
     else:
         # url with no path
-        call_to = '{}/{}/fhir/metadata'.format(resource_router.fhir_url, 'v2' if v2 else 'v1')
+        call_to = '{}/{}/fhir/metadata'.format(fhir_url, ver_str)
 
     pass_params = {'_format': 'json'}
 

apps/fhir/bluebutton/views/read.py

@@ -43,16 +43,19 @@ def build_url(self, resource_router, resource_type, resource_id, **kwargs):
             # only if called by tests
             return "{}{}/{}/".format(resource_router.fhir_url, resource_type, resource_id)
         else:
+            fhir_url = resource_router.fhir_url
             match self.version:
                 case 3:
                     version_str = 'v3'
+                    if resource_router.fhir_url_v3:
+                        fhir_url = resource_router.fhir_url_v3
                 case 2:
                     version_str = 'v2'
                 case _:
                     version_str = 'v1'
 
             return "{base_url}/{version}/fhir/{resource_type}/{resource_id}/".format(
-                base_url=resource_router.fhir_url,
+                base_url=fhir_url,
                 version=version_str,
                 resource_type=resource_type,
                 resource_id=resource_id

apps/fhir/bluebutton/views/search.py

@@ -73,16 +73,19 @@ def build_url(self, resource_router, resource_type, *args, **kwargs):
             # only if called by tests
             return "{}{}/".format(resource_router.fhir_url, resource_type)
         else:
+            fhir_url = resource_router.fhir_url
             match self.version:
                 case 3:
                     version_str = 'v3'
+                    if resource_router.fhir_url_v3:
+                        fhir_url = resource_router.fhir_url_v3
                 case 2:
                     version_str = 'v2'
                 case _:
                     version_str = 'v1'
 
             return "{base_url}/{version}/fhir/{resource_type}/".format(
-                base_url=resource_router.fhir_url,
+                base_url=fhir_url,
                 version=version_str,
                 resource_type=resource_type
             )

apps/fhir/server/authentication.py

@@ -77,8 +77,12 @@ def search_fhir_id_by_identifier(search_identifier, request=None):
         headers = None
 
     # Build URL with patient ID search by identifier.
+    resource_router = get_resourcerouter()
     ver = "v{}".format(request.session.get('version', 1))
-    url = f"{get_resourcerouter().fhir_url}/{ver}/fhir/Patient/_search"
+    fhir_url = resource_router.fhir_url
+    if ver == 'v3' and resource_router.fhir_url_v3:
+        fhir_url = resource_router.fhir_url_v3
+    url = f"{fhir_url}/{ver}/fhir/Patient/_search"
 
     max_retries = 3
     retries = 0

apps/fhir/server/settings.py

@@ -16,6 +16,7 @@
 
 DEFAULTS = {
     "FHIR_URL": None,
+    "FHIR_URL_V3": None,
     "CLIENT_AUTH": False,
     "CERT_FILE": "",
     "KEY_FILE": "",

apps/mymedicare_cb/views.py

@@ -89,6 +89,20 @@ def authenticate(request):
 
 @never_cache
 def callback(request, version=2):
+    state = request.GET.get('relay')
+    if not state:
+        return JsonResponse({"error": 'The state parameter is required'}, status=status.HTTP_400_BAD_REQUEST)
+
+    try:
+        anon_user_state = AnonUserState.objects.get(state=state)
+    except AnonUserState.DoesNotExist:
+        return JsonResponse({"error": 'The requested state was not found'}, status=status.HTTP_400_BAD_REQUEST)
+    next_uri = anon_user_state.next_uri or ""
+    if "/v3/o/authorize" in next_uri:
+        version = 3
+    elif "/v2/o/authorize" in next_uri:
+        version = 2
+
     user_not_found_error = None
     try:
         authenticate(request)
@@ -112,17 +126,6 @@ def callback(request, version=2):
             "error": e.detail,
         }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
-    state = request.GET.get('relay')
-
-    if not state:
-        return JsonResponse({"error": 'The state parameter is required'}, status=status.HTTP_400_BAD_REQUEST)
-
-    try:
-        anon_user_state = AnonUserState.objects.get(state=state)
-    except AnonUserState.DoesNotExist:
-        return JsonResponse({"error": 'The requested state was not found'}, status=status.HTTP_400_BAD_REQUEST)
-    next_uri = anon_user_state.next_uri
-
     scheme, netloc, path, query_string, fragment = urlsplit(next_uri)
 
     if user_not_found_error:

hhs_oauth_server/settings/base.py

@@ -600,6 +600,7 @@
 
 FHIR_SERVER = {
     "FHIR_URL": env("FHIR_URL", "https://fhir.backend.bluebutton.hhsdevcloud.us"),
+    "FHIR_URL_V3": env("FHIR_URL_V3", "https://fhir.backend.bluebutton.hhsdevcloud.us"),
     "CERT_FILE": os.path.join(
         FHIR_CLIENT_CERTSTORE, env("FHIR_CERT_FILE", "ca.cert.pem")
     ),

hhs_oauth_server/urls.py

@@ -6,7 +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.fhir.bluebutton.views.home import fhir_conformance, fhir_conformance_v2, fhir_conformance_v3
 from apps.wellknown.views.openid import smart_configuration, smart_configuration_v3
 from hhs_oauth_server.hhs_oauth_server_context import IsAppInstalled
 from .views import testobject
@@ -46,7 +46,7 @@ def robots_txt(request):
     path("v2/fhir/metadata", fhir_conformance_v2, name="fhir_conformance_metadata_v2"),
     path("v2/fhir/", include("apps.fhir.bluebutton.v2.urls")),
     path("v3/fhir/.well-known/smart-configuration", smart_configuration_v3, name="smart_configuration_v3"),
-    path("v3/fhir/metadata", fhir_conformance_v2, name="fhir_conformance_metadata_v3"),
+    path("v3/fhir/metadata", fhir_conformance_v3, name="fhir_conformance_metadata_v3"),
     path("v3/fhir/", include("apps.fhir.bluebutton.v3.urls")),
     path("v2/o/", include("apps.dot_ext.v2.urls")),
     path("v2/o/", include("apps.authorization.v2.urls")),