carin_for_blue_button_test_kit 0.15.0 → 0.15.1

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/client_registration_group.rb

@@ -0,0 +1,65 @@
+require 'udap_security_test_kit'
+require 'smart_app_launch_test_kit'
+require_relative 'client_options'
+require_relative 'client_registration/configuration_display_smart_test'
+require_relative 'client_registration/configuration_display_udap_test'
+
+module CarinForBlueButtonTestKit
+  class CarinClientRegistrationGroup < Inferno::TestGroup
+    id :c4bb_v200_client_registration
+    title 'Client Registration'
+    description %(
+      Register the client under test with Inferno's simulated CARIN Server,
+      including configuration of the system under test to hit the correct endpoints and
+      enable authentication and authorization of CARIN requests.
+    )
+    run_as_group
+
+    # smart registration tests
+    test from: :smart_client_registration_alca_verification,
+          required_suite_options: {
+            client_type: CarinClientOptions::SMART_APP_LAUNCH_CONFIDENTIAL_ASYMMETRIC
+          }
+    test from: :smart_client_registration_alcs_verification,
+          required_suite_options: {
+            client_type: CarinClientOptions::SMART_APP_LAUNCH_CONFIDENTIAL_SYMMETRIC
+          }
+    test from: :smart_client_registration_alp_verification,
+          required_suite_options: {
+            client_type: CarinClientOptions::SMART_APP_LAUNCH_PUBLIC
+          }
+    test from: :c4bb_v200_client_reg_config_smart_display,
+          id: :c4bb_v200_client_reg_config_smart_alca_display,
+          required_suite_options: {
+            client_type: CarinClientOptions::SMART_APP_LAUNCH_CONFIDENTIAL_ASYMMETRIC
+          }
+    test from: :c4bb_v200_client_reg_config_smart_display,
+          id: :c4bb_v200_client_reg_config_smart_alcs_display,
+          required_suite_options: {
+            client_type: CarinClientOptions::SMART_APP_LAUNCH_CONFIDENTIAL_SYMMETRIC
+          }
+    test from: :c4bb_v200_client_reg_config_smart_display,
+          id: :c4bb_v200_client_reg_config_smart_alp_display,
+          required_suite_options: {
+            client_type: CarinClientOptions::SMART_APP_LAUNCH_PUBLIC
+          }
+
+    # udap registration tests
+    test from: :udap_client_registration_interaction,
+         id: :c4bb_v200_client_reg_udap_interaction,
+         config: { options: { endpoint_suite_id: :c4bb_v200_client } },
+         required_suite_options: {
+           client_type: CarinClientOptions::UDAP_AUTHORIZATION_CODE
+         }
+    test from: :udap_client_registration_ac_verification,
+         id: :c4bb_v200_client_reg_udap_verification,
+         config: { options: { endpoint_suite_id: :c4bb_v200_client } },
+         required_suite_options: {
+           client_type: CarinClientOptions::UDAP_AUTHORIZATION_CODE
+         }
+    test from: :c4bb_v200_client_reg_config_udap_display,
+          required_suite_options: {
+            client_type: CarinClientOptions::UDAP_AUTHORIZATION_CODE
+          }
+  end
+end

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/client_validation_test.rb

@@ -74,7 +74,7 @@ module CarinForBlueButtonTestKit
     def resource_type_endpoint(url)
       return unless url.start_with?('http://', 'https://')
 
