diff --git a/.gitignore b/.gitignore index 69c09f2..8bf2650 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /docs/yard .yardoc node_modules + +.byebug_history \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 94e31a6..9211826 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# 0.3.0 + +* Add support for asymmetric client auth to SMART v2. +* Add a message to the test result when redirecting the user to the auth + endpoint. +* Use `docker compose` instead of `docker-compose`. + # 0.2.2 * Fix typos and launch test description. diff --git a/Gemfile.lock b/Gemfile.lock index c96da8c..2977f86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - smart_app_launch_test_kit (0.2.2) + smart_app_launch_test_kit (0.3.0) inferno_core (>= 0.4.2) jwt (~> 2.2) tls_test_kit (~> 0.2.0) @@ -17,13 +17,14 @@ GEM zeitwerk (~> 2.3) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) + base62-rb (0.3.1) bcp47 (0.3.3) i18n blueprinter (0.25.2) byebug (11.1.3) coderay (1.1.3) concurrent-ruby (1.2.0) - connection_pool (2.3.0) + connection_pool (2.4.1) crack (0.4.5) rexml database_cleaner (1.99.0) @@ -144,8 +145,9 @@ GEM i18n (1.12.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) - inferno_core (0.4.8) + inferno_core (0.4.17) activesupport (~> 6.1) + base62-rb (= 0.3.1) blueprinter (= 0.25.2) dotenv (~> 2.7) dry-configurable (= 0.13.0) @@ -171,13 +173,13 @@ GEM io-console (0.5.11) irb (1.4.2) reline (>= 0.3.0) - jwt (2.7.0) + jwt (2.7.1) kramdown (2.4.0) rexml method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) + mime-types-data (3.2023.0218.1) minitest (5.17.0) multi_json (1.15.0) multi_xml (0.6.0) @@ -188,12 +190,12 @@ GEM hansi (~> 0.2.0) mustermann (= 1.1.2) netrc (0.11.0) - nio4r (2.5.8) - nokogiri (1.14.1-arm64-darwin) + nio4r (2.5.9) + nokogiri (1.15.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.14.1-x86_64-darwin) + nokogiri (1.15.3-x86_64-darwin) racc (~> 1.4) - nokogiri (1.14.1-x86_64-linux) + nokogiri (1.15.3-x86_64-linux) racc (~> 1.4) oauth2 (1.4.11) faraday (>= 0.17.3, < 3.0) @@ -211,14 +213,14 @@ GEM byebug (~> 11.0) pry (>= 0.13, < 0.15) public_suffix (5.0.1) - puma (5.6.5) + puma (5.6.6) nio4r (~> 2.0) - racc (1.6.2) + racc (1.7.1) rack (2.2.6.2) rack-test (1.1.0) rack (>= 1.0, < 3) rake (13.0.6) - redis (4.8.0) + redis (4.8.1) reline (0.3.1) io-console (~> 0.5) rest-client (2.1.0) @@ -227,7 +229,7 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.2.5) - rouge (3.30.0) + rouge (4.1.3) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -243,27 +245,27 @@ GEM rspec-support (3.12.0) ruby2_keywords (0.0.5) sequel (5.42.0) - sidekiq (6.5.8) + sidekiq (6.5.9) connection_pool (>= 2.2.5, < 3) rack (~> 2.0) redis (>= 4.5.0, < 5) - sqlite3 (1.6.0-arm64-darwin) - sqlite3 (1.6.0-x86_64-darwin) - sqlite3 (1.6.0-x86_64-linux) + sqlite3 (1.6.3-arm64-darwin) + sqlite3 (1.6.3-x86_64-darwin) + sqlite3 (1.6.3-x86_64-linux) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - thor (1.2.1) - tilt (2.0.11) + thor (1.2.2) + tilt (2.2.0) tls_test_kit (0.2.0) inferno_core (>= 0.4.1) tty-color (0.6.0) - tty-markdown (0.7.1) + tty-markdown (0.7.2) kramdown (>= 1.16.2, < 3.0) pastel (~> 0.8) - rouge (~> 3.14) + rouge (>= 3.14, < 5.0) strings (~> 0.2.0) tty-color (~> 0.5) tty-screen (~> 0.8) diff --git a/lib/smart_app_launch/ehr_launch_group_stu2.rb b/lib/smart_app_launch/ehr_launch_group_stu2.rb index 3525016..da1b701 100644 --- a/lib/smart_app_launch/ehr_launch_group_stu2.rb +++ b/lib/smart_app_launch/ehr_launch_group_stu2.rb @@ -58,5 +58,7 @@ class EHRLaunchGroupSTU2 < EHRLaunchGroup token_exchange_index = children.find_index { |child| child.id.to_s.end_with? 'token_exchange' } children[token_exchange_index] = children.pop + + children[token_exchange_index].id(:smart_token_exchange) end end diff --git a/lib/smart_app_launch/standalone_launch_group_stu2.rb b/lib/smart_app_launch/standalone_launch_group_stu2.rb index 9e38c15..e107fff 100644 --- a/lib/smart_app_launch/standalone_launch_group_stu2.rb +++ b/lib/smart_app_launch/standalone_launch_group_stu2.rb @@ -54,5 +54,7 @@ class StandaloneLaunchGroupSTU2 < StandaloneLaunchGroup token_exchange_index = children.find_index { |child| child.id.to_s.end_with? 'token_exchange' } children[token_exchange_index] = children.pop + + children[token_exchange_index].id('smart_token_exchange') end end diff --git a/lib/smart_app_launch/version.rb b/lib/smart_app_launch/version.rb index aad8421..6933ea7 100644 --- a/lib/smart_app_launch/version.rb +++ b/lib/smart_app_launch/version.rb @@ -1,3 +1,3 @@ module SMARTAppLaunch - VERSION = '0.2.2'.freeze + VERSION = '0.3.0'.freeze end