bulk_data_test_kit 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8bd4ede7fec0e6e07982c8ca16df8b8fe43f91143fe55e3208457278ec77b94
-  data.tar.gz: 28ec21c79f6122c7d42de399fa5c5f1f962b174a3b0acf96d7b55dbe46978309
+  metadata.gz: 8d4f7ca4af64076b35b17e35cde95ed92208d98cecb76053821e28e0bf946aee
+  data.tar.gz: 8e5960c4a3a0049b1c2aa81dbed7a1ad4650d69e5f417310f5a5dd2a263b65e4
 SHA512:
-  metadata.gz: b0e29830ff2c197233fb68a5fdd33804165152a8c8e9ba74ab2951f2799b42391b05961d078b200a9fbb9e21992a6e4b2766c21d2647b3dee35257926c7627dc
-  data.tar.gz: 161f76a25de17541efc02614827beb4530bd516920337a526ad0e8f5a2223d3733f4965a5a9af0790a2d65d30e33920b8b7141be3f3787973ee0e1216cd57d84
+  metadata.gz: f4a8b6e4bfcdd3bfb52a5d5f685139c97beb03bedbfbde6d24eea782d9615fe5b6ca384c0a96286b9b5e1c03ad25526c92b42a41089789334260817ebc4f0108
+  data.tar.gz: 954254a8203f840fa52f723895082f5187311340812fa422a3d920e559742f96e3c5cc8d28b16f4a9b3b8e9efc216b2cbaf74b247f9072e8acd69a9e1bdf7283

data/config/presets/bulk_data_v101_bulk_data_server.json