-      match = %r{custom/c4bb_v200_client/fhir/(.*)\?}.match(url)
+      match = %r{custom/#{suite_id}/fhir/(.*)\?}.match(url)
       match[1] if match.present?
     end
 

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/endpoints/authorization_endpoint.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'udap_security_test_kit'
+require 'smart_app_launch_test_kit'
+require_relative '../urls'
+require_relative '../tags'
+require_relative '../client_options'
+
+module CarinForBlueButtonTestKit
+  module MockUdapSmartServer
+    class AuthorizationEndpoint < Inferno::DSL::SuiteEndpoint
+      include SMARTAppLaunch::MockSMARTServer::SMARTAuthorizationResponseCreation
+      include UDAPSecurityTestKit::MockUDAPServer::UDAPAuthorizationResponseCreation
+      include CarinClientOptions
+
+      def test_run_identifier
+        request.params[:client_id]
+      end
+
+      def suite_options
+        @suite_options ||=
+          Inferno::Repositories::TestSessions.new.find(result.test_session_id)
+            &.suite_options&.map { |so| [so.id, so.value] }&.to_h
+      end
+
+      def make_response
+        if selected_security_ig(suite_options) == UDAPSecurityTestKit::UDAP_TAG
+          make_udap_authorization_response
+        else
+          make_smart_authorization_response
+        end
+      end
+
+      def update_result
+        nil # never update for now
+      end
+
+      def tags
+        tags = [UDAPSecurityTestKit::AUTHORIZATION_TAG, UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG]
+        tags <<
+          if selected_security_ig(suite_options) == UDAPSecurityTestKit::UDAP_TAG
+            UDAPSecurityTestKit::UDAP_TAG
+          else
+            SMARTAppLaunch::SMART_TAG
+          end
+
+        tags
+      end
+    end
+  end
+end

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/endpoints/next_page_endpoint.rb

@@ -1,14 +1,15 @@
+require 'udap_security_test_kit'
 require_relative '../tags'
 require_relative '../mock_server'
-require_relative '../mock_authorization'
 
 module CarinForBlueButtonTestKit
   class NextPageEndpoint < Inferno::DSL::SuiteEndpoint
     include CarinForBlueButtonTestKit::MockServer
-    include CarinForBlueButtonTestKit::MockAuthorization
 
     def test_run_identifier
-      extract_client_id_from_bearer_token(request)
+      UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(
+        request.headers['authorization']&.delete_prefix('Bearer ')
+      )
     end
 
     def make_response

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/endpoints/resource_api_endpoint.rb

@@ -1,16 +1,17 @@
+require 'udap_security_test_kit'
 require_relative '../tags'
 require_relative '../mock_server'
-require_relative '../mock_authorization'
 require_relative '../client_validation_test'
 
 module CarinForBlueButtonTestKit
   class ResourceAPIEndpoint < Inferno::DSL::SuiteEndpoint
     include CarinForBlueButtonTestKit::MockServer
-    include CarinForBlueButtonTestKit::MockAuthorization
     include CarinForBlueButtonTestKit::ClientValidationTest
 
     def test_run_identifier
-      extract_client_id_from_bearer_token(request)
+      UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(
+        request.headers['authorization']&.delete_prefix('Bearer ')
+      )
     end
 
     def make_response

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/endpoints/resource_id_endpoint.rb

@@ -1,14 +1,15 @@
+require 'udap_security_test_kit'
 require_relative '../tags'
 require_relative '../mock_server'
-require_relative '../mock_authorization'
 
 module CarinForBlueButtonTestKit
   class ResourceIDEndpoint < Inferno::DSL::SuiteEndpoint
     include CarinForBlueButtonTestKit::MockServer
-    include CarinForBlueButtonTestKit::MockAuthorization
 
     def test_run_identifier
-      extract_client_id_from_bearer_token(request)
+      UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(
+        request.headers['authorization']&.delete_prefix('Bearer ')
+      )
     end
 
     def make_response

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/endpoints/token_endpoint.rb

@@ -1,79 +1,77 @@
-require_relative '../tags'
+# frozen_string_literal: true
+
+require 'udap_security_test_kit'
+require 'smart_app_launch_test_kit'
 require_relative '../urls'
-require_relative '../mock_server'
-require_relative '../mock_authorization'
+require_relative '../tags'
 
 module CarinForBlueButtonTestKit
-  module MockAuthorization
-    CARIN_PATIENT_ID = '888'.freeze # Must exist on the FHIR_REFERENCE_SERVER (env var)
-
+  module MockUdapSmartServer
     class TokenEndpoint < Inferno::DSL::SuiteEndpoint
-      include CarinForBlueButtonTestKit::MockServer
+      include SMARTAppLaunch::MockSMARTServer::SMARTTokenResponseCreation
+      include UDAPSecurityTestKit::MockUDAPServer::UDAPTokenResponseCreation
+      include URLs
 
       def test_run_identifier
-        extract_client_id
-      end
-
-      def tags
-        [TOKEN_TAG]
+        case request.params[:grant_type]
+        when UDAPSecurityTestKit::CLIENT_CREDENTIALS_TAG
+          UDAPSecurityTestKit::MockUDAPServer.client_id_from_client_assertion(request.params[:client_assertion])
+        when UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG
+          UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(request.params[:code])
+        when UDAPSecurityTestKit::REFRESH_TOKEN_TAG
+          UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(
+            UDAPSecurityTestKit::MockUDAPServer.refresh_token_to_authorization_code(request.params[:refresh_token])
+          )
+        end
       end
 
       def make_response
-        client_id = extract_client_id
-        access_token = JWT.encode({ inferno_client_id: client_id }, nil, 'none')
-        granted_scopes = SUPPORTED_SCOPES & requested_scopes
-
-        response_hash = { access_token:, scope: granted_scopes.join(' '), token_type: 'bearer',
-                          expires_in: 3600 }
-
-        response_hash.merge!(patient: CARIN_PATIENT_ID)
-
-        response.body = response_hash.to_json
-        response.headers['Cache-Control'] = 'no-store'
-        response.headers['Pragma'] = 'no-cache'
-        response.status = 200
-      end
-
-      private
-
-      def extract_client_id
-        # Public client            || confidential client asymmetric          || confidential client symmetric
-        request.params[:client_id] || extract_client_id_from_client_assertion || extract_client_id_from_basic_auth
-      end
-
-      def extract_client_id_from_client_assertion
-        encoded_jwt = request.params[:client_assertion]
-        return unless encoded_jwt.present?
-
-        jwt_payload =
-          begin
-            JWT.decode(encoded_jwt, nil, false)&.first # skip signature verification
-          rescue StandardError
-            nil
+        if request.params[:udap].present?
+          case request.params[:grant_type]
+          when UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG
+            make_udap_authorization_code_token_response
+          when UDAPSecurityTestKit::REFRESH_TOKEN_TAG
+            make_udap_refresh_token_response
+          else
+            UDAPSecurityTestKit::MockUDAPServer.update_response_for_invalid_assertion(
+              response,
+              "unsupported grant_type: #{request.params[:grant_type]}"
+            )
           end
-
-        jwt_payload['iss'] || jwt_payload['sub'] if jwt_payload.present?
+        else
+          suite_options_list = Inferno::Repositories::TestSessions.new.find(result.test_session_id)&.suite_options
+          suite_options_hash = suite_options_list&.map { |option| [option.id, option.value] }&.to_h
+          smart_authentication_approach =
+            SMARTAppLaunch::SMARTClientOptions.smart_authentication_approach(suite_options_hash)
+          
+          case request.params[:grant_type]
+          when SMARTAppLaunch::AUTHORIZATION_CODE_TAG
+            make_smart_authorization_code_token_response(smart_authentication_approach)
+          when SMARTAppLaunch::REFRESH_TOKEN_TAG
+            make_smart_refresh_token_response(smart_authentication_approach)
+          else
+            SMARTAppLaunch::MockSMARTServer.update_response_for_invalid_assertion(
+              response,
+              "unsupported grant_type: #{request.params[:grant_type]}"
+            )
+          end
+        end
       end
 
-      def extract_client_id_from_basic_auth
-        encoded_credentials = request.headers['authorization']&.delete_prefix('Basic ')
-        return unless encoded_credentials.present?
-
-        decoded_credentials = Base64.decode64(encoded_credentials)
-        decoded_credentials&.split(':')&.first
+      def update_result
+        nil # never update for now
       end
 
-      def requested_scopes
-        auth_request = requests_repo.tagged_requests(result.test_session_id, [AUTHORIZE_TAG]).last
-        return [] unless auth_request
-
-        auth_params = if auth_request.verb.downcase == 'get'
-                        auth_request.query_parameters
-                      else
-                        URI.decode_www_form(auth_request.request_body)&.to_h
-                      end
-        scope_str = auth_params&.dig('scope')
-        scope_str ? URI.decode_www_form_component(scope_str).split : []
+      def tags
+        tags = [UDAPSecurityTestKit::TOKEN_TAG]
+        tags << (request.params[:udap].present? ? UDAPSecurityTestKit::UDAP_TAG : SMARTAppLaunch::SMART_TAG)
+        if [UDAPSecurityTestKit::CLIENT_CREDENTIALS_TAG, 
+            UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG, 
+            UDAPSecurityTestKit::REFRESH_TOKEN_TAG].include?(request.params[:grant_type])
+          tags << request.params[:grant_type]
+        end
+
+        tags
       end
     end
   end

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/initial_wait_test.rb

@@ -1,4 +1,6 @@
+require 'smart_app_launch_test_kit'
 require_relative 'urls'
+
 module CarinForBlueButtonTestKit
   class C4BBClientInitialWaitTest < Inferno::Test
     include URLs
@@ -9,46 +11,44 @@ module CarinForBlueButtonTestKit
       This test will receive claims data requests and search requests until the user confirms they are done.
     )
     input :client_id,
