davinci_dtr_test_kit 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 940914e499d108663302b9df9fac473315dff874b8e6d1f7afa354a0fb02b412
-  data.tar.gz: 878e70bfea50b8458ad08cbe7ad4834ae05c1c34c21a883dd1cdce883d1c3500
+  metadata.gz: e95ac1a81ec266133aa196823f9c4af450b6ff0c628b2ca9dccbb0fcd3b32863
+  data.tar.gz: d4ac1d46eadaa7f1067d07b4811e00803308f8d1c91cf9165f6e17534a280449
 SHA512:
-  metadata.gz: 4b6888ef1ce9334ced832a2816c614ae4fd846c376181fcb7ff698e4069afe197db2f7305ff0100de94518ef22cd6d043ddd6516e965839e4acc7d836b9d98e2
-  data.tar.gz: 5a4003c46adfd4f682979ef22bdf7d97dbff6c7be12416e744851eada2ece766f4dbceaa77a01468d7a5f2a4567f65e1d5885dcabfca1d42eddbc66ef575dafe
+  metadata.gz: 22b65864b0795e2355b17d19b78d262524b29a9c0b1352603cd226a8d5c135a5bb0566c6c8449ce4ea0516ebedbee1e7a94965d7448e98a927b07716bd65c049
+  data.tar.gz: 0daaae716b201d20f99c768e5a7bc9d6ae997f953ab2d238862298ab00a39d82746b5e1a71537f13eeb09ea260c097955a22487405128aa5cbe9339cc1860fce

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_dinner_questionnaire_package_request_test.rb

