From 3b4f11683df252f9a3a9cbf1adae0aa32692728f Mon Sep 17 00:00:00 2001 From: Karissa Jacobsen Date: Wed, 21 Apr 2021 12:51:18 -0700 Subject: [PATCH 1/3] update Gemfile --- Gemfile.lock | 140 +++++++++++++++++++++++++-------------------------- 1 file changed, 69 insertions(+), 71 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 594b67d..76798cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,56 +1,56 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.6) - actionpack (= 6.0.3.6) + actioncable (6.0.3.5) + actionpack (= 6.0.3.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.6) - actionpack (= 6.0.3.6) - activejob (= 6.0.3.6) - activerecord (= 6.0.3.6) - activestorage (= 6.0.3.6) - activesupport (= 6.0.3.6) + actionmailbox (6.0.3.5) + actionpack (= 6.0.3.5) + activejob (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) mail (>= 2.7.1) - actionmailer (6.0.3.6) - actionpack (= 6.0.3.6) - actionview (= 6.0.3.6) - activejob (= 6.0.3.6) + actionmailer (6.0.3.5) + actionpack (= 6.0.3.5) + actionview (= 6.0.3.5) + activejob (= 6.0.3.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.6) - actionview (= 6.0.3.6) - activesupport (= 6.0.3.6) + actionpack (6.0.3.5) + actionview (= 6.0.3.5) + activesupport (= 6.0.3.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.6) - actionpack (= 6.0.3.6) - activerecord (= 6.0.3.6) - activestorage (= 6.0.3.6) - activesupport (= 6.0.3.6) + actiontext (6.0.3.5) + actionpack (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) nokogiri (>= 1.8.5) - actionview (6.0.3.6) - activesupport (= 6.0.3.6) + actionview (6.0.3.5) + activesupport (= 6.0.3.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.6) - activesupport (= 6.0.3.6) + activejob (6.0.3.5) + activesupport (= 6.0.3.5) globalid (>= 0.3.6) - activemodel (6.0.3.6) - activesupport (= 6.0.3.6) - activerecord (6.0.3.6) - activemodel (= 6.0.3.6) - activesupport (= 6.0.3.6) - activestorage (6.0.3.6) - actionpack (= 6.0.3.6) - activejob (= 6.0.3.6) - activerecord (= 6.0.3.6) - marcel (~> 1.0.0) - activesupport (6.0.3.6) + activemodel (6.0.3.5) + activesupport (= 6.0.3.5) + activerecord (6.0.3.5) + activemodel (= 6.0.3.5) + activesupport (= 6.0.3.5) + activestorage (6.0.3.5) + actionpack (= 6.0.3.5) + activejob (= 6.0.3.5) + activerecord (= 6.0.3.5) + marcel (~> 0.3.1) + activesupport (6.0.3.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -61,7 +61,7 @@ GEM archive-zip (0.12.0) io-like (~> 0.3.0) bindex (0.8.1) - bootsnap (1.7.4) + bootsnap (1.4.1) msgpack (~> 1.0) builder (3.2.4) byebug (11.1.3) @@ -96,46 +96,44 @@ GEM json (~> 2.1, >= 2.1.0) jwt (~> 2.2, >= 2.2.1) typhoeus (~> 1.0, >= 1.0.1) - docusign_rooms (1.1.0) + docusign_rooms (1.1.0.rc1) json (~> 2.1, >= 2.1.0) jwt (~> 2.2, >= 2.2.1) typhoeus (~> 1.0, >= 1.0.1) erubi (1.10.0) - ethon (0.13.0) - ffi (>= 1.15.0) + ethon (0.12.0) + ffi (>= 1.3.0) execjs (2.7.0) - faraday (1.4.1) - faraday-excon (~> 1.1) + faraday (1.3.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) - ruby2_keywords (>= 0.0.4) - faraday-excon (1.1.0) + ruby2_keywords faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) ffi (1.15.0) ffi (1.15.0-x64-mingw32) globalid (0.4.2) activesupport (>= 4.2.0) hashie (4.1.0) - i18n (1.8.10) + i18n (1.8.9) concurrent-ruby (~> 1.0) io-like (0.3.1) jbuilder (2.10.2) activesupport (>= 5.0.0) json (2.5.1) - jwt (2.2.3) + jwt (2.2.2) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.9.1) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) method_source (0.9.2) - mini_mime (1.1.0) + mimemagic (0.3.5) + mini_mime (1.0.2) mini_portile2 (2.5.0) minitest (5.14.4) msgpack (1.4.2) @@ -143,10 +141,10 @@ GEM multi_xml (0.6.0) multipart-post (2.1.1) nio4r (2.5.7) - nokogiri (1.11.3) + nokogiri (1.11.2) mini_portile2 (~> 2.5.0) racc (~> 1.4) - nokogiri (1.11.3-x64-mingw32) + nokogiri (1.11.2-x64-mingw32) racc (~> 1.4) oauth2 (1.4.7) faraday (>= 0.8, < 2.0) @@ -154,7 +152,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (2.0.4) + omniauth (2.0.3) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) rack-protection @@ -180,29 +178,29 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.6) - actioncable (= 6.0.3.6) - actionmailbox (= 6.0.3.6) - actionmailer (= 6.0.3.6) - actionpack (= 6.0.3.6) - actiontext (= 6.0.3.6) - actionview (= 6.0.3.6) - activejob (= 6.0.3.6) - activemodel (= 6.0.3.6) - activerecord (= 6.0.3.6) - activestorage (= 6.0.3.6) - activesupport (= 6.0.3.6) + rails (6.0.3.5) + actioncable (= 6.0.3.5) + actionmailbox (= 6.0.3.5) + actionmailer (= 6.0.3.5) + actionpack (= 6.0.3.5) + actiontext (= 6.0.3.5) + actionview (= 6.0.3.5) + activejob (= 6.0.3.5) + activemodel (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) bundler (>= 1.3.0) - railties (= 6.0.3.6) + railties (= 6.0.3.5) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.3.6) - actionpack (= 6.0.3.6) - activesupport (= 6.0.3.6) + railties (6.0.3.5) + actionpack (= 6.0.3.5) + activesupport (= 6.0.3.5) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -272,7 +270,7 @@ PLATFORMS x64-mingw32 DEPENDENCIES - bootsnap (~> 1.7.3) + bootsnap (>= 1.1.0, < 1.4.2) byebug (~> 11.1.1) capybara (~> 3.31.0) chromedriver-helper (~> 2.1.1) @@ -303,4 +301,4 @@ RUBY VERSION ruby 2.7.2p137 BUNDLED WITH - 2.2.16 + 2.1.4 \ No newline at end of file From 135aea5cd9d9f4c182b33cbca16bd53bb4713710 Mon Sep 17 00:00:00 2001 From: Karissa Jacobsen Date: Thu, 22 Apr 2021 14:07:19 -0700 Subject: [PATCH 2/3] set quickstart to automatically use auth code grant --- app/controllers/ds_common_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/ds_common_controller.rb b/app/controllers/ds_common_controller.rb index 26e4e7b..f37fb5e 100644 --- a/app/controllers/ds_common_controller.rb +++ b/app/controllers/ds_common_controller.rb @@ -28,7 +28,7 @@ def ds_return end def ds_must_authenticate - if Rails.configuration.quickstart == "true" + if Rails.configuration.quickstart == true redirect_to('auth/docusign') end @title = 'Authenticate with DocuSign' From 978f50998649e717d2b8c6f59c44a7f4afd51d8b Mon Sep 17 00:00:00 2001 From: Karissa Jacobsen Date: Thu, 22 Apr 2021 14:22:17 -0700 Subject: [PATCH 3/3] update auth --- app/controllers/ds_common_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/ds_common_controller.rb b/app/controllers/ds_common_controller.rb index f37fb5e..26d187f 100644 --- a/app/controllers/ds_common_controller.rb +++ b/app/controllers/ds_common_controller.rb @@ -29,7 +29,7 @@ def ds_return def ds_must_authenticate if Rails.configuration.quickstart == true - redirect_to('auth/docusign') + redirect_to('/auth/docusign') end @title = 'Authenticate with DocuSign' @show_doc = Rails.application.config.documentation