-          title: 'Client ID',
-          description: %(
-            Enter the client ID you will use to connect to this CARIN server via a SMART launch.
-          )
-
+          title: 'Client Id',
+          type: 'text',
+          optional: true,
+          locked: true,
+          description: SMARTAppLaunch::INPUT_CLIENT_ID_DESCRIPTION_LOCKED
+    input :smart_launch_urls,
+          title: 'SMART App Launch URL(s)',
+          type: 'textarea',
+          locked: true,
+          optional: true,
+          description: SMARTAppLaunch::INPUT_SMART_LAUNCH_URLS_DESCRIPTION_LOCKED
+    input :launch_context,
+          title: 'Launch Context',
+          type: 'textarea',
+          optional: true,
+          description: SMARTAppLaunch::INPUT_LAUNCH_CONTEXT_DESCRIPTION       
+    input :fhir_user_relative_reference,
+          title: 'FHIR User Relative Reference',
+          type: 'text',
+          optional: true,
+          description: SMARTAppLaunch::INPUT_FHIR_USER_RELATIVE_REFERENCE
+    input_order :launch_context, :fhir_user_relative_reference, :smart_launch_urls, :client_id
+    output :launch_key
     config options: { accepts_multiple_requests: true }
 
-    def example_client_jwt_payload_part
-      Base64.strict_encode64({ inferno_client_id: client_id }.to_json).delete('=')
-    end
-
     run do
+      if smart_launch_urls.present?
+        launch_key = SecureRandom.hex(32)
+        output(launch_key:)
+      end
+
       wait(
         identifier: client_id,
         message: %(
-          ### SMART App Launch
-
-          You may connect to the Inferno CARIN client test server via
-          [SMART App Launch](https://hl7.org/fhir/smart-app-launch/STU2/app-launch.html).
-          Perform the following steps:
-            1. Perform a [Standalone Launch](https://hl7.org/fhir/smart-app-launch/STU2/app-launch.html#step-2-launch-standalone)
-            2. Retrieve .well-known/smart-configuration: `#{smart_configuration_url}`
-            3. Obtain authorization code: `#{authorization_url}`
-            4. Obtain access token: `#{token_url}`
-            5. Access FHIR API
-
-          ### Request Identification
-
-          In order to identify requests for this session, Inferno will look for
-          an `Authorization` header with value:
-
-          ```
-          Bearer eyJhbGciOiJub25lIn0.#{example_client_jwt_payload_part}.
-          ```
-
-          ### FHIR API
-
           Submit CARIN requests via the following method:
-          * Single Resource API: `#{submit_url}?:search_params`, with `:endpoint` replaced with the endpoint you want
-          to reach and `:search_params` replaced with the search parameters for the request.
+          * Single Resource API: `#{resource_api_url}?:search_params`, with `:endpoint`
+          replaced with the endpoint you want to reach and `:search_params` replaced with the search parameters
+          for the request.
 
           The following CARIN resources can be accessed on the Inferno Reference Server with the following IDs, and
           the following search parameters are required for each resource type:

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/metadata/mock_capability_statement.json.erb

@@ -9,11 +9,10 @@
   ],
   "implementation": {
       "description": "Inferno CARIN For Blue Button Client Testing Simulation Server",
-      "url": "http://localhost:8080/reference-server/r4"
+      "url": "<%= Inferno::Application['base_url']  %>/custom/c4bb_v200_client/fhir"
   },
   "fhirVersion": "4.0.1",
   "format": [
-      "application/fhir+xml",
       "application/fhir+json"
   ],
   "implementationGuide": [
@@ -30,11 +29,11 @@
                 "extension": [
                     {
                         "url": "token",
-                        "valueUri": "<%= Inferno::Application['base_url']  %>/custom/c4bb_v200_client/mock_auth/token"
+                        "valueUri": "<%= Inferno::Application['base_url']  %>/custom/c4bb_v200_client/auth/token"
                     },
                     {
                         "url": "authorize",
-                        "valueUri": "<%= Inferno::Application['base_url']  %>/custom/c4bb_v200_client/mock_auth/authorization"
+                        "valueUri": "<%= Inferno::Application['base_url']  %>/custom/c4bb_v200_client/auth/authorization"
                     }
                 ]
             }

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/mock_server.rb

@@ -106,32 +106,6 @@ module CarinForBlueButtonTestKit
       }
     end
 
-    def carin_smart_config
-      response_body =
-        {
-          authorization_endpoint: authorization_url,
-          token_endpoint: token_url,
-          token_endpoint_auth_methods_supported: ['private_key_jwt'],
-          token_endpoint_auth_signing_alg_values_supported: ['RS256'],
-          grant_types_supported: ['authorization_code'],
-          scopes_supported: SUPPORTED_SCOPES,
-          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
-
-      proc {
-        [200, { 'Content-Type' => 'application/json' }, [response_body]]
-      }
-    end
-
     def remove_transfer_encoding_and_content_length_header(headers)
       headers.delete('transfer-encoding') if headers['transfer-encoding'].present?
 
@@ -140,8 +114,12 @@ module CarinForBlueButtonTestKit
       headers.delete('Content-Length')
     end
 
+    def supported_searches
+      @supported_searches ||= SEARCHES_BY_PRIORITY
+    end
+
     def match_request_to_expectation(resource_type, params)
-      matched_search = SEARCHES_BY_PRIORITY[resource_type.to_sym].select do |expectation|
+      matched_search = supported_searches[resource_type.to_sym].select do |expectation|
         (params.keys.map(&:to_s) & expectation).sort == expectation
       end.map(&:first)
 
@@ -176,14 +154,14 @@ module CarinForBlueButtonTestKit
     def resource_endpoint(url)
       return unless url.start_with?('http://', 'https://')
 
-      match = %r{custom/c4bb_v200_client/fhir/(.*)\?}.match(url)
+      match = %r{custom/#{suite_id}/fhir/(.*)\?}.match(url)
       match[1] if match.present?
     end
 
     def resource_id_endpoint(url)
       return unless url.start_with?('http://', 'https://')
 
-      match = %r{custom/c4bb_v200_client/fhir/(.*)}.match(url)
+      match = %r{custom/#{suite_id}/fhir/(.*)}.match(url)
       match[1] if match.present?
     end
 
@@ -206,7 +184,11 @@ module CarinForBlueButtonTestKit
     end
 
     def new_link
-      "#{Inferno::Application['base_url']}/custom/c4bb_v200_client/fhir"
+      "#{Inferno::Application['base_url']}/custom/#{suite_id}/fhir"
+    end
+
+    def suite_id
+      C4BBV200ClientSuite.id
     end
 
     # @private

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/required_searches_tests/coverage_required_searches.rb

@@ -27,6 +27,12 @@ module CarinForBlueButtonTestKit
       ]
     end
 
+    def suite_id # allow overriding without extension - used by resource_previous_search_params logic
+      return config.options[:suite_id] if config.options[:suite_id].present?
+
+      C4BBV200ClientSuite.id
+    end
+
     run do
       search_params = resource_previous_search_params(:CoverageSearch)
       skip_if search_params.nil?, 'No search requests made for Coverage resource'

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/required_searches_tests/eob_required_searches.rb

@@ -54,6 +54,12 @@ module CarinForBlueButtonTestKit
       ]
     end
 
+    def suite_id # allow overriding without extension - used by resource_previous_search_params logic
+      return config.options[:suite_id] if config.options[:suite_id].present?
+
+      C4BBV200ClientSuite.id
+    end
+
     run do
       search_params = resource_previous_search_params(:ExplanationOfBenefitSearch)
       skip_if search_params.nil?, 'No search requests made for Explanation of Benefit resource'

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/required_searches_tests/organization_required_searches.rb

@@ -29,6 +29,12 @@ module CarinForBlueButtonTestKit
       ]
     end
 
+    def suite_id # allow overriding without extension - used by resource_previous_search_params logic
+      return config.options[:suite_id] if config.options[:suite_id].present?
+
+      C4BBV200ClientSuite.id
+    end
+
     run do
       search_params = resource_previous_search_params(:OrganizationSearch)
       skip_if search_params.nil?, 'No search requests made for Organization resource'

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/required_searches_tests/patient_required_searches.rb

@@ -45,6 +45,12 @@ module CarinForBlueButtonTestKit
       ]
     end
 
+    def suite_id # allow overriding without extension - used by resource_previous_search_params logic
+      return config.options[:suite_id] if config.options[:suite_id].present?
+
+      C4BBV200ClientSuite.id
+    end
+
     run do
       search_params = resource_previous_search_params(:PatientSearch)
       skip_if search_params.nil?, 'No search requests made for Patient resource'

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/required_searches_tests/practitioner_required_searches.rb

@@ -29,6 +29,12 @@ module CarinForBlueButtonTestKit
       ]
     end
 