@@ -11,11 +11,16 @@
       "value": "https://bulk-data.smarthealthit.org/eyJlcnIiOiIiLCJwYWdlIjoxMDAsImR1ciI6MTAsInRsdCI6NjAsIm0iOjEsInN0dSI6NCwiZGVsIjowLCJzZWN1cmUiOjF9/fhir"
     },
     {
-      "name": "backend_services_client_id",
-      "type": "text",
-      "title": "Bulk Data Client ID",
-      "description": "Client ID provided at registration to the Inferno application.",
-      "value": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6InJlZ2lzdHJhdGlvbi10b2tlbiJ9.eyJqd2tzX3VybCI6Imh0dHBzOi8vaW5mZXJuby5oZWFsdGhpdC5nb3Yvc3VpdGVzL2N1c3RvbS9idWxrX2RhdGFfdjEwMS8ud2VsbC1rbm93bi9qd2tzLmpzb24iLCJhY2Nlc3NUb2tlbnNFeHBpcmVJbiI6NjAsImlhdCI6MTcyNjUwMzU3N30.T6xomQ7aMfrnvQ_kC7S0aUgTQXzgDYDI3A-DIFBLH5g"
+      "name": "smart_auth_info",
+      "title": "Backend Services Credentials",
+      "type": "auth_info",
+      "value": {
+        "auth_type": "backend_services",
+        "use_discovery": "true",
+        "encryption_algorithm": "ES384",
+        "requested_scopes": "system/*.read",
+        "client_id": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6InJlZ2lzdHJhdGlvbi10b2tlbiJ9.eyJqd2tzX3VybCI6Imh0dHBzOi8vaW5mZXJuby5oZWFsdGhpdC5nb3Yvc3VpdGVzL2N1c3RvbS9idWxrX2RhdGFfdjEwMS8ud2VsbC1rbm93bi9qd2tzLmpzb24iLCJhY2Nlc3NUb2tlbnNFeHBpcmVJbiI6NjAsImlhdCI6MTcyNjUwMzU3N30.T6xomQ7aMfrnvQ_kC7S0aUgTQXzgDYDI3A-DIFBLH5g"
+      }
     },
     {
       "name": "group_id",

data/config/presets/bulk_data_v101_inferno_reference_server.json

@@ -11,11 +11,16 @@
       "value": "https://inferno.healthit.gov/reference-server/r4"
     },
     {
-      "name": "backend_services_client_id",
-      "type": "text",
-      "title": "Bulk Data Client ID",
-      "description": "Client ID provided at registration to the Inferno application.",
-      "value": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6InJlZ2lzdHJhdGlvbi10b2tlbiJ9.eyJqd2tzX3VybCI6Imh0dHA6Ly8xMC4xNS4yNTIuNzMvaW5mZXJuby8ud2VsbC1rbm93bi9qd2tzLmpzb24iLCJhY2Nlc3NUb2tlbnNFeHBpcmVJbiI6MTUsImlhdCI6MTU5NzQxMzE5NX0.q4v4Msc74kN506KTZ0q_minyapJw0gwlT6M_uiL73S4"
+      "name": "smart_auth_info",
+      "title": "Backend Services Credentials",
+      "type": "auth_info",
+      "value": {
+        "encryption_algorithm": "ES384",
+        "auth_type": "backend_services",
+        "use_discovery": "true",
+        "requested_scopes": "system/*.read",
+        "client_id": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6InJlZ2lzdHJhdGlvbi10b2tlbiJ9.eyJqd2tzX3VybCI6Imh0dHA6Ly8xMC4xNS4yNTIuNzMvaW5mZXJuby8ud2VsbC1rbm93bi9qd2tzLmpzb24iLCJhY2Nlc3NUb2tlbnNFeHBpcmVJbiI6MTUsImlhdCI6MTU5NzQxMzE5NX0.q4v4Msc74kN506KTZ0q_minyapJw0gwlT6M_uiL73S4"
+      }
     },
     {
       "name": "group_id",

data/config/presets/bulk_data_v200_bulk_data_server.json

@@ -11,11 +11,16 @@
       "value": "https://bulk-data.smarthealthit.org/eyJlcnIiOiIiLCJwYWdlIjoxMDAsImR1ciI6MTAsInRsdCI6NjAsIm0iOjEsInN0dSI6NCwiZGVsIjowLCJzZWN1cmUiOjF9/fhir"
     },
     {
-      "name": "backend_services_client_id",
-      "type": "text",
-      "title": "Bulk Data Client ID",
-      "description": "Client ID provided at registration to the Inferno application.",
-      "value": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6InJlZ2lzdHJhdGlvbi10b2tlbiJ9.eyJqd2tzX3VybCI6Imh0dHBzOi8vaW5mZXJuby5oZWFsdGhpdC5nb3Yvc3VpdGVzL2N1c3RvbS9idWxrX2RhdGFfdjEwMS8ud2VsbC1rbm93bi9qd2tzLmpzb24iLCJhY2Nlc3NUb2tlbnNFeHBpcmVJbiI6NjAsImlhdCI6MTcyNjUwMzU3N30.T6xomQ7aMfrnvQ_kC7S0aUgTQXzgDYDI3A-DIFBLH5g"
+      "name": "smart_auth_info",
+      "title": "Backend Services Credentials",
+      "type": "auth_info",
+      "value": {
+        "encryption_algorithm": "ES384",
+        "auth_type": "backend_services",
+        "use_discovery": "true",
+        "requested_scopes": "system/*.read",
+        "client_id": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6InJlZ2lzdHJhdGlvbi10b2tlbiJ9"
+      }
     },
     {
       "name": "group_id",

data/config/presets/bulk_data_v200_inferno_reference_server.json

@@ -11,11 +11,16 @@
       "value": "https://inferno.healthit.gov/reference-server/r4"
     },
     {
-      "name": "backend_services_client_id",
-      "type": "text",
-      "title": "Bulk Data Client ID",
-      "description": "Client ID provided at registration to the Inferno application.",
-      "value": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6InJlZ2lzdHJhdGlvbi10b2tlbiJ9.eyJqd2tzX3VybCI6Imh0dHA6Ly8xMC4xNS4yNTIuNzMvaW5mZXJuby8ud2VsbC1rbm93bi9qd2tzLmpzb24iLCJhY2Nlc3NUb2tlbnNFeHBpcmVJbiI6MTUsImlhdCI6MTU5NzQxMzE5NX0.q4v4Msc74kN506KTZ0q_minyapJw0gwlT6M_uiL73S4"
+      "name": "smart_auth_info",
+      "title": "Backend Services Credentials",
+      "type": "auth_info",
+      "value": {
+        "encryption_algorithm": "ES384",
+        "auth_type": "backend_services",
+        "use_discovery": "true",
+        "requested_scopes": "system/*.read",
+        "client_id": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6InJlZ2lzdHJhdGlvbi10b2tlbiJ9.eyJqd2tzX3VybCI6Imh0dHA6Ly8xMC4xNS4yNTIuNzMvaW5mZXJuby8ud2VsbC1rbm93bi9qd2tzLmpzb24iLCJhY2Nlc3NUb2tlbnNFeHBpcmVJbiI6MTUsImlhdCI6MTU5NzQxMzE5NX0.q4v4Msc74kN506KTZ0q_minyapJw0gwlT6M_uiL73S4"
+      }
     },
     {
       "name": "group_id",

data/lib/bulk_data_test_kit/bulk_export_validation_tester.rb

@@ -29,7 +29,7 @@ module BulkDataTestKit
 
     def build_headers(use_token)
       headers = { accept: 'application/fhir+ndjson' }
-      headers.merge!({ authorization: "Bearer #{bearer_token}" }) if use_token == 'true'
+      headers.merge!({ authorization: "Bearer #{smart_auth_info.access_token}" }) if use_token == 'true'
       headers
     end
 
@@ -142,7 +142,7 @@ module BulkDataTestKit
 
     def perform_bulk_export_validation(bulk_status_output: '', bulk_requires_access_token: '')
       skip_if bulk_status_output.blank?, 'Could not verify this functionality when Bulk Status Output is not provided'
-      skip_if (bulk_requires_access_token == 'true' && bearer_token.blank?),
+      skip_if (bulk_requires_access_token == 'true' && smart_auth_info.access_token.blank?),
               'Could not verify this functionality when Bearer Token is required and not provided'
 
       $num_messages = 0
@@ -194,7 +194,7 @@ module BulkDataTestKit
               'Could not verify this functionality when requiresAccessToken is not provided'
       omit_if bulk_requires_access_token == 'false',
               'Could not verify this functionality when requiresAccessToken is false'
-      skip_if bearer_token.blank?, 'Could not verify this functionality when Bearer Token is not provided'
+      skip_if smart_auth_info.access_token.blank?, 'Could not verify this functionality when Bearer Token is not provided'
 
       get(bulk_data_download_url, headers: { accept: 'application/fhir+ndjson' })
       assert_response_status([400, 401])

data/lib/bulk_data_test_kit/export_cancel_tests.rb

@@ -13,7 +13,7 @@ module BulkDataTestKit
                    :bulk_export_url
 
     def perform_export_cancel_test
-      use_token = !bearer_token.blank?
+      use_token = !smart_auth_info.access_token.blank?
       url = bulk_export_url.dup
       if resource_type == 'Group'
         skip_if group_id.blank?, 'Group id is blank, skipping test.'
@@ -32,7 +32,7 @@ module BulkDataTestKit
     def perform_cancelled_polling_test(bulk_cancelled_polling_url)
       skip 'No polling url available' unless bulk_cancelled_polling_url.present?
 
-      get(bulk_cancelled_polling_url, headers: { authorization: "Bearer #{bearer_token}", accept: 'application/json' })
+      get(bulk_cancelled_polling_url, headers: { authorization: "Bearer #{smart_auth_info.access_token}", accept: 'application/json' })
 
       assert_response_status(404)
 

data/lib/bulk_data_test_kit/export_kick_off_performer.rb

@@ -3,10 +3,10 @@
 module BulkDataTestKit
   module ExportKickOffPerformer
     def perform_export_kick_off_request(use_token: true, params: {}, url: '')
-      skip_if use_token && bearer_token.blank?, 'Could not verify this functionality when bearer token is not set'
+      skip_if use_token && smart_auth_info.access_token.blank?, 'Could not verify this functionality when bearer token is not set'
 
       headers = { accept: 'application/fhir+json', prefer: 'respond-async' }
-      headers.merge!({ authorization: "Bearer #{bearer_token}" }) if use_token
+      headers.merge!({ authorization: "Bearer #{smart_auth_info.access_token}" }) if use_token
 
       param_str = params.map { |k, v| URI.encode_www_form(k => v) }.join('&')
       url.concat("?#{param_str}") unless param_str.empty?
@@ -17,7 +17,7 @@ module BulkDataTestKit
       polling_url = request&.response_header('content-location')&.value
       assert polling_url.present?, 'Export response header did not include "Content-Location"'
 
-      headers = { accept: 'application/json', authorization: "Bearer #{bearer_token}" }
+      headers = { accept: 'application/json', authorization: "Bearer #{smart_auth_info.access_token}" }
 
       delete(polling_url, headers:)
       assert_response_status(202)

data/lib/bulk_data_test_kit/export_operation_tests.rb

@@ -61,7 +61,7 @@ module BulkDataTestKit
     end
 
     def rejects_without_authorization
-      skip_if bearer_token.blank?, 'Bearer token is not set and thus not required to connect to server.'
+      skip_if smart_auth_info.access_token.blank?, 'Bearer token is not set and thus not required to connect to server.'
 
       url = bulk_export_url.dup
       if resource_type == 'Group'
@@ -74,7 +74,7 @@ module BulkDataTestKit
     end
 
     def export_kick_off_success
-      use_token = !bearer_token.blank?
+      use_token = !smart_auth_info.access_token.blank?
 
       url = bulk_export_url.dup
       if resource_type == 'Group'
@@ -107,7 +107,7 @@ module BulkDataTestKit
       used_time = 0
 
       loop do
-        get(status_polling_url, headers: { authorization: "Bearer #{bearer_token}", accept: 'application/json' })
+        get(status_polling_url, headers: { authorization: "Bearer #{smart_auth_info.access_token}", accept: 'application/json' })
 
         retry_after_val = request.response_header('retry-after')&.value.to_i
 

data/lib/bulk_data_test_kit/v1.0.1/bulk_data_export_cancel_test.rb

@@ -17,7 +17,9 @@ module BulkDataTestKit
       DESCRIPTION
       # link 'http://hl7.org/fhir/uv/bulkdata/STU1.0.1/export/index.html#bulk-data-delete-request'
 
-      input :bearer_token,
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
             optional: true
       output :cancelled_polling_url
 

data/lib/bulk_data_test_kit/v1.0.1/bulk_data_export_kick_off_test.rb

@@ -19,7 +19,9 @@ module BulkDataTestKit
       DESCRIPTION
       # link 'http://hl7.org/fhir/uv/bulkdata/STU1.0.1/export/index.html#response---success'
 
-      input :bearer_token,
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
             optional: true
       output :polling_url
 

data/lib/bulk_data_test_kit/v1.0.1/bulk_data_ndjson_download_test.rb

@@ -23,7 +23,9 @@ module BulkDataTestKit
 
       input :bulk_download_url
       input :requires_access_token
-      input :bearer_token,
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
             optional: true
 
       run do

data/lib/bulk_data_test_kit/v1.0.1/bulk_data_no_auth_test.rb

@@ -20,8 +20,10 @@ module BulkDataTestKit
       DESCRIPTION
       # link 'http://hl7.org/fhir/uv/bulkdata/STU1.0.1/export/index.html#bulk-data-kick-off-request'
 
-      input :bearer_token,
-          optional: true
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
+            optional: true
 
       def self.properties
         @properties ||= BulkDataTestKitProperties.new(

data/lib/bulk_data_test_kit/v1.0.1/bulk_data_smart_backend_services_v101_group.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'smart_app_launch/smart_stu2_suite'
+require 'smart_app_launch_test_kit'
 require_relative 'bulk_data_smart_discovery_v101_group'
 
 module BulkDataTestKit
@@ -12,10 +12,32 @@ module BulkDataTestKit
 
       group from: :bulk_data_smart_discovery_v101,
             config: {
-              inputs: { url: { name: :bulk_server_url } }
+              inputs: {
+                        url: { name: :bulk_server_url },
+                        smart_auth_info: {
+                          options: {
+                            components: [
+                              { name: :requested_scopes, default: 'system/*.read' }
+                            ]
+                          }
+                        }
+                      }
             }
 
-      group from: :backend_services_authorization, run_as_group: true
+      group from: :backend_services_authorization,
+            config: {
+              inputs: {
+                        url: { name: :bulk_server_url },
+                        smart_auth_info: {
+                          options: {
+                            components: [
+                              { name: :requested_scopes, default: 'system/*.read' }
+                            ]
+                          }
+                        }
+                      }
+            },
+            run_as_group: true
     end
   end
 end

data/lib/bulk_data_test_kit/v1.0.1/bulk_data_status_check_test.rb

@@ -23,7 +23,9 @@ module BulkDataTestKit
       # link 'http://hl7.org/fhir/uv/bulkdata/STU1.0.1/export/index.html#bulk-data-status-request'
 
       input :polling_url, :bulk_timeout
-      input :bearer_token,
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
             optional: true
 
       output :status_response, :requires_access_token

data/lib/bulk_data_test_kit/v1.0.1/bulk_data_test_suite.rb

@@ -87,12 +87,6 @@ module BulkDataTestKit
       )
 
       config(
-        inputs: {
-          client_auth_encryption_method: {
-            title: 'Client Authentication Encryption Method',
-            locked: true
-          }
-        },
         options: {
           post_authorization_uri: "#{Inferno::Application['base_url']}/custom/smart_stu2/post_auth"
         }
@@ -151,6 +145,7 @@ module BulkDataTestKit
 
       fhir_client :bulk_server do
         url :bulk_server_url
+        auth_info :smart_auth_info
       end
 
       http_client :bulk_server do

data/lib/bulk_data_test_kit/v1.0.1/group/bulk_data_group_export_cancel_group.rb

@@ -14,7 +14,9 @@ module BulkDataTestKit
         correct behavior.
       )
 
-      input :bearer_token,
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
             optional: true
       input :group_id,
             title: 'Group ID',

data/lib/bulk_data_test_kit/v1.0.1/group/bulk_data_group_export_group.rb

@@ -19,9 +19,11 @@ module BulkDataTestKit
       DESCRIPTION
       id :bulk_data_group_export_group
 
-      input :bearer_token,
-            title: 'Bulk Data Authorization Bearer Token',
-            description: 'The authorization bearer token for the Bulk FHIR server. If not required, leave blank.',
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
+            title: 'Bulk Data Authorization',
+            description: 'The authorization information for the Bulk FHIR server. If not required, leave access token blank.',
             optional: true
       input :group_id,
             title: 'Group ID',

data/lib/bulk_data_test_kit/v1.0.1/group/bulk_data_group_export_validation_group.rb

@@ -15,7 +15,10 @@ module BulkDataTestKit
 
       id :bulk_data_group_export_validation
 
-      input :status_output, :requires_access_token, :bearer_token, :bulk_download_url
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' }
+      input :status_output, :requires_access_token, :bulk_download_url
       input :lines_to_validate,
             title: 'Limit validation to a maximum resource count',
             description: 'To validate all, leave blank.',

data/lib/bulk_data_test_kit/v1.0.1/patient/bulk_data_patient_export_cancel_group.rb

@@ -14,7 +14,9 @@ module BulkDataTestKit
         correct behavior.
       )
 
