onc_certification_g10_test_kit 3.7.2 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f80a148fd28accafc4b6112cf435bff19443c7422c5a92b2a6be485568839da
-  data.tar.gz: '0138f1ac5453800b58f5f4f3eb3cf4c83a84668e9ecf606ad747c50bef591e6b'
+  metadata.gz: 5dcbb170a4f891db5446afabc93f46fdfa3111fca67b9d91640b1e484c8a3c16
+  data.tar.gz: fe76ab8bffb6e1efda0ffa1951c7f5fb1d0e3500a6690bc5bb653cc8e4c3f26c
 SHA512:
-  metadata.gz: 6643638bc0088397befc86627839508823c42ae59a9b0be6a80968dfe3c0f6b15390351001771593d8d33dd0231bcdcc3d18e88ed74cbd922d21398e9ece49c9
-  data.tar.gz: 1615506d4dc00c6d3a76929be7847318480a83a419fc57e72eb1df6e1d19ebd5c612841b375d00946075092b2aff29c0a75c774117c67e1bcbe15886ada0340a
+  metadata.gz: 5f02a16a753db8331405c2942cca14e70279625442fa84127a17ba0e22f4be10c3229de8dbae71dbd254318ad98d6abbbf3de732ee01be66e669cb540bc190b9
+  data.tar.gz: 8819b33b6da17d093cf15b91d14e92ca0a138cc7cc3eb01f39e3aec9506fb9850db974b4347f859c05e14ce08e2b9368c34a69c786839d598fb3609badd3ba62

data/lib/onc_certification_g10_test_kit/configuration_checker.rb

@@ -2,7 +2,7 @@ require_relative '../inferno/terminology/tasks/check_built_terminology'
 
 module ONCCertificationG10TestKit
   class ConfigurationChecker
-    EXPECTED_VALIDATOR_VERSION = '2.2.1'.freeze
+    EXPECTED_VALIDATOR_VERSION = '2.3.1'.freeze
 
     def configuration_messages
       validator_version_message + terminology_messages + version_message
@@ -22,7 +22,13 @@ module ONCCertificationG10TestKit
 
     def validator_version_message
       response = Faraday.get "#{validator_url}/version"
-      version = response.body
+
+      if response.body.starts_with? '{'
+        version_json = JSON.parse(response.body)
+        version = version_json['inferno-framework/fhir-validator-wrapper']
+      else
+        version = response.body
+      end
 
       if version == EXPECTED_VALIDATOR_VERSION
         [{
@@ -35,6 +41,11 @@ module ONCCertificationG10TestKit
           message: "Expected FHIR validator version `#{EXPECTED_VALIDATOR_VERSION}`, but found `#{version}`"
         }]
       end