+    def suite_id # allow overriding without extension - used by resource_previous_search_params logic
+      return config.options[:suite_id] if config.options[:suite_id].present?
+
+      C4BBV200ClientSuite.id
+    end
+
     run do
       search_params = resource_previous_search_params(:PractitionerSearch)
       skip_if search_params.nil?, 'No search requests made for Practitioner resource'

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/required_searches_tests/relatedperson_required_searches.rb

@@ -25,6 +25,12 @@ module CarinForBlueButtonTestKit
       ]
     end
 
+    def suite_id # allow overriding without extension - used by resource_previous_search_params logic
+      return config.options[:suite_id] if config.options[:suite_id].present?
+
+      C4BBV200ClientSuite.id
+    end
+
     run do
       search_params = resource_previous_search_params(:RelatedPersonSearch)
       skip_if search_params.nil?, 'No search requests made for RelatedPerson resource'

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/tags.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 module CarinForBlueButtonTestKit
-  AUTH_TAG = 'carin_auth'
-  RESOURCE_API_TAG = 'carin_resource_api'
-  RESOURCE_ID_TAG = 'carin_resource_id'
-  AUTHORIZE_TAG = 'carin_smart_app_authorize'
-  TOKEN_TAG = 'carin_smart_app_token'
+  RESOURCE_API_TAG = 'resource_api'
+  RESOURCE_ID_TAG = 'resource_id'
 end