-      input :bearer_token, 
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
             optional: true
 
       output :patient_cancelled_polling_url

data/lib/bulk_data_test_kit/v1.0.1/patient/bulk_data_patient_export_group.rb

@@ -17,9 +17,11 @@ module BulkDataTestKit
       DESCRIPTION
       id :bulk_data_patient_export_group
 
-      input :bearer_token,
-            title: 'Bulk Data Authorization Bearer Token',
-            description: 'The authorization bearer token for the Bulk FHIR server. If not required, leave blank.',
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
+            title: 'Bulk Data Authorization',
+            description: 'The authorization information for the Bulk FHIR server. If not required, leave access token blank.',
             optional: true
       input :bulk_timeout,
             title: 'Export Times Out after (1-600)',

data/lib/bulk_data_test_kit/v1.0.1/patient/bulk_data_patient_export_validation_group.rb

@@ -15,7 +15,10 @@ module BulkDataTestKit
 
       id :bulk_data_patient_export_validation
 
-      input :patient_status_output, :patient_requires_access_token, :bearer_token, :patient_bulk_download_url
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' }
+      input :patient_status_output, :patient_requires_access_token, :patient_bulk_download_url
       input :lines_to_validate,
             title: 'Limit validation to a maximum resource count',
             description: 'To validate all, leave blank.',