@@ -0,0 +1,97 @@
+require 'base64'
+require_relative '../../urls'
+
+module DaVinciDTRTestKit
+  class DTRDinnerQuestionnairePackageRequestTest < Inferno::Test
+    include URLs
+
+    id :dtr_dinner_questionnaire_package_request
+    title 'Invoke the DTR Questionnaire Package operation'
+    description %(
+      Inferno will wait for a DTR questionnaire package request from the client. Upon receipt, Inferno will generate and
+      send a response.
+    )
+    input :smart_app_launch, type: 'radio', title: 'SMART App Launch',
+                             description: 'How will the DTR SMART App launch?',
+                             options: { list_options: [{ label: 'Launch from Inferno', value: 'inferno' },
+                                                       { label: 'Launch from EHR', value: 'ehr' }] }
+    input :client_id
+    input :launch_uri, optional: true, description: 'Required if "Launch from Inferno" is selected'
+    input :smart_patient_id, optional: true, title: 'SMART App Launch Patient ID (Dinner Static)',
+                             type: 'text',
+                             description: %(
+                               Patient instance id to be provided by Inferno as the `patient` as a part of the SMART app
+                               launch.
+                             )
+    input :smart_fhir_context, optional: true, title: 'SMART App Launch fhirContext (Dinner Static)',
+                               type: 'textarea',
+                               description: %(
+                               References to be provided by Inferno as the `fhirContext` as a part of the SMART app
+                               launch. These references help determine the behavior of the app. Referenced instances
+                               may be providedin the "EHR-available resources" input.
+                             )
+    input :ehr_bundle, optional: true, title: 'EHR-available resources (Dinner Static)', type: 'textarea',
+                       description: %(
+                         Resources available from the EHR needed to drive the dinner static workflow.
+                         Formatted as a FHIR bundle that contains resources, each with an `id` property populated. Each
+                         instance present will be available for retrieval from Inferno at the endpoint
+                         `[fhir-base]/[resource type]/[instance id].`
+                       )
+
+    def example_client_jwt_payload_part
+      Base64.strict_encode64({ inferno_client_id: client_id }.to_json).delete('=')
+    end
+
+    run do
+      launch_prompt = if smart_app_launch == 'inferno'
+                        %(Launch the DTR SMART App from Inferno by right clicking
+                          [this link](#{launch_uri}?iss=#{fhir_base_url}&launch=#{launch_uri})
+                          and selecting or "Open in new window" or "Open in new tab".)
+                      else
+                        %(Launch the SMART App from your EHR.)
+                      end
+      inferno_prompt_cont = %(As the DTR app steps through the launch steps, Inferno will wait and respond to the app's
+                              requests for SMART configuration, authorization and access token.)
+
+      wait(
+        identifier: client_id,
+        message: %(
+          ### SMART App Launch
+
+          #{launch_prompt}
+
+          #{inferno_prompt_cont if smart_app_launch == 'inferno'}
+
+          Then, Inferno will expect the SMART App to invoke the DTR Questionnaire Package operation by sending a POST
+          request to
+
+          `#{questionnaire_package_url}`
+
+          A questionnaire package generated by Inferno will be returned.
+
+          ### Pre-population
+
+          Inferno will then wait for the client to complete Questionnaire pre-population. The client should make FHIR
+          GET requests using service base path:
+
+          `#{fhir_base_url}`
+
+          ### Request Identification
+
+          In order to identify requests for this session, Inferno will look for
+          an `Authorization` header with value:
+
+          ```
+          Bearer eyJhbGcmOiJub25lIn0.#{example_client_jwt_payload_part}.
+          ```
+
+          ### Continuing the Tests
+
+          When the DTR application has finished loading the Questionnaire,
+          including any clinical data requests to support pre-population,
+          [Click here](#{resume_pass_url}?client_id=#{client_id}) to continue.
+        )
+      )
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_questionnaire_response_save_test.rb

@@ -9,11 +9,11 @@ module DaVinciDTRTestKit
     description %(
       Inferno, acting as the EHR, will wait for a request to save the QuestionnaireResponse from the client.
     )
-    input :access_token
+    input :client_id
 
     run do
       wait(
-        identifier: access_token,
+        identifier: client_id,
         message: %(
           Complete the questionnaire, leaving the following items unmodified, because a subsequent test will expect
           their pre-populated values:

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_smart_app_questionnaire_workflow_group.rb

@@ -1,4 +1,4 @@
-require_relative '../shared/dtr_questionnaire_package_request_test'
+require_relative 'dtr_dinner_questionnaire_package_request_test'
 require_relative '../shared/dtr_questionnaire_package_request_validation_test'
 require_relative 'prepopulation_attestation_test'
 require_relative 'prepopulation_override_attestation_test'
@@ -17,6 +17,7 @@ module DaVinciDTRTestKit
       demonstrate their ability to:
 
       1. Fetch the static questionnaire package
+         ([DinnerOrderStatic](https://github.com/inferno-framework/davinci-dtr-test-kit/blob/main/lib/davinci_dtr_test_kit/fixtures/dinner_static/questionnaire_dinner_order_static.json))
       2. Render and pre-populate the questionnaire appropriately, including:
          - fetch additional data needed for pre-population
          - pre-populate data as directed by the questionnaire
@@ -36,7 +37,7 @@ module DaVinciDTRTestKit
       run_as_group
 
       # Test 1: wait for the $questionnaire-package request
-      test from: :dtr_questionnaire_package_request
+      test from: :dtr_dinner_questionnaire_package_request
       # Test 2: validate the $questionnaire-package body
       test from: :dtr_questionnaire_package_request_validation
     end

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/prepopulation_attestation_test.rb

@@ -9,19 +9,19 @@ module DaVinciDTRTestKit
     description %(
       Validate that pre-population of patient name information occurs as expected.
     )
-    input :access_token
+    input :client_id
 
     run do
       wait(
-        identifier: access_token,
+        identifier: client_id,
         message: %(
           I attest that the client application pre-populates the following questions with the respective values:
           - Last Name: Oster
           - First Name: William
 
-          [Click here](#{resume_pass_url}?token=#{access_token}) if the above statement is **true**.
+          [Click here](#{resume_pass_url}?client_id=#{client_id}) if the above statement is **true**.
 
-          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+          [Click here](#{resume_fail_url}?client_id=#{client_id}) if the above statement is **false**.
         )
       )
     end

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/prepopulation_override_attestation_test.rb

@@ -9,20 +9,20 @@ module DaVinciDTRTestKit
     description %(
       Validate that the user can edit a pre-populated item and replace it with another value.
     )
-    input :access_token
+    input :client_id
 
     run do
       wait(
-        identifier: access_token,
+        identifier: client_id,
         message: %(
           I attest that
 
           1. The client pre-populated an answer for question 'Location'.
           2. I have changed the answer to a different value.
 
-          [Click here](#{resume_pass_url}?token=#{access_token}) if the above statement is **true**.
+          [Click here](#{resume_pass_url}?client_id=#{client_id}) if the above statement is **true**.
 
-          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+          [Click here](#{resume_fail_url}?client_id=#{client_id}) if the above statement is **false**.
         )
       )
     end

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/rendering_enabled_questions_attestation_test.rb

@@ -10,19 +10,19 @@ module DaVinciDTRTestKit
       Validate that the rendering of the questionnaire includes only the "What would you like on..."
       question appropriate for the dinner selection, if made.
     )
-    input :access_token
+    input :client_id
 
     run do
       wait(
-        identifier: access_token,
+        identifier: client_id,
         message: %(
           I attest that the client application does not display any "What would you like on..."
           questions until I have selected a dinner choice and then only displays the
           "What would you like on..." question relevant for the dinner request:
 
-          [Click here](#{resume_pass_url}?token=#{access_token}) if the above statement is **true**.
+          [Click here](#{resume_pass_url}?client_id=#{client_id}) if the above statement is **true**.
 
-          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+          [Click here](#{resume_fail_url}?client_id=#{client_id}) if the above statement is **false**.
         )
       )
     end

data/lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_package_group.rb

@@ -1,4 +1,4 @@
-require_relative '../shared/dtr_questionnaire_package_request_test'
+require_relative 'dtr_resp_questionnaire_package_request_test'
 require_relative '../shared/dtr_questionnaire_package_request_validation_test'
 
 module DaVinciDTRTestKit
@@ -10,7 +10,7 @@ module DaVinciDTRTestKit
     )
     run_as_group
 
-    test from: :dtr_questionnaire_package_request
+    test from: :dtr_resp_questionnaire_package_request
     test from: :dtr_questionnaire_package_request_validation
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_rendering_attestation_test.rb

@@ -10,21 +10,21 @@ module DaVinciDTRTestKit
       Thist test provides the tester an opportunity to observe their client application following the receipt of the
       questionnaire pacakage and attest that the application renders the questionnaire.
     )
-    input :access_token
+    input :client_id
 
     run do
       load_tagged_requests QUESTIONNAIRE_PACKAGE_TAG
       skip_if request.blank?, 'A Questionnaire Package request must be made prior to running this test'
 
       wait(
-        identifier: access_token,
+        identifier: client_id,
         message: %(
           I attest that the client application displays the questionnaire and respects the following rendering style:
           - The "Signature" field label is rendered with green text
 
-          [Click here](#{resume_pass_url}?token=#{access_token}) if the above statement is **true**.
+          [Click here](#{resume_pass_url}?client_id=#{client_id}) if the above statement is **true**.
 
-          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+          [Click here](#{resume_fail_url}?client_id=#{client_id}) if the above statement is **false**.
         )
       )
     end

data/lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_response_save_test.rb

@@ -9,11 +9,11 @@ module DaVinciDTRTestKit
     description %(
       Inferno, acting as the EHR, will wait for a request to save the QuestionnaireResponse from the client.
     )
-    input :access_token
+    input :client_id
 
     run do
       wait(
-        identifier: access_token,
+        identifier: client_id,
         message: %(
           Complete the questionnaire, leaving the following items unmodified, because a subsequent test will expect
           their pre-populated values:

data/lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_resp_questionnaire_package_request_test.rb

@@ -0,0 +1,95 @@
+require_relative '../../urls'
+
+module DaVinciDTRTestKit
+  class DTRRespQuestionnairePackageRequestTest < Inferno::Test
+    include URLs
+
+    id :dtr_resp_questionnaire_package_request
+    title 'Invoke the DTR Questionnaire Package operation'
+    description %(
+      Inferno will wait for a DTR questionnaire package request from the client. Upon receipt, Inferno will generate and
+      send a response.
+    )
+    input :smart_app_launch, type: 'radio', title: 'SMART App Launch',
+                             description: 'How will the DTR SMART App launch?',
+                             options: { list_options: [{ label: 'Launch from Inferno', value: 'inferno' },
+                                                       { label: 'Launch from EHR', value: 'ehr' }] }
+    input :client_id
+    input :launch_uri, optional: true, description: 'Required if "Launch from Inferno" is selected'
+    input :smart_patient_id, optional: true, title: 'SMART App Launch Patient ID (Respiratory Assist Device)',
+                             type: 'text',
+                             description: %(
+                               Patient instance id to be provided by Inferno as the `patient` as a part of the SMART app
+                               launch.
+                             )
+    input :smart_fhir_context, optional: true, title: 'SMART App Launch fhirContext (Respiratory Assist Device)',
+                               type: 'textarea',
+                               description: %(
+                                 References to be provided by Inferno as the `fhirContext` as a part of the SMART app
+                                 launch. These references help determine the behavior of the app. Referenced instances
+                                 may be providedin the "EHR-available resources" input.
+                               )
+    input :ehr_bundle, optional: true, title: 'EHR-available resources (Respiratory Assist Device)', type: 'textarea',
+                       description: %(
+                                 Resources available from the EHR needed to drive the respiratory assist device
+                                 workflow. Formatted as a FHIR bundle that contains resources, each with an `id`
+                                 property populated. Each instance present will be available for retrieval from
+                                 Inferno at the endpoint `[fhir-base]/[resource type]/[instance id].`
+                               )
+
+    def example_client_jwt_payload_part
+      Base64.strict_encode64({ inferno_client_id: client_id }.to_json).delete('=')
+    end
+
+    run do
+      launch_prompt = if smart_app_launch == 'inferno'
+                        %(Launch the DTR SMART App from Inferno by right clicking
+                          [this link](#{launch_uri}?iss=#{fhir_base_url}&launch=#{launch_uri})
+                          and selecting or "Open in new window" or "Open in new tab".)
+                      else
+                        %(Launch the SMART App from your EHR.)
+                      end
+      inferno_prompt_cont = %(As the DTR app steps through the launch steps, Inferno will wait and respond to the app's
+                              requests for SMART configuration, authorization and access token.)
+      wait(
+        identifier: client_id,
+        message: %(
+          ### SMART App Launch
+
+          #{launch_prompt}
+
+          #{inferno_prompt_cont if smart_app_launch == 'inferno'}
+
+          Then, Inferno will expect the SMART App to invoke the DTR Questionnaire Package operation by sending a POST
+          request to
+
+          `#{questionnaire_package_url}`
+
+          A questionnaire package generated by Inferno will be returned.
+
+          ### Pre-population
+
+          Inferno will then wait for the client to complete Questionnaire pre-population. The client should make FHIR
+          GET requests using service base path:
+
+          `#{fhir_base_url}`
+
+          ### Request Identification
+
+          In order to identify requests for this session, Inferno will look for
+          an `Authorization` header with value:
+
+          ```
+          Bearer eyJhbGcmOiJub25lIn0.#{example_client_jwt_payload_part}.
+          ```
+
+          ### Continuing the Tests
+
+          When the DTR application has finished loading the Questionnaire,
+          including any clinical data requests to support pre-population,
+          [Click here](#{resume_pass_url}?client_id=#{client_id}) to continue.
+        )
+      )
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_smart_app_questionnaire_workflow_group.rb

@@ -7,10 +7,11 @@ module DaVinciDTRTestKit
     id :dtr_smart_app_questionnaire_workflow
     title 'Respiratory Assist Device Questionnaire Workflow'
     description %(
-      This workflow validates that a DTR SMART App can perform a full DTR Questionnaire workflow using a canned
-      Questionnaire for a respiratory assist device order:
+      This workflow validates that a DTR SMART App can perform a full DTR
+      Questionnaire workflow using a canned Questionnaire
+      for a respiratory assist device order:
 
-      1. Fetch the questionnaire package
+      1. Fetch the questionnaire package ([RespiratoryAssistDevices](https://github.com/inferno-framework/davinci-dtr-test-kit/blob/main/lib/davinci_dtr_test_kit/fixtures/questionnaire_package.json))
       2. Render the questionnaire
       3. Pre-populate the questionnaire response
     )

data/lib/davinci_dtr_test_kit/docs/dtr_smart_app_suite_description_v201.md

@@ -52,35 +52,50 @@ validated with the Java validator using `tx.fhir.org` as the terminology server.
 
 ### Quick Start
 
-Inferno does not currently include the ability to launch the client. Therefore, clients
-must be manually configured to point to Inferno's simulated server endpoints. The endpoints
-can be inferred from the URL of the test session which will be of the form `[URL prefix]/dtr_smart_app/[session id]`: (NOTE: both currently use the same URL)
-- Payer Server Base FHIR URL: `[URL prefix]/custom/dtr_smart_app/fhir`
-- Light EHR Base FHIR URL: `[URL prefix]/custom/dtr_smart_app/fhir`
-
-In order for Inferno to associate requests sent to locations under these base URLs with this session,
-it needs to know the bearer token that the app will send on requests, for which 
-there are two options.
-
-1. If you want to choose your own bearer token, then
-    1. Select the "2. Basic Workflows" test from the list on the left (or other target test). 
-    2. Click the '*Run All Tests*' button on the right.
-    3. In the "access_token" field, enter the bearer token that will be sent by the client 
-       under test (as part of the Authorization header - `Bearer <provided value>`).
-    4. Click the '*Submit*' button at the bottom of the dialog.
-2. If you want to use a client_id to obtain an access token, then
-    1. Click the '*Run All Tests*' button on the right.
-    2. Provide the client's registered id "client_id" field of the input (NOTE, Inferno doesn't support the
-        registration API, so this must be obtained from another system or configured manually).
-    3. Click the '*Submit*' button at the bottom of the dialog.
-    4. Make a token request that includes the specified client id to the
-        `[URL prefix]/custom/dtr_smart_app/mock_auth/token` endpoint to get
-        an access token to use on the request of the requests.
-
-In either case, the tests will continue from that point. Further executions of tests under
-this session will also use the selected bearer token.
-
-Note: authentication options for these tests have not been finalized and are subject to change.
+This test suite can be run in two modes, each described below:
+1. [EHR launch mode](#ehr-launch)
+2. [Standalone launch mode](#standalone-launch)
+
+At this time, Inferno's simulation of the payer server that provides the questionnaires
+uses the same base server url and access token, and apps will need to be configured to
+connect to it as well. See the "Combined payer and EHR FHIR servers" section below for details.
+
+The DTR specification allows apps and their partners significant leeway in terms of
+what information is provided on launch and how that information gets used by the app
+to determine the `$questionnaire-package` endpoint and what details to submit as a
+part of that operation. Inferno cannot know ahead of time what data needs to be
+available for the app under test to successfully request, pre-populate, and render 
+a questionnaire. See the "`fhirContext` and available instances"
+section below for details on how to enable Inferno to meet the needs of your application.
+
+#### EHR Launch
+
+In this mode Inferno will launch the app under test using the SMART App Launch
+[EHR launch](https://hl7.org/fhir/smart-app-launch/STU2.1/app-launch.html#launch-app-ehr-launch)
+flow. 
+
+The tester must provide
+1. a `client_id`: can be any string and will uniquely identify the testing session.
+2. a `launch_uri`: will be used by Inferno to generate a link to launch the app under test.
+
+All the details needed to access clinical data from Inferno's simulated EHR are provided
+as a part of the SMART flow, including 
+- the FHIR base server URL to request data from
+- a bearer token to provide on all requests
+
+#### Standalone Launch
+
+In this mode the app under test will launch and on its own and reach out to Inferno to
+begin the workflow as described in the 
+[standalone launch section](https://hl7.org/fhir/smart-app-launch/STU2.1/app-launch.html#launch-app-standalone-launch).
+
+The tester must provide
+1. a `client_id`: can be any string and will uniquely identify the testing session.
+
+The app will then need to connect to Inferno as directed to initiate the SMART and DTR
+workflow. The FHIR base server url that app will connect to is 
+`[URL prefix]/custom/dtr_smart_app/fhir` where `[URL prefix]` comes from the URL of the
+test session which will be of the form `[URL prefix]/dtr_smart_app/[session id]`
 
 ### Postman-based Demo
 
@@ -90,26 +105,75 @@ to make requests against Inferno. This does not include the capability to render
 questionnaires, but does have samples of correctly and incorrectly completed QuestionnaireResponses.
 The following is a list of tests with the Postman requests that can be used with them:
 
-- **2.1** *Static Questionnaire Workflow*: use requests in the `Static Dinner` folder
-  - **2.1.1.01** *Invoke the DTR Questionnaire Package operation*: submit request `Questionnaire Package for Dinner (Static)` while this test is waiting.
-  - **2.1.3.01** *Save the QuestionnaireResponse after completing it*: submit request `Save QuestionnaireResponse for Dinner (Static)` while this test is waiting. If you want to see a failure, submit request `Save QuestionnaireResponse for Dinner (Static) - missing origin extension` instead.
-- **3.1** *Respiratory Assist Device Questionnaire Workflow*: use requests in the `Respiratory Assist Device` folder
-  - **3.1.1.01** *Invoke the DTR Questionnaire Package operation*: submit request `Questionnaire Package for Resp Assist Device` while this test is waiting.
-  - **3.1.3.01** *Save the QuestionnaireResponse after completing it*: submit request `Save Questionnaire Response for Resp Assist Device` while this test is waiting. If you want to see a failure, submit request `Save Questionnaire Response for Resp Assist Device - unexpected override` instead.
+- **Standalone launch sequence**: use requests in the `SMART App Launch` folder during 
+  tests **1.1.1.01** or **2.1.1.01** to simulate the SMART Launch flow and obtain an access
+  token to use for subsequent requests. See the collection's Overview for details on the
+  access token's generation.
+- **1.1** *Static Questionnaire Workflow*: use requests in the `Static Dinner` folder
+  - **1.1.1.01** *Invoke the DTR Questionnaire Package operation*: submit request `Questionnaire Package for Dinner (Static)` while this test is waiting.
+  - **1.1.3.01** *Save the QuestionnaireResponse after completing it*: submit request `Save QuestionnaireResponse for Dinner (Static)` while this test is waiting. If you want to see a failure, submit request `Save QuestionnaireResponse for Dinner (Static) - missing origin extension` instead.
+- **2.1** *Respiratory Assist Device Questionnaire Workflow*: use requests in the `Respiratory Assist Device` folder
+  - **2.1.1.01** *Invoke the DTR Questionnaire Package operation*: submit request `Questionnaire Package for Resp Assist Device` while this test is waiting.
+  - **2.1.3.01** *Save the QuestionnaireResponse after completing it*: submit request `Save Questionnaire Response for Resp Assist Device` while this test is waiting. If you want to see a failure, submit request `Save Questionnaire Response for Resp Assist Device - unexpected override` instead.
+
+## Configuration Details
+
+### `fhirContext` and available instances
+
+Once they have launched, DTR SMART Apps obtain details that drive their retrieval of questionnaires
+and relevant clinical data from the payer and the EHR from [context that is passed with
+the access token](https://hl7.org/fhir/smart-app-launch/STU2.1/scopes-and-launch-context.html)
+provided by the EHR. Inferno cannot know ahead of time what information to provide and
+what instances to make available to direct the app under test to request and render a
+particular questionnaire.
+
+Therefore, use of this test suite requests that the tester provide this information so that the
+app can demonstrate its capabilities based on whatever business logic is present. These tests
+currently support two context parameters that contain references to instance in the EHR and provides
+testers with a way to provide those instances to Inferno so it can serve them to the app. These are
+controlled by the following inputs present on each group associated with a questionnaire:
+
+- **SMART App Launch Patient ID**: provide an `id` for the subject Patient FHIR instance.
+- **SMART App Launch `fhirContext`**: provide a JSON object containing FHIR references to instances
+  relevant to the DTR workflow, e.g. 
+  
+  ```
+  [{reference: 'Coverage/cov015'}, {reference: 'DeviceRequest/devreqe0470'}]
+  ``` 
+  This will be included under the `fhirContext` key of the token response.
+- **EHR-available resources**: provide a Bundle containing FHIR instances referenced in and from the
+  previous two inputs. Each instance must include an `id` element that Inferno will use in conjunction
+  with the `resourceType` to make the instances available at the `[server base url]/[resourceType]/[id]`.
+
+Each questionnaire workflow group description includes a link to the questionnaire package that Inferno will return
+(e.g., [here](https://github.com/inferno-framework/davinci-dtr-test-kit/blob/main/lib/davinci_dtr_test_kit/fixtures/dinner_static/questionnaire_dinner_order_static.json))
+where you can find `id` and `url` values and any other details needed to determine what inputs 
+will allow the app under test to work with that questionnaire. Note additionally that Inferno will always
+return that questionnaire in response to `$questionnaire-package` requests made during that test.
+
+These inputs can be cumbersome to create and if you have suggestions about how to improve this process
+while keeping the flexibility of Inferno to run with any app, submit a ticket 
+[here](https://github.com/inferno-framework/davinci-pas-test-kit/issues).
 
 ## Limitations
 
-The DTR IG is a complex specification and these tests currently validate SMART app
-configuration to only part of it. Future versions of the test suite will test further
+The DTR IG is a complex specification and these tests currently validate conformance to only
+a subset of IG requirements. Future versions of the test suite will test further
 features. A few specific features of interest are listed below.
 
 ### Launching and security
 
-The primary limitation on this test suite is that it requires the client under test
-to be manually configured to point to the Inferno endpoints and send a bearer token. 
-In the future, the tests will provide a mechanism for launching the application using
-the SMART app launch mechanism. To provide feedback and input on the design of this feature,
-submit a ticket [here](https://github.com/inferno-framework/davinci-pas-test-kit/issues).
+This test kit contains basic SMART App Launch cabilities that may not be complete. In particular,
+refresh tokens are not currently supported and scopes are not precise. To provide feedback and 
+input on the design of this feature and help us priortize improvements, submit a ticket 
+[here](https://github.com/inferno-framework/davinci-pas-test-kit/issues).
+
+### Combined payer and EHR FHIR servers
+
+At this time, the test suite simulates a single FHIR server that uses the same access token
+for both the payer server and the EHR server. Apps under test must use the FHIR server base url
+and access token identified during the SMART App Launch sequence when making requests
+to retrieve questionnaires.
 
 ### Questionnaire Feature Coverage
 

data/lib/davinci_dtr_test_kit/dtr_full_ehr_suite.rb

@@ -55,11 +55,12 @@ module DaVinciDTRTestKit
 
     allow_cors QUESTIONNAIRE_PACKAGE_PATH
 
-    record_response_route :post, TOKEN_PATH, 'dtr_auth', method(:token_response) do |request|
-      DTRFullEHRSuite.extract_client_id(request)
+    record_response_route :post, PAYER_TOKEN_PATH, 'dtr_full_ehr_payer_token',
+                          method(:payer_token_response) do |request|
+      DTRFullEHRSuite.extract_client_id_from_form_params(request)
     end
 
-    record_response_route :post, '/fhir/Questionnaire/$questionnaire-package', QUESTIONNAIRE_PACKAGE_TAG,
+    record_response_route :post, QUESTIONNAIRE_PACKAGE_PATH, QUESTIONNAIRE_PACKAGE_TAG,
                           method(:questionnaire_package_response) do |request|
       DTRFullEHRSuite.extract_bearer_token(request)
     end

data/lib/davinci_dtr_test_kit/dtr_payer_server_suite.rb

@@ -5,10 +5,12 @@ require_relative 'payer_server_groups/payer_server_static_group'
 require_relative 'payer_server_groups/payer_server_adaptive_group'
 require_relative 'tags'
 require_relative 'mock_payer'
+require_relative 'mock_auth_server'
 require_relative 'version'
 
 module DaVinciDTRTestKit
   class DTRPayerServerSuite < Inferno::TestSuite
+    extend MockAuthServer
     extend MockPayer
 
     id :dtr_payer_server
@@ -104,16 +106,16 @@ module DaVinciDTRTestKit
 
     allow_cors QUESTIONNAIRE_PACKAGE_PATH, NEXT_PATH
 
-    record_response_route :post, TOKEN_PATH, 'dtr_auth', method(:token_response) do |request|
-      DTRPayerServerSuite.extract_client_id(request)
+    record_response_route :post, PAYER_TOKEN_PATH, 'dtr_payer_auth', method(:payer_token_response) do |request|
+      DTRPayerServerSuite.extract_client_id_from_form_params(request)
     end
 
-    record_response_route :post, '/fhir/Questionnaire/$questionnaire-package', QUESTIONNAIRE_TAG,
+    record_response_route :post, QUESTIONNAIRE_PACKAGE_PATH, QUESTIONNAIRE_TAG,
                           method(:payer_questionnaire_response), resumes: method(:test_resumes?) do |request|
       DTRPayerServerSuite.extract_bearer_token(request)
     end
 
-    record_response_route :post, '/fhir/Questionnaire/$next-question', NEXT_TAG,
+    record_response_route :post, NEXT_PATH, NEXT_TAG,
                           method(:questionnaire_next_response), resumes: method(:test_resumes?) do |request|
       DTRPayerServerSuite.extract_bearer_token(request)
     end

data/lib/davinci_dtr_test_kit/dtr_questionnaire_response_validation.rb

@@ -36,6 +36,16 @@ module DaVinciDTRTestKit
       validate_cql_executed(questionnaire_response.item, questionnaire_cql_expression_link_ids,
                             template_prepopulation_expectations, template_override_expectations, validation_errors)
 
+      if template_prepopulation_expectations.size.positive?
+        validation_errors << 'Items expected to be pre-populated not found: ' \
+                             "#{template_prepopulation_expectations.keys.join(', ')}"
+      end
+
+      if template_override_expectations.size.positive?
+        validation_errors << 'Items expected to be pre-poplated and overridden not found: ' \
+                             "#{template_override_expectations.keys.join(', ')}"
+      end
+
       validation_errors.each { |msg| messages << { type: 'error', message: msg } }
       assert validation_errors.blank?, 'QuestionnaireResponse is not conformant. Check messages for issues found.'
     end
@@ -47,10 +57,11 @@ module DaVinciDTRTestKit
         link_id = item_to_validate.linkId
         if questionnaire_cql_expression_link_ids.include?(link_id)
           if template_prepopulation_expectations.key?(link_id)
-            check_item_prepopulation(item_to_validate, template_prepopulation_expectations[link_id], error_messages,
-                                     false)
+            check_item_prepopulation(item_to_validate, template_prepopulation_expectations.delete(link_id),
+                                     error_messages, false)
           elsif template_override_expectations.include?(link_id)
-            check_item_prepopulation(item_to_validate, template_override_expectations[link_id], error_messages, true)
+            check_item_prepopulation(item_to_validate, template_override_expectations.delete(link_id), error_messages,
+                                     true)
           else
             raise "template missing expectation for question `#{link_id}`"
           end
@@ -84,11 +95,10 @@ module DaVinciDTRTestKit
           raise "Template QuestionnaireResponse item `#{target_link_id}` missing the `origin.source` extension"
         end
 
-        # TODO: handle other data types
         if source_extension.value == 'auto'
-          expected_prepopulated[target_link_id] = target_item_answer.value
+          expected_prepopulated[target_link_id] = target_item_answer
         elsif source_extension.value == 'override'
-          expected_overrides[target_link_id] = target_item_answer.value
+          expected_overrides[target_link_id] = target_item_answer
         else
           raise "`origin.source` extension for item `#{target_link_id}` has unexpected value: #{source_extension.value}"
         end
@@ -114,12 +124,12 @@ module DaVinciDTRTestKit
       answer = item.answer.first
       if answer&.value&.present?
         # check answer
-        if override && answer.value == expected_answer
+        if override && answer_value_equal?(expected_answer, answer)
           error_list << "Answer to item `#{item.linkId}` was not overriden from the pre-populated value. " \
                         "Found #{expected_answer}, but should be different"
-        elsif !override && answer.value != expected_answer
-          error_list << "answer to item `#{item.linkId}` contains unexpected value. Expected: #{expected_answer}. " \
-                        "Found #{answer.value}"
+        elsif !override && !answer_value_equal?(expected_answer, answer)
+          error_list << "answer to item `#{item.linkId}` contains unexpected value. Expected: \
+          #{value_for_display(expected_answer)}. Found #{value_for_display(answer)}"
         end
 
         # check origin.source extension
@@ -176,5 +186,11 @@ module DaVinciDTRTestKit
     def coding_equal?(expected, actual)
       expected.system == actual&.system && expected.code == actual&.code
     end
+
+    def value_for_display(answer)
+      return "#{answer.value&.system}|#{answer.value&.code}" if answer.valueCoding.present?
+
+      answer.value
+    end
   end
 end

data/lib/davinci_dtr_test_kit/dtr_smart_app_suite.rb

@@ -11,8 +11,9 @@ require_relative 'version'
 
 module DaVinciDTRTestKit
   class DTRSmartAppSuite < Inferno::TestSuite
-    extend MockPayer
+    extend MockAuthServer
     extend MockEHR
+    extend MockPayer
 
     id :dtr_smart_app
     title 'Da Vinci DTR SMART App Test Suite'
@@ -48,43 +49,64 @@ module DaVinciDTRTestKit
       end
     end
 
-    allow_cors QUESTIONNAIRE_PACKAGE_PATH, QUESTIONNAIRE_RESPONSE_PATH, FHIR_RESOURCE_PATH, FHIR_SEARCH_PATH
+    allow_cors QUESTIONNAIRE_PACKAGE_PATH, QUESTIONNAIRE_RESPONSE_PATH, FHIR_RESOURCE_PATH, FHIR_SEARCH_PATH,
+               EHR_AUTHORIZE_PATH, EHR_TOKEN_PATH
 
     route(:get, '/fhir/metadata', method(:metadata_handler))
 
-    record_response_route :post, TOKEN_PATH, 'dtr_auth', method(:token_response) do |request|
-      DTRSmartAppSuite.extract_client_id(request)
+    route(:get, SMART_CONFIG_PATH, method(:ehr_smart_config))
+
+    record_response_route :get, EHR_AUTHORIZE_PATH, 'dtr_smart_app_ehr_authorize', method(:ehr_authorize),
+                          resumes: ->(_) { false } do |request|
+      DTRSmartAppSuite.extract_client_id_from_query_params(request)
+    end
+
+    record_response_route :post, EHR_AUTHORIZE_PATH, 'dtr_smart_app_authorize', method(:ehr_authorize),
+                          resumes: ->(_) { false } do |request|
+      DTRSmartAppSuite.extract_client_id_from_form_params(request)
+    end
+
+    record_response_route :post, EHR_TOKEN_PATH, 'dtr_smart_app_ehr_token', method(:ehr_token_response),
+                          resumes: ->(_) { false } do |request|
+      DTRSmartAppSuite.extract_client_id_from_token_request(request)
+    end
+
+    record_response_route :post, PAYER_TOKEN_PATH, 'dtr_smart_app_payer_token',
+                          method(:payer_token_response) do |request|
+      DTRSmartAppSuite.extract_client_id_from_client_assertion(request)
     end
 
     record_response_route :post, QUESTIONNAIRE_PACKAGE_PATH, QUESTIONNAIRE_PACKAGE_TAG,
                           method(:questionnaire_package_response), resumes: ->(_) { false } do |request|
-      DTRSmartAppSuite.extract_bearer_token(request)
+      DTRSmartAppSuite.extract_client_id_from_bearer_token(request)
     end
 
     record_response_route :post, QUESTIONNAIRE_RESPONSE_PATH, 'dtr_smart_app_questionnaire_response',
                           method(:questionnaire_response_response) do |request|
-      DTRSmartAppSuite.extract_bearer_token(request)
+      DTRSmartAppSuite.extract_client_id_from_bearer_token(request)
     end
 
     record_response_route :get, FHIR_RESOURCE_PATH, SMART_APP_EHR_REQUEST_TAG, method(:get_fhir_resource),
                           resumes: ->(_) { false } do |request|
-      DTRSmartAppSuite.extract_bearer_token(request)
+      DTRSmartAppSuite.extract_client_id_from_bearer_token(request)
     end
 
     record_response_route :get, FHIR_SEARCH_PATH, SMART_APP_EHR_REQUEST_TAG, method(:get_fhir_resource),
                           resumes: ->(_) { false } do |request|
-      DTRSmartAppSuite.extract_bearer_token(request)
+      DTRSmartAppSuite.extract_client_id_from_bearer_token(request)
     end
 
     resume_test_route :get, RESUME_PASS_PATH do |request|
-      DTRSmartAppSuite.extract_token_from_query_params(request)
+      DTRSmartAppSuite.extract_client_id_from_query_params(request)
     end
 
     resume_test_route :get, RESUME_FAIL_PATH, result: 'fail' do |request|
-      DTRSmartAppSuite.extract_token_from_query_params(request)
+      DTRSmartAppSuite.extract_client_id_from_query_params(request)
     end
 
-    group from: :oauth2_authentication
+    # TODO: Update based on SMART Launch changes. Do we even want to have this group now?
+    # group from: :oauth2_authentication
+
     group do
       id :dtr_smart_app_basic_workflows
       title 'Basic Workflows'

data/lib/davinci_dtr_test_kit/fixtures/dinner_static/questionnaire_dinner_order_static.json

@@ -7,6 +7,7 @@
       "resource": {
         "resourceType": "Questionnaire",
         "id": "DinnerOrderStatic",
+        "url": "urn:inferno:dtr-test-kit:dinner-order-static",
         "meta": {
           "profile": [
             "http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
@@ -21,7 +22,6 @@
         ],
         "name": "DinnerOrderStatic",
         "title": "Dinner Order (Static)",
-        "url": "urn:inferno:dtr-test-kit:dinner-order-static",
         "status": "draft",
         "subjectType": [
           "Patient"

data/lib/davinci_dtr_test_kit/fixtures/questionnaire_package.json

@@ -5,6 +5,7 @@
       "resource": {
         "resourceType": "Questionnaire",
         "id": "RespiratoryAssistDevices",
+        "url": "urn:inferno:dtr-test-kit:respiratory-assist-devices",
         "meta": {
           "profile": [
             "http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
@@ -453,7 +454,6 @@
         ],
         "name": "RespiratoryAssistDevices",
         "title": "Respiratory Assist Device Questionnaire",
-        "url": "urn:fake",
         "status": "draft",
         "subjectType": [
           "Patient"

data/lib/davinci_dtr_test_kit/mock_auth_server.rb

@@ -0,0 +1,135 @@
+require_relative 'urls'
+require_relative 'fixtures'
+
+module DaVinciDTRTestKit
+  module MockAuthServer
+    include Fixtures
+
+    def ehr_smart_config(env)
+      protocol = env['rack.url_scheme']
+      host = env['HTTP_HOST']
+      path = env['REQUEST_PATH'] || env['PATH_INFO']
+      path.gsub!(%r{#{SMART_CONFIG_PATH}(/)?}, '')
+      base_url = "#{protocol}://#{host + path}"
+      response_body =
+        {
+          authorization_endpoint: base_url + EHR_AUTHORIZE_PATH,
+          token_endpoint: base_url + EHR_TOKEN_PATH,
+          token_endpoint_auth_methods_supported: ['private_key_jwt'],
+          token_endpoint_auth_signing_alg_values_supported: ['RS256'],
+          grant_types_supported: ['authorization_code'],
+          scopes_supported: ['launch', 'patient/*.rs', 'user/*.rs', 'offline_access'],
+          response_types_supported: ['code'],
+          code_challenge_methods_supported: ['S256'],
+          capabilities: [
+            'launch-ehr',
+            'permission-patient',
+            'permission-user',
+            'client-public',
+            'client-confidential-symmetric',
+            'client-confidential-asymmetric'
+          ]
+        }.to_json
+
+      [200, { 'Content-Type' => 'application/json', 'Access-Control-Allow-Origin' => '*' }, [response_body]]
+    end
+
+    def ehr_authorize(request, _test = nil, _test_result = nil)
+      # Authorization requests can bet GET or POST
+      params = request.verb == 'get' ? request.query_parameters : URI.decode_www_form(request.request_body)&.to_h
+      if params['redirect_uri'].present?
+        redirect_uri = "#{params['redirect_uri']}?" \
+                       "code=#{SecureRandom.hex}&" \
+                       "state=#{params['state']}"
+        request.status = 302
+        request.response_headers = { 'Location' => redirect_uri }
+      else
+        request.status = 400
+        request.response_headers = { 'Content-Type': 'application/json' }
+        request.response_body = FHIR::OperationOutcome.new(
+          issue: FHIR::OperationOutcome::Issue.new(severity: 'fatal', code: 'required',
+                                                   details: FHIR::CodeableConcept.new(
+                                                     text: 'No redirect_uri provided'
+                                                   ))
+        ).to_json
+      end
+    end
+
+    def ehr_token_response(request, _test = nil, test_result = nil)
+      client_id = extract_client_id_from_token_request(request)
+      token = JWT.encode({ inferno_client_id: client_id }, nil, 'none')
+      response = { access_token: token, token_type: 'bearer', expires_in: 3600 }
+      test_input = JSON.parse(test_result.input_json)
+      smart_app_launch_input = test_input.find { |input| input['name'] == 'smart_app_launch' }
+
+      if smart_app_launch_input.present? && smart_app_launch_input['value'] == 'inferno'
+        fhir_context_input = test_input.find { |input| input['name'] == 'smart_fhir_context' }
+        fhir_context_input_value = fhir_context_input['value'] if fhir_context_input.present?
+        fhir_context = fhir_context_input_value || [
+          { reference: 'Coverage/cov015' },
+          { reference: 'DeviceRequest/devreqe0470' }
+        ]
+
+        smart_patient_input = test_input.find { |input| input['name'] == 'smart_patient_id' }
+        smart_patient_input_value = smart_patient_input['value'] if smart_patient_input.present?
+        smart_patient = smart_patient_input_value || 'pat015'
+
+        response.merge!({ patient: smart_patient, fhirContext: fhir_context })
+      end
+      request.response_body = response.to_json
+      request.response_headers = { 'Access-Control-Allow-Origin' => '*' }
+      request.status = 200
+    end
+
+    def payer_token_response(request, _test = nil, _test_result = nil)
+      # Placeholder for a more complete mock token endpoint
+      request.response_body = { access_token: SecureRandom.hex, token_type: 'bearer', expires_in: 3600 }.to_json
+      request.status = 200
+    end
+
+    def extract_client_id_from_token_request(request)
+      # Public client || confidential client asymmetric || confidential client symmetric
+      extract_client_id_from_form_params(request) ||
+        extract_client_id_from_client_assertion(request) ||
+        extract_client_id_from_basic_auth(request)
+    end
+
+    def extract_client_id_from_form_params(request)
+      URI.decode_www_form(request.request_body).to_h['client_id']
+    end
+
+    def extract_client_id_from_client_assertion(request)
+      encoded_jwt = URI.decode_www_form(request.request_body).to_h['client_assertion']
+      return unless encoded_jwt.present?
+
+      jwt_payload = JWT.decode(encoded_jwt, nil, false)&.first # skip signature verification
+      jwt_payload['iss'] || jwt_payload['sub'] if jwt_payload.present?
+    end
+
+    def extract_client_id_from_basic_auth(request)
+      encoded_credentials = request.request_header('Authorization')&.value&.split&.last
+      return unless encoded_credentials.present?
+
+      decoded_credentials = Base64.decode64(encoded_credentials)
+      decoded_credentials&.split(':')&.first
+    end
+
+    def extract_client_id_from_query_params(request)
+      request.query_parameters['client_id']
+    end
+
+    def extract_client_id_from_bearer_token(request)
+      token = extract_bearer_token(request)
+      JWT.decode(token, nil, false)&.first&.dig('inferno_client_id')
+    end
+
+    # Header expected to be a bearer token of the form "Bearer: <token>"
+    def extract_bearer_token(request)
+      request.request_header('Authorization')&.value&.split&.last
+    end
+
+    def extract_token_from_query_params(request)
+      request.query_parameters['token']
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/mock_ehr.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require_relative 'urls'
+
 module DaVinciDTRTestKit
   module MockEHR
     RESOURCE_SERVER_BASE = ENV.fetch('FHIR_REFERENCE_SERVER')
     RESOURCE_SERVER_BEARER_TOKEN = 'SAMPLE_TOKEN'
 
-    RESPONSE_HEADERS = { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' }.freeze
+    RESPONSE_HEADERS = { 'Content-Type' => 'application/json', 'Access-Control-Allow-Origin' => '*' }.freeze
 
     def resource_server_client
       return @resource_server_client if @resource_server_client
@@ -18,13 +20,13 @@ module DaVinciDTRTestKit
     def metadata_handler(_env)
       cs = resource_server_client.capability_statement
       if cs.present?
-        [200, { 'Content-Type' => 'application/json', 'Access-Control-Allow-Origin' => '*' }, [cs.to_json]]
+        [200, RESPONSE_HEADERS, [cs.to_json]]
       else
         [500, {}, ['Unexpected error occurred while fetching metadata']]
       end
     end
 
-    def get_fhir_resource(request, _test = nil, _test_result = nil)
+    def get_fhir_resource(request, _test = nil, test_result = nil)
       resource_type, id = resource_type_and_id_from_url(request.url)
       request.response_headers = RESPONSE_HEADERS
 
@@ -34,15 +36,7 @@ module DaVinciDTRTestKit
         resource_type = nil
       end
 
-      if resource_type.present?
-        response = if id.present?
-                     resource_server_client.read(fhir_class, id)
-                   else
-                     resource_server_client.search(fhir_class, search: { parameters: request.query_parameters })
-                   end
-        request.status = response.code
-        request.response_body = response.body
-      else
+      if resource_type.blank?
         request.status = 400
         request.response_headers = { 'Content-Type': 'application/json' }
         request.response_body = FHIR::OperationOutcome.new(
@@ -51,7 +45,33 @@ module DaVinciDTRTestKit
                                                      text: 'No recognized resource type in URL'
                                                    ))
         ).to_json
+        return
       end
+
+      # Respond with user-inputted resource if there is one that matches the request
+      ehr_bundle_input = JSON.parse(test_result.input_json).find { |input| input['name'] == 'ehr_bundle' }
+      ehr_bundle_input_value = ehr_bundle_input_value = ehr_bundle_input['value'] if ehr_bundle_input.present?
+      ehr_bundle = FHIR.from_contents(ehr_bundle_input_value) if ehr_bundle_input_value.present?
+      if id.present? && ehr_bundle.present? && ehr_bundle.is_a?(FHIR::Bundle)
+        matching_resource = ehr_bundle.entry&.find do |entry|
+          entry.resource.is_a?(fhir_class) && entry.resource&.id == id
+        end&.resource
+        if matching_resource.present?
+          request.status = 200
+          request.response_headers = { 'Content-Type': 'application/json' }
+          request.response_body = matching_resource.to_json
+          return
+        end
+      end
+
+      # Proxy resource request to the reference server
+      response = if id.present?
+                   resource_server_client.read(fhir_class, id)
+                 else
+                   resource_server_client.search(fhir_class, search: { parameters: request.query_parameters })
+                 end
+      request.status = response.code
+      request.response_body = response.body
     end
 
     def questionnaire_response_response(request, _test = nil, _test_result = nil)

data/lib/davinci_dtr_test_kit/mock_payer.rb

@@ -6,13 +6,7 @@ module DaVinciDTRTestKit
   module MockPayer
     include Fixtures
 
-    RESPONSE_HEADERS = { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' }.freeze
-
-    def token_response(request, _test = nil, _test_result = nil)
-      # Placeholder for a more complete mock token endpoint
-      request.response_body = { access_token: SecureRandom.hex, token_type: 'bearer', expires_in: 300 }.to_json
-      request.status = 200
-    end
+    RESPONSE_HEADERS = { 'Content-Type' => 'application/json', 'Access-Control-Allow-Origin' => '*' }.freeze
 
     def questionnaire_package_response(request, _test = nil, test_result = nil)
       request.status = 200
@@ -47,19 +41,6 @@ module DaVinciDTRTestKit
       request.response_body = payer_response.response[:body]
     end
 
-    def extract_client_id(request)
-      URI.decode_www_form(request.request_body).to_h['client_id']
-    end
-
-    # Header expected to be a bearer token of the form "Bearer: <token>"
-    def extract_bearer_token(request)
-      request.request_header('Authorization')&.value&.split&.last
-    end
-
-    def extract_token_from_query_params(request)
-      request.query_parameters['token']
-    end
-
     def test_resumes?(test)
       !test.config.options[:accepts_multiple_requests]
     end

data/lib/davinci_dtr_test_kit/urls.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 module DaVinciDTRTestKit
-  TOKEN_PATH = '/mock_auth/token'
+  SMART_CONFIG_PATH = '/fhir/.well-known/smart-configuration'
+  EHR_AUTHORIZE_PATH = '/mock_ehr_auth/authorize'
+  EHR_TOKEN_PATH = '/mock_ehr_auth/token'
+  PAYER_TOKEN_PATH = '/mock_payer_auth/token'
   QUESTIONNAIRE_PACKAGE_PATH = '/fhir/Questionnaire/$questionnaire-package'
   NEXT_PATH = '/fhir/Questionnaire/$next-question'
   QUESTIONNAIRE_RESPONSE_PATH = '/fhir/QuestionnaireResponse'
@@ -15,8 +18,16 @@ module DaVinciDTRTestKit
       @base_url ||= "#{Inferno::Application['base_url']}/custom/#{suite_id}"
     end
 
-    def token_url
-      @token_url ||= base_url + TOKEN_PATH
+    def ehr_authorize_url
+      @ehr_authorize_url ||= base_url + EHR_AUTHORIZE_PATH
+    end
+
+    def ehr_token_url
+      @ehr_token_url ||= base_url + EHR_TOKEN_PATH
+    end
+
+    def payer_token_url
+      @payer_token_url ||= base_url + PAYER_TOKEN_PATH
     end
 
     def questionnaire_package_url

data/lib/davinci_dtr_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DaVinciDTRTestKit
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: davinci_dtr_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Karl Naden
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -26,6 +26,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.37
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: Test Kit for the Da Vinci Documentation Templates and Rules (DTR) FHIR
   Implementation Guide
 email:
@@ -40,6 +54,7 @@ files:
 - lib/davinci_dtr_test_kit/auth_groups/token_request_test.rb
 - lib/davinci_dtr_test_kit/auth_groups/token_validation_test.rb
 - lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/dtr_smart_app_questionnaire_workflow_group.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_dinner_questionnaire_package_request_test.rb
 - lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_questionnaire_response_save_test.rb
 - lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_smart_app_questionnaire_workflow_group.rb
 - lib/davinci_dtr_test_kit/client_groups/dinner_static/prepopulation_attestation_test.rb
@@ -51,8 +66,8 @@ files:
 - lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_rendering_group.rb
 - lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_response_group.rb
 - lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_response_save_test.rb
+- lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_resp_questionnaire_package_request_test.rb
 - lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_smart_app_questionnaire_workflow_group.rb
-- lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_package_request_test.rb
 - lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_package_request_validation_test.rb
 - lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_response_basic_conformance_test.rb
 - lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_response_pre_population_test.rb
@@ -77,6 +92,7 @@ files:
 - lib/davinci_dtr_test_kit/fixtures/dinner_static/questionnaire_response_dinner_order_static.json
 - lib/davinci_dtr_test_kit/fixtures/pre_populated_questionnaire_response.json
 - lib/davinci_dtr_test_kit/fixtures/questionnaire_package.json
+- lib/davinci_dtr_test_kit/mock_auth_server.rb
 - lib/davinci_dtr_test_kit/mock_ehr.rb
 - lib/davinci_dtr_test_kit/mock_payer.rb
 - lib/davinci_dtr_test_kit/payer_server_groups/adaptive_form_libraries_test.rb

data/lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_package_request_test.rb

@@ -1,36 +0,0 @@
-require_relative '../../urls'
-
-module DaVinciDTRTestKit
-  class DTRQuestionnairePackageRequestTest < Inferno::Test
-    include URLs
-
-    id :dtr_questionnaire_package_request
-    title 'Invoke the DTR Questionnaire Package operation'
-    description %(
-      Inferno will wait for a DTR questionnaire package request from the client. Upon receipt, Inferno will generate and
-      send a response.
-    )
-    input :access_token
-
-    run do
-      wait(
-        identifier: access_token,
-        message: %(
-          Invoke the DTR Questionnaire Package operation by sending a POST request to
-
-          `#{questionnaire_package_url}`
-
-          A questionnaire package generated by Inferno will be returned.
-
-          Inferno will wait for the client to complete Questionnaire pre-population. The client should make FHIR GET
-          requests using service base path:
-
-          `#{fhir_base_url}`
-
-          When the DTR application has finished loading the Questionnaire,
-          [Click here](#{resume_pass_url}?token=#{access_token}) to continue.
-        )
-      )
-    end
-  end
-end