diff --git a/Gemfile b/Gemfile index a02dd1806..1701442d6 100644 --- a/Gemfile +++ b/Gemfile @@ -16,14 +16,14 @@ gem 'figaro' gem 'friendly_id' gem 'immutable-struct' -gem 'nokogiri', '1.10.8' +gem 'nokogiri', '1.11.1' # Authentication & authorisation -gem 'devise', '4.7.2' +gem 'devise', github: 'heartcombo/devise', branch: 'ca-omniauth-2' gem 'devise-async' gem 'hawk-auth' -gem 'omniauth' -gem 'omniauth-oauth2' +gem 'omniauth', '2.0.3' +gem 'omniauth-oauth2', '1.7.1' gem 'pundit', require: true # Rendering diff --git a/Gemfile.lock b/Gemfile.lock index 5369036cf..84ed21591 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,15 @@ +GIT + remote: https://github.com/heartcombo/devise.git + revision: e16d60d0fedc5f5e6f541b2b9e901a2d53f8ceda + branch: ca-omniauth-2 + specs: + devise (4.7.3) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0) + responders + warden (~> 1.2.3) + GIT remote: https://github.com/uktrade/export_components.git revision: 379db7c53a1bb58639e678097364b4a7c4bea6f8 @@ -975,7 +987,7 @@ GEM aws-sigv2 (1.0.1) aws-sigv4 (1.1.3) aws-eventstream (~> 1.0, >= 1.0.2) - bcrypt (3.1.15) + bcrypt (3.1.16) bindex (0.8.1) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) @@ -1013,12 +1025,6 @@ GEM addressable database_cleaner (1.8.5) debug_inspector (0.0.3) - devise (4.7.2) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0) - responders - warden (~> 1.2.3) devise-async (1.0.0) activejob (>= 5.0) devise (>= 4.0) @@ -1137,7 +1143,7 @@ GEM mime-types-data (3.2020.0512) mimemagic (0.3.5) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitest (5.14.2) mock_redis (0.23.0) multi_json (1.15.0) @@ -1148,8 +1154,9 @@ GEM thor (~> 0.19) netrc (0.11.0) nio4r (2.5.4) - nokogiri (1.10.8) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) normalize-scss (7.0.1) sass (~> 3.3) oauth2 (1.4.4) @@ -1158,12 +1165,13 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.9.1) + omniauth (2.0.3) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) - omniauth-oauth2 (1.6.0) - oauth2 (~> 1.1) - omniauth (~> 1.9) + rack-protection + omniauth-oauth2 (1.7.1) + oauth2 (~> 1.4) + omniauth (>= 1.9, < 3) orm_adapter (0.5.0) paper_trail (10.3.1) activerecord (>= 4.2) @@ -1206,6 +1214,7 @@ GEM pundit-matchers (1.6.0) rspec-rails (>= 3.0.0) raabro (1.3.1) + racc (1.5.2) rack (2.2.3) rack-protection (2.0.8.1) rack @@ -1369,8 +1378,8 @@ GEM unicode-display_width (1.6.1) uniform_notifier (1.13.0) vcr (5.1.0) - warden (1.2.8) - rack (>= 2.0.6) + warden (1.2.9) + rack (>= 2.0.9) web-console (4.0.2) actionview (>= 6.0.0) activemodel (>= 6.0.0) @@ -1406,7 +1415,7 @@ DEPENDENCIES capybara-screenshot ckeditor database_cleaner - devise (= 4.7.2) + devise! devise-async devise-security (= 0.14.3) elasticsearch-extensions @@ -1434,10 +1443,10 @@ DEPENDENCIES listen mock_redis neat (= 1.8.0) - nokogiri (= 1.10.8) + nokogiri (= 1.11.1) normalize-scss - omniauth - omniauth-oauth2 + omniauth (= 2.0.3) + omniauth-oauth2 (= 1.7.1) paper_trail (= 10.3.1) pg (= 1.1.4) pg_search diff --git a/vendor/cache/bcrypt-3.1.15.gem b/vendor/cache/bcrypt-3.1.15.gem deleted file mode 100644 index ae313645d..000000000 Binary files a/vendor/cache/bcrypt-3.1.15.gem and /dev/null differ diff --git a/vendor/cache/bcrypt-3.1.16.gem b/vendor/cache/bcrypt-3.1.16.gem new file mode 100644 index 000000000..258554a53 Binary files /dev/null and b/vendor/cache/bcrypt-3.1.16.gem differ diff --git a/vendor/cache/devise-4.7.2.gem b/vendor/cache/devise-4.7.2.gem deleted file mode 100644 index e5e0ad58a..000000000 Binary files a/vendor/cache/devise-4.7.2.gem and /dev/null differ diff --git a/vendor/cache/mini_portile2-2.4.0.gem b/vendor/cache/mini_portile2-2.4.0.gem deleted file mode 100644 index 2d3f34784..000000000 Binary files a/vendor/cache/mini_portile2-2.4.0.gem and /dev/null differ diff --git a/vendor/cache/mini_portile2-2.5.0.gem b/vendor/cache/mini_portile2-2.5.0.gem new file mode 100644 index 000000000..cd8b4aa0f Binary files /dev/null and b/vendor/cache/mini_portile2-2.5.0.gem differ diff --git a/vendor/cache/nokogiri-1.10.8.gem b/vendor/cache/nokogiri-1.10.8.gem deleted file mode 100644 index 41afc6617..000000000 Binary files a/vendor/cache/nokogiri-1.10.8.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem b/vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem new file mode 100644 index 000000000..2d8c028c2 Binary files /dev/null and b/vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem differ diff --git a/vendor/cache/omniauth-1.9.1.gem b/vendor/cache/omniauth-1.9.1.gem deleted file mode 100644 index 6f2720954..000000000 Binary files a/vendor/cache/omniauth-1.9.1.gem and /dev/null differ diff --git a/vendor/cache/omniauth-2.0.3.gem b/vendor/cache/omniauth-2.0.3.gem new file mode 100644 index 000000000..60680fe8a Binary files /dev/null and b/vendor/cache/omniauth-2.0.3.gem differ diff --git a/vendor/cache/omniauth-oauth2-1.6.0.gem b/vendor/cache/omniauth-oauth2-1.6.0.gem deleted file mode 100644 index bc35824d7..000000000 Binary files a/vendor/cache/omniauth-oauth2-1.6.0.gem and /dev/null differ diff --git a/vendor/cache/omniauth-oauth2-1.7.1.gem b/vendor/cache/omniauth-oauth2-1.7.1.gem new file mode 100644 index 000000000..393e095dd Binary files /dev/null and b/vendor/cache/omniauth-oauth2-1.7.1.gem differ diff --git a/vendor/cache/racc-1.5.2.gem b/vendor/cache/racc-1.5.2.gem new file mode 100644 index 000000000..39f03fa79 Binary files /dev/null and b/vendor/cache/racc-1.5.2.gem differ diff --git a/vendor/cache/warden-1.2.8.gem b/vendor/cache/warden-1.2.8.gem deleted file mode 100644 index 549ef412a..000000000 Binary files a/vendor/cache/warden-1.2.8.gem and /dev/null differ diff --git a/vendor/cache/warden-1.2.9.gem b/vendor/cache/warden-1.2.9.gem new file mode 100644 index 000000000..d3b122397 Binary files /dev/null and b/vendor/cache/warden-1.2.9.gem differ