data/lib/bulk_data_test_kit/v1.0.1/system_export/bulk_data_system_export_cancel_group.rb

@@ -14,7 +14,9 @@ module BulkDataTestKit
         correct behavior.
       )
 
-      input :bearer_token, 
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
             optional: true
 
       output :system_cancelled_polling_url

data/lib/bulk_data_test_kit/v1.0.1/system_export/bulk_data_system_export_group.rb

@@ -17,9 +17,11 @@ module BulkDataTestKit
       DESCRIPTION
       id :bulk_data_system_export_group
 
-      input :bearer_token,
-            title: 'Bulk Data Authorization Bearer Token',
-            description: 'The authorization bearer token for the Bulk FHIR server. If not required, leave blank.',
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
+            title: 'Bulk Data Authorization',
+            description: 'The authorization information for the Bulk FHIR server. If not required, leave access token blank.',
             optional: true
       input :bulk_timeout,
             title: 'Export Times Out after (1-600)',

data/lib/bulk_data_test_kit/v1.0.1/system_export/bulk_data_system_export_validation_group.rb

@@ -15,7 +15,10 @@ module BulkDataTestKit
 
       id :bulk_data_system_export_validation
 
-      input :system_status_output, :system_requires_access_token, :bearer_token, :system_bulk_download_url
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' }
+      input :system_status_output, :system_requires_access_token, :system_bulk_download_url
       input :lines_to_validate,
             title: 'Limit validation to a maximum resource count',
             description: 'To validate all, leave blank.',

