omniauth-oauth 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dfca9af1de8c628340193490f5c0e33a3075ce7baab4b72b6e4d07709204b71
-  data.tar.gz: 9294cf2611fee8dea9cfd28765c904b2150c6b271f9ae1840eff9e03cc1d97d5
+  metadata.gz: 15f7ae4ba733071a8603faed16da085c9b38663b329ca15ad38e2d02b0180013
+  data.tar.gz: 8d5bcfe9d541dae45fe7e0201c81faaf4944526f6fbaeb8f1a98fc86a5311968
 SHA512:
-  metadata.gz: a5b01f08e32d842622a5711071f9925e13f891c70b7f0ca96e0dcdca3957858a2555c821669c809fc29628c95213bd9dca0204374d9e4ab193a7b650dc0a5552
-  data.tar.gz: 0a4de26cf1b884da55b1567ca2cfb42b90db8e0fc32e45fe39cc1b588b980f5ebee344bfc8cee54cc128e0f6b99127601708294357975de5ca5d8c2a2e0e8580
+  metadata.gz: 342a46ffa943a4241cf77a14ef259d186232a332bd75e3cb54b4f0b1ae360d9838c8ed8e21fbe01024cd540d6e450d306cfaa4ed7dd7228071f383193440118b
+  data.tar.gz: 55a5ea9b505cc6b9429c0a12d05b347cda0a69ca937da64cd2e9e2eb6b3cafe4301591d2dba123fde5c06f7c57d896cc3f2342565a43dee2098668b34977f26c

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.2.0"
+    VERSION = "1.2.1"
   end
 end

data/omniauth-oauth.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "omniauth", ">= 1.0", "< 3"
   gem.add_dependency "oauth"
+  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/omniauth/strategies/oauth_spec.rb

@@ -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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-oauth
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Michael Bleigh
 - Erik Michaels-Ober
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -45,6 +45,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        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: '4'
 description: A generic OAuth (1.0/1.0a) strategy for OmniAuth.
 email:
 - michael@intridea.com
@@ -71,7 +91,7 @@ homepage: https://github.com/intridea/omniauth-oauth
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,8 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-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: