omniauth-oauth 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d51821d2156b46cf7954f1ac30678998f5f2a93b
-  data.tar.gz: 8b8fceab109adc5085bb894c5c18fd7eeac5cb0d
+SHA256:
+  metadata.gz: 15f7ae4ba733071a8603faed16da085c9b38663b329ca15ad38e2d02b0180013
+  data.tar.gz: 8d5bcfe9d541dae45fe7e0201c81faaf4944526f6fbaeb8f1a98fc86a5311968
 SHA512:
-  metadata.gz: 9ed599e75401adf88aef86315b2dc00d035e77a91cea8c5922ad2c46c14dc312570884202e75b22c5985fe4c303058d8fbd123db252ba0bf28eff79a78dc5404
-  data.tar.gz: 4f9ea2ffcf4ac1731605358d5420b0870843082fa96f7628508e0c6bac6e4b116c7bd2426ed39d822a50bb49c1dda5f85d0d4777d4c4b488609fcf316606c52d
+  metadata.gz: 342a46ffa943a4241cf77a14ef259d186232a332bd75e3cb54b4f0b1ae360d9838c8ed8e21fbe01024cd540d6e450d306cfaa4ed7dd7228071f383193440118b
+  data.tar.gz: 55a5ea9b505cc6b9429c0a12d05b347cda0a69ca937da64cd2e9e2eb6b3cafe4301591d2dba123fde5c06f7c57d896cc3f2342565a43dee2098668b34977f26c

data/.travis.yml

@@ -4,11 +4,12 @@ env:
     - JRUBY_OPTS="$JRUBY_OPTS --debug"
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
   - jruby-18mode
   - jruby-19mode
   - jruby-head
@@ -18,5 +19,6 @@ matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
+    - rvm: rbx-2 # TODO: Fix
   fast_finish: true
 sudo: false

data/lib/omniauth/strategies/oauth.rb

@@ -48,7 +48,7 @@ module OmniAuth
 
         opts = {}
         if session["oauth"][name.to_s]["callback_confirmed"]
-          opts[:oauth_verifier] = request["oauth_verifier"]
+          opts[:oauth_verifier] = request.respond_to?(:params) ? request.params["oauth_verifier"] : request["oauth_verifier"]
         else
           opts[:oauth_callback] = callback_url
         end

data/lib/omniauth-oauth/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module OAuth
-    VERSION = "1.1.0"
+    VERSION = "1.2.1"
   end
 end

data/omniauth-oauth.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/intridea/omniauth-oauth"
   gem.license       = "MIT"
 
-  gem.add_dependency "omniauth", "~> 1.0"
+  gem.add_dependency "omniauth", ">= 1.0", "< 3"
   gem.add_dependency "oauth"
-  gem.add_development_dependency "bundler", "~> 1.9"
+  gem.add_dependency "rack", ">= 1.6.2", "< 4"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

data/spec/helper.rb

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift File.expand_path("..", __FILE__)
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require "simplecov"
 SimpleCov.start do
-  minimum_coverage(89.8)
+  minimum_coverage(89.79)
 end
 require "rspec"
 require "rack/test"
@@ -10,6 +10,8 @@ require "webmock/rspec"
 require "omniauth"
 require "omniauth-oauth"
 
+OmniAuth.config.request_validation_phase = nil
+
 RSpec.configure do |config|
   config.include WebMock::API
   config.include Rack::Test::Methods

data/spec/omniauth/strategies/oauth_spec.rb

@@ -34,7 +34,7 @@ describe "OmniAuth::Strategies::OAuth" do
   describe "/auth/{name}" do
     context "successful" do
       before do
-        get "/auth/example.org"
+        post "/auth/example.org"
       end
 
       it "should redirect to authorize_url" do
@@ -43,7 +43,7 @@ describe "OmniAuth::Strategies::OAuth" do
       end
 
       it "should redirect to authorize_url with authorize_params when set" do