data/lib/bulk_data_test_kit/v2.0.0/bulk_data_export_cancel_test.rb

@@ -19,7 +19,9 @@ module BulkDataTestKit
       id :bulk_data_export_cancel_stu2
 
       input :cancelled_polling_url
-      input :bearer_token,
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
             optional: true
 
       run do

data/lib/bulk_data_test_kit/v2.0.0/bulk_data_outputFormat_param_test.rb

@@ -21,7 +21,9 @@ module BulkDataTestKit
         as the abbreviated representations application/ndjson and ndjson.
       DESCRIPTION
 
-      input :bearer_token,
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
             optional: true
 
       def self.properties

data/lib/bulk_data_test_kit/v2.0.0/bulk_data_since_param_test.rb

@@ -27,7 +27,9 @@ module BulkDataTestKit
         After the export was successfully initiated, it is then cancelled.
       DESCRIPTION
 
-      input :bearer_token,
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
             optional: true
       input :since_timestamp,
             title: 'Timestamp for _since parameter',

data/lib/bulk_data_test_kit/v2.0.0/bulk_data_smart_backend_services_v200_group.rb

@@ -12,10 +12,33 @@ module BulkDataTestKit
 
       group from: :smart_discovery_stu2,
             config: {
-              inputs: { url: { name: :bulk_server_url } }
+              inputs: {
+                        url: { name: :bulk_server_url },
+                        smart_auth_info: {
+                          options: {
+                            components: [
+                              { name: :requested_scopes, default: 'system/*.read'} 
+                            ]
+                          }
+                        }
+                      }
             }
 