data/lib/carin_for_blue_button_test_kit/client/v2.0.0/urls.rb

@@ -1,6 +1,6 @@
 module CarinForBlueButtonTestKit
-  TOKEN_PATH = '/mock_auth/token'.freeze
-  AUTH_PATH = '/mock_auth/authorization'.freeze
+  TOKEN_PATH = '/auth/token'.freeze
+  AUTHORIZATION_PATH = '/auth/authorization'.freeze
   JKWS_PATH = '/.well-known/jwks.json'.freeze
   SMART_CONFIG_PATH = '/.well-known/smart-configuration'.freeze
   PATIENT_PATH = '/fhir/Patient'.freeze
@@ -22,7 +22,7 @@ module CarinForBlueButtonTestKit
     end
 
     def authorization_url
-      @authorization_url ||= base_url + AUTH_PATH
+      @authorization_url ||= base_url + AUTHORIZATION_PATH
     end
 
     def jwks_url
@@ -33,16 +33,20 @@ module CarinForBlueButtonTestKit
       @smart_configuration_url ||= base_url + SMART_CONFIG_PATH
     end
 
-    def base_fhir_url
-      @base_fhir_url ||= base_url + BASE_FHIR_PATH
+    def fhir_base_url
+      @fhir_base_url ||= base_url + BASE_FHIR_PATH
+    end
+
+    def client_fhir_base_url # alias for OIDC from SMART / UDAP client tests
+      fhir_base_url
     end
 
     def patient_url
       @patient_url ||= base_url + PATIENT_PATH
     end
 
-    def submit_url
-      @submit_url ||= base_url + RESOURCE_API_PATH
+    def resource_api_url
+      @resource_api_url ||= base_url + RESOURCE_API_PATH
     end
 
     def resource_id_url