Skip to content

Update for OmniAuth v2 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidtaylorhq wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update for OmniAuth v2 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/omniauth/amazon/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module OmniAuth
module Amazon
VERSION = "1.0.1"
VERSION = "2.0.0"
end
end
2 changes: 1 addition & 1 deletion lib/omniauth/strategies/amazon.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def raw_info
end

def callback_url
full_host + script_name + callback_path
full_host + callback_path
end
end
end
Expand Down
11 changes: 6 additions & 5 deletions omniauth-amazon.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
spec.version = OmniAuth::Amazon::VERSION
spec.authors = ["Stafford Brunk"]
spec.email = ["stafford.brunk@gmail.com"]
spec.description = %q{Login with Amazon OAuth2 strategy for OmniAuth 1.0}
spec.summary = %q{Login with Amazon OAuth2 strategy for OmniAuth 1.0}
spec.description = %q{Login with Amazon OAuth2 strategy for OmniAuth 2.0}
spec.summary = %q{Login with Amazon OAuth2 strategy for OmniAuth 2.0}
spec.homepage = "https://github.com/wingrunr21/omniauth-amazon"
spec.license = "MIT"

Expand All @@ -18,12 +18,13 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.add_dependency 'omniauth', '~> 1.0'
spec.add_dependency 'omniauth', '~> 2.0'
spec.add_dependency 'omniauth-oauth2', '~> 1.1'
spec.add_dependency 'multi_json'

spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "bundler", "~> 2.0"
spec.add_development_dependency "rake"
spec.add_development_dependency 'rspec', '~> 2.13'
spec.add_development_dependency 'rspec', '~> 3.0'
spec.add_development_dependency 'rack-test'
spec.add_development_dependency 'simplecov'
spec.add_development_dependency 'webmock'
Expand Down
4 changes: 1 addition & 3 deletions spec/omniauth/strategies/amazon_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

describe OmniAuth::Strategies::Amazon do
subject do
strategy = OmniAuth::Strategies::Amazon.new(nil, @options || {})
strategy.stub(:session) { { } }
strategy
OmniAuth::Strategies::Amazon.new(nil, @options || {})
end

describe '#client' do
Expand Down