+    rescue JSON::ParserError => e
+      [{
+        type: 'error',
+        message: "Unable to parse Validator version '`#{response.body}`'. Parser error: `#{e.message}`"
+      }]
     rescue StandardError => e
       [{
         type: 'error',

data/lib/onc_certification_g10_test_kit/smart_ehr_patient_launch_group.rb

@@ -39,7 +39,8 @@ module ONCCertificationG10TestKit
           name: :ehr_patient_client_id
         },
         client_secret: {
-          name: :ehr_patient_client_secret
+          name: :ehr_patient_client_secret,
+          optional: false
         },
         requested_scopes: {
           name: :ehr_patient_requested_scopes,
@@ -96,7 +97,8 @@ module ONCCertificationG10TestKit
                 :ehr_patient_client_id,
                 :ehr_patient_client_secret,
                 :smart_authorization_url,
-                :smart_token_url
+                :smart_token_url,
+                :ehr_patient_requested_scopes
 
     test from: :g10_patient_context,
          config: {

data/lib/onc_certification_g10_test_kit/smart_ehr_patient_launch_group_stu2.rb

@@ -39,7 +39,8 @@ module ONCCertificationG10TestKit
           name: :ehr_patient_client_id
         },
         client_secret: {
-          name: :ehr_patient_client_secret
+          name: :ehr_patient_client_secret,
+          optional: false
         },
         requested_scopes: {
           name: :ehr_patient_requested_scopes,
@@ -68,6 +69,10 @@ module ONCCertificationG10TestKit
         smart_token_url: {
           title: 'OAuth 2.0 Token Endpoint',
           description: 'OAuth 2.0 Token Endpoint provided during the EHR launch'
+        },
+        client_auth_type: {
+          locked: true,
+          default: 'confidential_symmetric'
         }
       },
       outputs: {
@@ -97,7 +102,12 @@ module ONCCertificationG10TestKit
                 :ehr_patient_client_secret,
                 :smart_authorization_url,
                 :smart_token_url,
-                :authorization_method
+                :ehr_patient_requested_scopes,
+                :authorization_method,
+                :use_pkce,
+                :pkce_code_challenge_method,
+                :client_auth_type,
+                :client_auth_encryption_method
 
     test from: :g10_patient_context,
          config: {

data/lib/onc_certification_g10_test_kit/smart_ehr_practitioner_app_group.rb

@@ -53,11 +53,23 @@ module ONCCertificationG10TestKit
       inputs: {
         smart_credentials: {
           name: :ehr_smart_credentials
+        },
+        client_auth_type: {
+          locked: true,
+          default: 'confidential_symmetric'
         }
       }
     )
 
-    input_order :url, :ehr_client_id, :ehr_client_secret
+    input_order :url,
+                :ehr_client_id,
+                :ehr_client_secret,
+                :ehr_requested_scopes,
+                :use_pkce,
+                :pkce_code_challenge_method,
+                :ehr_authorization_method,
+                :client_auth_type,
+                :client_auth_encryption_method
 
     group from: :smart_discovery do
       required_suite_options(G10Options::SMART_1_REQUIREMENT)

data/lib/onc_certification_g10_test_kit/smart_invalid_pkce_group.rb

@@ -169,6 +169,10 @@ module ONCCertificationG10TestKit
         },
         pkce_code_verifier: {
           name: :invalid_token_pkce_code_verifier
+        },
+        client_auth_type: {
+          locked: true,
+          default: 'confidential_symmetric'
         }
       },
       outputs: {

data/lib/onc_certification_g10_test_kit/smart_invalid_token_group_stu2.rb

@@ -119,6 +119,10 @@ module ONCCertificationG10TestKit
         },
         pkce_code_verifier: {
           name: :invalid_token_pkce_code_verifier
+        },
+        client_auth_type: {
+          locked: true,
+          default: 'confidential_symmetric'
         }
       },
       outputs: {

data/lib/onc_certification_g10_test_kit/smart_limited_app_group.rb

@@ -25,7 +25,7 @@ module ONCCertificationG10TestKit
       to the app based on user input. The tester is expected to grant the
       application access to a subset of desired resource types. The launch is
       performed using the same app configuration as in the Standalone Patient
-      App test, demonstrating that the user is control over what scopes are
+      App test, demonstrating that the user has control over what scopes are
       granted to the app as required in the (g)(10) Standardized API criterion.
 
       * [SMART on FHIR
@@ -43,7 +43,11 @@ module ONCCertificationG10TestKit
                 :standalone_client_id,
                 :standalone_client_secret,
                 :smart_authorization_url,
-                :smart_token_url
+                :smart_token_url,
+                :standalone_requested_scopes,
+                :authorization_method,
+                :client_auth_type,
+                :client_auth_encryption_method
 
     group from: :smart_standalone_launch do
       title 'Standalone Launch With Limited Scope'
@@ -220,7 +224,11 @@ module ONCCertificationG10TestKit
           smart_authorization_url: { locked: true, title: 'SMART Authorization Url' },
           smart_token_url: { locked: true, title: 'SMART Token Url' },
           received_scopes: { name: :limited_received_scopes },
-          smart_credentials: { name: :limited_smart_credentials }
+          smart_credentials: { name: :limited_smart_credentials },
+          client_auth_type: {
+            locked: true,
+            default: 'confidential_symmetric'
+          }
         },
         outputs: {
           code: { name: :limited_code },

data/lib/onc_certification_g10_test_kit/smart_public_standalone_launch_group.rb

@@ -1,6 +1,6 @@
 module ONCCertificationG10TestKit
   class SMARTPublicStandaloneLaunchGroup < SMARTAppLaunch::StandaloneLaunchGroup
-    title 'Public Client Standalone Launch with OpenID Connect'
+    title 'SMART Public Client Standalone Launch with OpenID Connect'
     short_title 'SMART Public Client Launch'
     input_instructions %(
       Register Inferno as a standalone application using the following information:

data/lib/onc_certification_g10_test_kit/smart_public_standalone_launch_group_stu2.rb

@@ -1,6 +1,6 @@
 module ONCCertificationG10TestKit
   class SMARTPublicStandaloneLaunchGroupSTU2 < SMARTAppLaunch::StandaloneLaunchGroupSTU2
-    title 'Public Client Standalone Launch with OpenID Connect'
+    title 'SMART Public Client Standalone Launch with OpenID Connect'
     short_title 'SMART Public Client Launch'
     input_instructions %(
       Register Inferno as a standalone application using the following information:
@@ -70,6 +70,11 @@ module ONCCertificationG10TestKit
         },
         pkce_code_challenge_method: {
           locked: true
+        },
+        client_auth_type: {
+          name: :public_client_auth_type,
+          locked: true,
+          default: 'public'
         }
       },
       outputs: {
@@ -99,7 +104,10 @@ module ONCCertificationG10TestKit
                 :use_pkce,
                 :pkce_code_challenge_method,
                 :smart_authorization_url,
-                :smart_token_url
+                :smart_token_url,
+                :authorization_method,
+                :public_client_auth_type,
+                :client_auth_encryption_method
 
     test from: :g10_patient_context,
          config: {

data/lib/onc_certification_g10_test_kit/smart_standalone_patient_app_group.rb

@@ -54,7 +54,15 @@ module ONCCertificationG10TestKit
       }
     )
 
-    input_order :url, :standalone_client_id, :standalone_client_secret
+    input_order :url,
+                :standalone_client_id,
+                :standalone_client_secret,
+                :standalone_requested_scopes,
+                :use_pkce,
+                :pkce_code_challenge_method,
+                :standalone_authorization_method,
+                :client_auth_type,
+                :client_auth_encryption_method
 
     group from: :smart_discovery do
       required_suite_options(G10Options::SMART_1_REQUIREMENT)
@@ -204,6 +212,10 @@ module ONCCertificationG10TestKit
                 name: :standalone_authorization_method,
                 default: 'get',
                 locked: true
+              },
+              client_auth_type: {
+                locked: true,
+                default: 'confidential_symmetric'
               }
             }
           } do

data/lib/onc_certification_g10_test_kit/version.rb

@@ -1,3 +1,3 @@
 module ONCCertificationG10TestKit
-  VERSION = '3.7.2'.freeze
+  VERSION = '3.8.0'.freeze
 end

data/lib/onc_certification_g10_test_kit.rb

@@ -89,6 +89,7 @@ module ONCCertificationG10TestKit
                message.type == 'error' && (
                  message.message.match?(/\A\S+: \S+: Unknown Code/) ||
                  message.message.match?(/\A\S+: \S+: None of the codings provided are in the value set/) ||
+                 message.message.match?(/\A\S+: \S+: The code provided \(\S*\) is not in the value set/) ||
                  message.message.match?(/\A\S+: \S+: The Coding provided \(\S*\) is not in the value set/)
                )
              )
@@ -203,6 +204,12 @@ module ONCCertificationG10TestKit
                  ]
 
     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",
         incorrectly_permitted_tls_version_message_type: 'warning'
@@ -240,7 +247,7 @@ module ONCCertificationG10TestKit
       Systems may adopt later versions of standards than those named in the rule
       as approved by the ONC Standards Version Advancement Process (SVAP).
       Please select which approved version of each standard to use, and click
-      ‘Select Options’ to begin testing.
+      ‘Start Testing’ to begin testing.
     )
 
     input_instructions %(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onc_certification_g10_test_kit
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.8.0
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-13 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bloomer
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.18
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: tls_test_kit
   requirement: !ruby/object:Gem::Requirement