-      group from: :backend_services_authorization
+      group from: :backend_services_authorization,
+            config: {
+              inputs: {
+                        url: { name: :bulk_server_url },
+                        smart_auth_info: {
+                          options: {
+                            components: [
+                              { name: :requested_scopes, default: 'system/*.read' } 
+                            ]
+                          }
+                        }
+                      }
+            },
+            run_as_group: true
+
     end
   end
 end

data/lib/bulk_data_test_kit/v2.0.0/bulk_data_test_suite.rb

@@ -149,6 +149,7 @@ module BulkDataTestKit
 
       fhir_client :bulk_server do
         url :bulk_server_url
+        auth_info :smart_auth_info
       end
 
       http_client :bulk_server do

data/lib/bulk_data_test_kit/v2.0.0/group/bulk_data_group_export_parameters_group.rb

@@ -15,9 +15,11 @@ module BulkDataTestKit
         Verify that the Bulk Data server supports required query parameters for Group export.
       )
 
-      input :bearer_token,
-            title: 'Bulk Data Authorization Bearer Token',
-            description: 'The authorization bearer token for the Bulk FHIR server. If not required, leave blank.',
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
+            title: 'Bulk Data Authorization',
+            description: 'The authorization information for the Bulk FHIR server. If not required, leave blank.',
             optional: true
       input :group_id,
             title: 'Group ID',