-        get "/auth/example.org_with_authorize_params"
+        post "/auth/example.org_with_authorize_params"
         expect(last_response).to be_redirect
         expect([
           "https://api.example.org/oauth/authorize?abc=def&oauth_token=yourtoken",
@@ -56,7 +56,7 @@ describe "OmniAuth::Strategies::OAuth" do
       end
 
       it "should pass request_params to get_request_token" do
-        get "/auth/example.org_with_request_params"
+        post "/auth/example.org_with_request_params"
         expect(WebMock).to have_requested(:post, "https://api.example.org/oauth/request_token").
           with { |req| req.body == "scope=http%3A%2F%2Ffoobar.example.org" }
       end
@@ -66,7 +66,7 @@ describe "OmniAuth::Strategies::OAuth" do
       before do
         stub_request(:post, "https://api.example.org/oauth/request_token").
           to_raise(::Net::HTTPFatalError.new('502 "Bad Gateway"', nil))
-        get "/auth/example.org"
+        post "/auth/example.org"
       end
 
       it "should call fail! with :service_unavailable" do
@@ -78,7 +78,7 @@ describe "OmniAuth::Strategies::OAuth" do
         before do
           stub_request(:post, "https://api.example.org/oauth/request_token").
             to_raise(::OpenSSL::SSL::SSLError.new("SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed"))
-          get "/auth/example.org"
+          post "/auth/example.org"
         end
 
         it "should call fail! with :service_unavailable" do
@@ -132,6 +132,45 @@ describe "OmniAuth::Strategies::OAuth" do
     end
   end
 
+  describe "/auth/{name}/callback with Rack 2.x and 3.x" do
+    before do
+      stub_request(:post, "https://api.example.org/oauth/access_token").
+        to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret")
+    end
+
+    context "Rack 2.x style request" do
+      before do
+        get "/auth/example.org/callback", {"oauth_verifier" => "dudeman"}, "rack.session" => {"oauth" => {"example.org" => {"callback_confirmed" => true, "request_token" => "yourtoken", "request_secret" => "yoursecret"}}}
+      end
+
+      it "should exchange the request token for an access token" do
+        expect(last_request.env["omniauth.auth"]["provider"]).to eq("example.org")
+        expect(last_request.env["omniauth.auth"]["extra"]["access_token"]).to be_kind_of(OAuth::AccessToken)
+      end
+
+      it "should call through to the master app" do
+        expect(last_response.body).to eq("true")
+      end
+    end
+
+    context "Rack 3.x style request" do
+      before do
+        # Simulate Rack 3.x behavior by putting oauth_verifier in the params
+        allow_any_instance_of(Rack::Request).to receive(:params).and_return({"oauth_verifier" => "dudeman"})
+        get "/auth/example.org/callback", {}, "rack.session" => {"oauth" => {"example.org" => {"callback_confirmed" => true, "request_token" => "yourtoken", "request_secret" => "yoursecret"}}}
+      end
+
+      it "should exchange the request token for an access token" do
+        expect(last_request.env["omniauth.auth"]["provider"]).to eq("example.org")
+        expect(last_request.env["omniauth.auth"]["extra"]["access_token"]).to be_kind_of(OAuth::AccessToken)
+      end
+
+      it "should call through to the master app" do
+        expect(last_response.body).to eq("true")
+      end
+    end
+  end
+
   describe "/auth/{name}/callback with expired session" do
     before do
       stub_request(:post, "https://api.example.org/oauth/access_token").

metadata

@@ -1,30 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-oauth
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Michael Bleigh
 - Erik Michaels-Ober
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -40,19 +46,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
+        version: 1.6.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '4'
 description: A generic OAuth (1.0/1.0a) strategy for OmniAuth.
 email:
 - michael@intridea.com
@@ -79,7 +91,7 @@ homepage: https://github.com/intridea/omniauth-oauth
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -94,9 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: A generic OAuth (1.0/1.0a) strategy for OmniAuth.
 test_files: