diff options
Diffstat (limited to 'vendor/gems/omniauth-azure-oauth2')
3 files changed, 11 insertions, 8 deletions
diff --git a/vendor/gems/omniauth-azure-oauth2/Gemfile.lock b/vendor/gems/omniauth-azure-oauth2/Gemfile.lock index 0bd5d401175..d2bbe3e8d2f 100644 --- a/vendor/gems/omniauth-azure-oauth2/Gemfile.lock +++ b/vendor/gems/omniauth-azure-oauth2/Gemfile.lock @@ -3,7 +3,7 @@ PATH specs: omniauth-azure-oauth2 (0.0.10) jwt (>= 1.0, < 3.0) - omniauth (~> 1.0, < 3) + omniauth (~> 2.0) omniauth-oauth2 (~> 1.4) GEM @@ -19,16 +19,17 @@ GEM multi_xml (0.6.0) mustermann (2.0.2) ruby2_keywords (~> 0.0.1) - oauth2 (2.0.6) + oauth2 (2.0.3) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_xml (~> 0.5) rack (>= 1.2, < 3) rash_alt (>= 0.4, < 1) - version_gem (~> 1.1) - omniauth (1.9.1) + version_gem (~> 1.0) + omniauth (2.1.0) hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) + rack (>= 2.2.3) + rack-protection omniauth-oauth2 (1.7.3) oauth2 (>= 1.4, < 3) omniauth (>= 1.9, < 3) @@ -70,4 +71,4 @@ DEPENDENCIES sinatra BUNDLED WITH - 2.3.20 + 2.3.21 diff --git a/vendor/gems/omniauth-azure-oauth2/lib/omniauth/strategies/azure_oauth2.rb b/vendor/gems/omniauth-azure-oauth2/lib/omniauth/strategies/azure_oauth2.rb index f18babc0619..d71911b9876 100644 --- a/vendor/gems/omniauth-azure-oauth2/lib/omniauth/strategies/azure_oauth2.rb +++ b/vendor/gems/omniauth-azure-oauth2/lib/omniauth/strategies/azure_oauth2.rb @@ -59,8 +59,10 @@ module OmniAuth super.merge(resource: azure_resource || options.resource) end + # for compatibility with OmniAuth 2.0 + # see https://github.com/RIPAGlobal/omniauth-azure-activedirectory-v2/pull/6 def callback_url - full_host + script_name + callback_path + full_host + callback_path end def raw_info diff --git a/vendor/gems/omniauth-azure-oauth2/omniauth-azure-oauth2.gemspec b/vendor/gems/omniauth-azure-oauth2/omniauth-azure-oauth2.gemspec index 6e1bc583881..1299285b945 100644 --- a/vendor/gems/omniauth-azure-oauth2/omniauth-azure-oauth2.gemspec +++ b/vendor/gems/omniauth-azure-oauth2/omniauth-azure-oauth2.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |gem| gem.version = OmniAuth::AzureOauth2::VERSION gem.license = "MIT" - gem.add_runtime_dependency 'omniauth', '~> 1.0', '< 3' + gem.add_runtime_dependency 'omniauth', '~> 2.0' gem.add_dependency 'jwt', ['>= 1.0', '< 3.0'] gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.4' |