data/lib/bulk_data_test_kit/v2.0.0/patient/bulk_data_patient_export_parameters_group.rb

@@ -13,9 +13,11 @@ module BulkDataTestKit
         Verify that the Bulk Data server supports required query parameters for the export of all Patient resources.
       )
 
-      input :bearer_token,
-            title: 'Bulk Data Authorization Bearer Token',
-            description: 'The authorization bearer token for the Bulk FHIR server. If not required, leave blank.',
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
+            title: 'Bulk Data Authorization',
+            description: 'The authorization information for the Bulk FHIR server. If not required, leave blank.',
             optional: true
 
       test from: :output_format_in_export_response,

data/lib/bulk_data_test_kit/v2.0.0/system_export/bulk_data_system_export_parameters_group.rb

@@ -13,9 +13,11 @@ module BulkDataTestKit
         Verify that the Bulk Data server supports required query parameters for system level bulk data export.
       )
 
-      input :bearer_token,
-            title: 'Bulk Data Authorization Bearer Token',
-            description: 'The authorization bearer token for the Bulk FHIR server. If not required, leave blank.',
+      input :smart_auth_info,
+            type: :auth_info,
+            options: { mode: 'access' },
+            title: 'Bulk Data Authorization',
+            description: 'The authorization information for the Bulk FHIR server. If not required, leave blank.',
             optional: true
 
       test from: :output_format_in_export_response,

data/lib/bulk_data_test_kit/v2.0.0_client/bulk_data_client_delete_test.rb

@@ -2,7 +2,6 @@
 
 module BulkDataTestKit
   module BulkDataV200Client
-    # Bulk Data Client - Delete
     class DeleteTest < Inferno::Test
       title 'Bulk Data Delete Request'
 

data/lib/bulk_data_test_kit/v2.0.0_client/bulk_data_client_export_group.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative 'bulk_data_client_export_wait_test'
+require_relative 'bulk_data_client_wait_test'
 require_relative 'bulk_data_client_kick_off_test'
 require_relative 'bulk_data_client_status_test'
 require_relative 'bulk_data_client_output_test'
+require_relative 'bulk_data_client_delete_test'
 
 module BulkDataTestKit
   module BulkDataV200Client
-    # Bulk Data Client Export Tests
     class ExportGroup < Inferno::TestGroup
       title 'Bulk Data Client Export Tests'
 
@@ -16,16 +16,18 @@ module BulkDataTestKit
           - Kick-off a new bulk data export request
           - Poll the in-progress request for status updates
           - Download a completed bulk data export file
+          - Delete the export
       )
 
       id :bulk_data_client_export_group
 
       run_as_group
 
-      test from: :bulk_data_client_export_wait
+      test from: :bulk_data_client_wait
       test from: :bulk_data_client_kick_off
       test from: :bulk_data_client_status
       test from: :bulk_data_client_output
+      test from: :bulk_data_client_delete
     end
   end
 end

data/lib/bulk_data_test_kit/v2.0.0_client/bulk_data_client_kick_off_test.rb

@@ -2,7 +2,6 @@
 
 module BulkDataTestKit
   module BulkDataV200Client
-    # Bulk Data Client Kick-off
     class KickOffTest < Inferno::Test
       title 'Bulk Data Kick-off Request'