omniauth-oauth 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f7ae4ba733071a8603faed16da085c9b38663b329ca15ad38e2d02b0180013
-  data.tar.gz: 8d5bcfe9d541dae45fe7e0201c81faaf4944526f6fbaeb8f1a98fc86a5311968
+  metadata.gz: d19f0af5048d2c89c4b17b6915b01eddf206cb77834d461a70658ae2cc3e1c23
+  data.tar.gz: 3c77259ad9b59479471520fb39b1883d3697bc3a8648152ccbdbc2225068442d
 SHA512:
-  metadata.gz: 342a46ffa943a4241cf77a14ef259d186232a332bd75e3cb54b4f0b1ae360d9838c8ed8e21fbe01024cd540d6e450d306cfaa4ed7dd7228071f383193440118b
-  data.tar.gz: 55a5ea9b505cc6b9429c0a12d05b347cda0a69ca937da64cd2e9e2eb6b3cafe4301591d2dba123fde5c06f7c57d896cc3f2342565a43dee2098668b34977f26c
+  metadata.gz: d4b7f5e559a173a6cde49cbb212ffb8721f07f4f90879009c79c8f46fa55754dc820ce39b5f8a9536361fcf08dfd55a3c588956ed0dc06bef352b3d027a9f2de
+  data.tar.gz: aa7df709b7133881888a1363688aaa6f31752257cf9c1533f67fdcc1622938dbdf0e764d215ffe80412b59e1b20b5f9b04fae82f4126c1480a40f98207e6de13

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (C) 2014 Michael Bleigh, Erik Michaels-Ober and Intridea, Inc.
+Copyright (c) 2011-2026 Michael Bleigh, Erik Berlin and Intridea, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,5 +1,13 @@
 # OmniAuth OAuth
 
+[![Gem Version](http://img.shields.io/gem/v/omniauth-oauth.svg)][gem]
+[![Ruby](https://github.com/omniauth/omniauth-oauth/actions/workflows/ci.yml/badge.svg)][githubactions]
+[![Maintainability](https://qlty.sh/gh/omniauth/projects/omniauth-oauth/maintainability.svg)][qlty]
+
+[gem]: https://rubygems.org/gems/omniauth-oauth
+[githubactions]: https://github.com/omniauth/omniauth-oauth/actions/workflows/ci.yml
+[qlty]: https://qlty.sh/gh/omniauth/projects/omniauth-oauth
+
 This gem contains a generic OAuth strategy for OmniAuth. It is meant to
 serve as a building block strategy for other strategies and not to be
 used independently (since it has no inherent way to gather uid and user
@@ -45,7 +53,7 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= JSON.load(access_token.get('/me.json')).body
+        @raw_info ||= JSON.load(access_token.get('/me.json').body)
       end
     end
   end

data/lib/omniauth/strategies/oauth.rb

@@ -6,7 +6,7 @@ module OmniAuth
     class OAuth
       include OmniAuth::Strategy
 
-      args [:consumer_key, :consumer_secret]
+      args %i[consumer_key consumer_secret]
       option :consumer_key, nil
       option :consumer_secret, nil
       option :client_options, {}
@@ -19,41 +19,35 @@ module OmniAuth
 
       def consumer
         consumer = ::OAuth::Consumer.new(options.consumer_key, options.consumer_secret, options.client_options)
-        consumer.http.open_timeout = options.open_timeout if options.open_timeout
-        consumer.http.read_timeout = options.read_timeout if options.read_timeout
+        open_timeout = options.open_timeout
+        read_timeout = options.read_timeout
+        consumer.http.open_timeout = open_timeout if open_timeout
+        consumer.http.read_timeout = read_timeout if read_timeout
         consumer
       end
 
-      def request_phase # rubocop:disable MethodLength
+      def request_phase
         request_token = consumer.get_request_token({:oauth_callback => callback_url}, options.request_params)
         session["oauth"] ||= {}
-        session["oauth"][name.to_s] = {"callback_confirmed" => request_token.callback_confirmed?, "request_token" => request_token.token, "request_secret" => request_token.secret}
+        session.fetch("oauth")[name.to_s] = {"callback_confirmed" => request_token.callback_confirmed?, "request_token" => request_token.token, "request_secret" => request_token.secret}
 
         if request_token.callback_confirmed?
-          redirect request_token.authorize_url(options[:authorize_params])
+          redirect request_token.authorize_url(options.authorize_params)
         else
-          redirect request_token.authorize_url(options[:authorize_params].merge(:oauth_callback => callback_url))
+          redirect request_token.authorize_url(options.authorize_params.merge(:oauth_callback => callback_url))
         end
-
       rescue ::Timeout::Error => e
         fail!(:timeout, e)
       rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
         fail!(:service_unavailable, e)
       end
 
-      def callback_phase # rubocop:disable MethodLength
-        fail(OmniAuth::NoSessionError, "Session Expired") if session["oauth"].nil?
-
-        request_token = ::OAuth::RequestToken.new(consumer, session["oauth"][name.to_s].delete("request_token"), session["oauth"][name.to_s].delete("request_secret"))
-
-        opts = {}
-        if session["oauth"][name.to_s]["callback_confirmed"]
-          opts[:oauth_verifier] = request.respond_to?(:params) ? request.params["oauth_verifier"] : request["oauth_verifier"]
-        else
-          opts[:oauth_callback] = callback_url
-        end
+      def callback_phase
+        provider_session = (session["oauth"] || {})[name.to_s]
+        raise(NoSessionError, "Session Expired") unless provider_session
 
-        @access_token = request_token.get_access_token(opts)
+        request_token = ::OAuth::RequestToken.new(consumer, provider_session.delete("request_token"), provider_session.delete("request_secret"))
+        @access_token = request_token.get_access_token(access_token_options(provider_session))
         super
       rescue ::Timeout::Error => e
         fail!(:timeout, e)
@@ -65,6 +59,16 @@ module OmniAuth
         fail!(:session_expired, e)
       end
 
+      # The verifier when the provider confirmed the callback URL (OAuth
+      # 1.0a), or the callback URL when it didn't (OAuth 1.0).
+      def access_token_options(provider_session)
+        if provider_session["callback_confirmed"]
+          {:oauth_verifier => request.params["oauth_verifier"]}
+        else
+          {:oauth_callback => callback_url}
+        end
+      end
+
       credentials do
         {"token" => access_token.token, "secret" => access_token.secret}
       end

data/lib/omniauth-oauth/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module OAuth
-    VERSION = "1.2.1"
+    VERSION = "1.3.0".freeze
   end
 end

data/sig/omniauth-oauth.rbs

@@ -0,0 +1,58 @@
+module OmniAuth
+  module OAuth
+    VERSION: String
+  end
+
+  module Strategies
+    # A generic OAuth 1.0a strategy. Provider strategies subclass it and set
+    # client_options (site, request_token_path, authorize_path, and
+    # access_token_path) for their provider.
+    class OAuth
+      include Strategy
+      extend Strategy::ClassMethods
+
+      # The options this strategy adds to OmniAuth's. Strategy::Options
+      # answers them through Hashie::Mash's method_missing.
+      interface _Options
+        def consumer_key: () -> String?
+        def consumer_secret: () -> String?
+        def client_options: () -> Strategy::Options
+        def open_timeout: () -> (Integer | Float | nil)
+        def read_timeout: () -> (Integer | Float | nil)
+        def authorize_params: () -> Strategy::Options
+        def request_params: () -> Strategy::Options
+      end
+
+      # The fetcher blocks run with the strategy instance as self.
+      def self.uid: () { () [self: instance] -> untyped } -> Proc
+                  | () -> Proc?
+
+      def self.info: () { () [self: instance] -> Hash[untyped, untyped]? } -> Proc
+                   | () -> Proc?
+
+      def self.extra: () { () [self: instance] -> Hash[untyped, untyped]? } -> Proc
+                    | () -> Proc?
+
+      def self.credentials: () { () [self: instance] -> Hash[untyped, untyped]? } -> Proc
+                          | () -> Proc?
+
+      def options: () -> (Strategy::Options & _Options)
+
+      # Set by the callback phase, which runs before the fetcher blocks that
+      # read it.
+      attr_reader access_token: ::OAuth::AccessToken
+
+      @access_token: ::OAuth::AccessToken
+
+      def consumer: () -> ::OAuth::Consumer
+
+      def request_phase: () -> rack_response
+
+      def callback_phase: () -> rack_response
+
+      # The verifier when the provider confirmed the callback URL (OAuth
+      # 1.0a), or the callback URL when it didn't (OAuth 1.0).
+      def access_token_options: (Hash[String, untyped] provider_session) -> ({ oauth_verifier: String? } | { oauth_callback: String })
+    end
+  end
+end

metadata

@@ -1,36 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-oauth
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
+- Erik Berlin
 - Michael Bleigh
-- Erik Michaels-Ober
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-27 00:00:00.000000000 Z
+date: 1980-01-02 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'
-    - - "<"
+        version: '2.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+        version: 2.3.1
+- !ruby/object:Gem::Dependency
+  name: cgi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -67,31 +80,24 @@ dependencies:
         version: '4'
 description: A generic OAuth (1.0/1.0a) strategy for OmniAuth.
 email:
-- michael@intridea.com
 - sferik@gmail.com
+- michael@intridea.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
-- Gemfile
 - LICENSE.md
 - README.md
-- Rakefile
 - lib/omniauth-oauth.rb
 - lib/omniauth-oauth/version.rb
 - lib/omniauth/strategies/oauth.rb
-- omniauth-oauth.gemspec
-- spec/helper.rb
-- spec/omniauth/strategies/oauth_spec.rb
-homepage: https://github.com/intridea/omniauth-oauth
+- sig/omniauth-oauth.rbs
+homepage: https://github.com/omniauth/omniauth-oauth
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  changelog_uri: https://github.com/omniauth/omniauth-oauth/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -99,17 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A generic OAuth (1.0/1.0a) strategy for OmniAuth.
-test_files:
-- spec/helper.rb
-- spec/omniauth/strategies/oauth_spec.rb
+test_files: []

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.rspec

@@ -1,2 +0,0 @@
---color
---format=progress

data/.rubocop.yml

@@ -1,55 +0,0 @@
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/BlockNesting:
-  Max: 2
-
-Metrics/LineLength:
-  AllowURI: true
-  Enabled: false
-
-Metrics/MethodLength:
-  CountComments: false
-  Max: 10
-
-Metrics/ParameterLists:
-  Max: 4
-  CountKeywordArgs: true
-
-Style/AccessModifierIndentation:
-  EnforcedStyle: outdent
-
-Style/CollectionMethods:
-  PreferredMethods:
-    map:      'collect'
-    reduce:   'inject'
-    find:     'detect'
-    find_all: 'select'
-
-Style/Documentation:
-  Enabled: false
-
-Style/DotPosition:
-  EnforcedStyle: trailing
-
-Style/DoubleNegation:
-  Enabled: false
-
-Style/FileName:
-  Exclude:
-    - 'lib/omniauth-oauth.rb'
-
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
-Style/Lambda:
-  Enabled: false
-
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Style/TrailingComma:
-  EnforcedStyleForMultiline: 'comma'

data/.travis.yml

@@ -1,24 +0,0 @@
-before_install: gem install bundler
-env:
-  global:
-    - JRUBY_OPTS="$JRUBY_OPTS --debug"
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-  - rbx-2
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
-    - rvm: rbx-2 # TODO: Fix
-  fast_finish: true
-sudo: false

data/Gemfile

@@ -1,13 +0,0 @@
-source "http://rubygems.org"
-
-gemspec
-
-gem "rake"
-
-group :test do
-  gem "rack-test"
-  gem "rspec", "~> 3.2"
-  gem "rubocop", ">= 0.30", :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22]
-  gem "simplecov"
-  gem "webmock"
-end

data/Rakefile

@@ -1,16 +0,0 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new
-
-begin
-  require "rubocop/rake_task"
-  RuboCop::RakeTask.new
-rescue LoadError
-  task :rubocop do
-    $stderr.puts "Rubocop is disabled"
-  end
-end
-
-task :default => [:spec, :rubocop]

data/omniauth-oauth.gemspec

@@ -1,21 +0,0 @@
-require File.expand_path("../lib/omniauth-oauth/version", __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Michael Bleigh", "Erik Michaels-Ober"]
-  gem.email         = ["michael@intridea.com", "sferik@gmail.com"]
-  gem.description   = "A generic OAuth (1.0/1.0a) strategy for OmniAuth."
-  gem.summary       = gem.description
-  gem.homepage      = "https://github.com/intridea/omniauth-oauth"
-  gem.license       = "MIT"
-
-  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")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "omniauth-oauth"
-  gem.require_paths = ["lib"]
-  gem.version       = OmniAuth::OAuth::VERSION
-end

data/spec/helper.rb

@@ -1,21 +0,0 @@
-$LOAD_PATH.unshift File.expand_path("..", __FILE__)
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-require "simplecov"
-SimpleCov.start do
-  minimum_coverage(89.79)
-end
-require "rspec"
-require "rack/test"
-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
-  config.extend OmniAuth::Test::StrategyMacros, :type => :strategy
-end
-
-OmniAuth.config.logger = Logger.new("/dev/null")

data/spec/omniauth/strategies/oauth_spec.rb

@@ -1,186 +0,0 @@
-require "helper"
-
-describe "OmniAuth::Strategies::OAuth" do
-  class MyOAuthProvider < OmniAuth::Strategies::OAuth
-    uid { access_token.token }
-    info { {"name" => access_token.token} }
-  end
-
-  def app
-    Rack::Builder.new do
-      use OmniAuth::Test::PhonySession
-      use OmniAuth::Builder do
-        provider MyOAuthProvider, "abc", "def", :client_options => {:site => "https://api.example.org"}, :name => "example.org"
-        provider MyOAuthProvider, "abc", "def", :client_options => {:site => "https://api.example.org"}, :authorize_params => {:abc => "def"}, :name => "example.org_with_authorize_params"
-        provider MyOAuthProvider, "abc", "def", :client_options => {:site => "https://api.example.org"}, :request_params => {:scope => "http://foobar.example.org"}, :name => "example.org_with_request_params"
-      end
-      run lambda { |env| [404, {"Content-Type" => "text/plain"}, [env.key?("omniauth.auth").to_s]] }
-    end.to_app
-  end
-
-  def session
-    last_request.env["rack.session"]
-  end
-
-  before do
-    stub_request(:post, "https://api.example.org/oauth/request_token").
-      to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret&oauth_callback_confirmed=true")
-  end
-
-  it "should add a camelization for itself" do
-    expect(OmniAuth::Utils.camelize("oauth")).to eq("OAuth")
-  end
-
-  describe "/auth/{name}" do
-    context "successful" do
-      before do
-        post "/auth/example.org"
-      end
-
-      it "should redirect to authorize_url" do
-        expect(last_response).to be_redirect
-        expect(last_response.headers["Location"]).to eq("https://api.example.org/oauth/authorize?oauth_token=yourtoken")
-      end
-
-      it "should redirect to authorize_url with authorize_params when set" do
-        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",
-          "https://api.example.org/oauth/authorize?oauth_token=yourtoken&abc=def",
-        ]).to be_include(last_response.headers["Location"])
-      end
-
-      it "should set appropriate session variables" do
-        expect(session["oauth"]).to eq("example.org" => {"callback_confirmed" => true, "request_token" => "yourtoken", "request_secret" => "yoursecret"})
-      end
-
-      it "should pass request_params to get_request_token" do
-        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
-    end
-
-    context "unsuccessful" do
-      before do
-        stub_request(:post, "https://api.example.org/oauth/request_token").
-          to_raise(::Net::HTTPFatalError.new('502 "Bad Gateway"', nil))
-        post "/auth/example.org"
-      end
-
-      it "should call fail! with :service_unavailable" do
-        expect(last_request.env["omniauth.error"]).to be_kind_of(::Net::HTTPFatalError)
-        last_request.env["omniauth.error.type"] = :service_unavailable
-      end
-
-      context "SSL failure" 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"))
-          post "/auth/example.org"
-        end
-
-        it "should call fail! with :service_unavailable" do
-          expect(last_request.env["omniauth.error"]).to be_kind_of(::OpenSSL::SSL::SSLError)
-          last_request.env["omniauth.error.type"] = :service_unavailable
-        end
-      end
-    end
-  end
-
-  describe "/auth/{name}/callback" do
-    before do
-      stub_request(:post, "https://api.example.org/oauth/access_token").
-        to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret")
-      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
-
-    context "bad gateway (or any 5xx) for access_token" do
-      before do
-        stub_request(:post, "https://api.example.org/oauth/access_token")  .
-          to_raise(::Net::HTTPFatalError.new('502 "Bad Gateway"', nil))
-        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 call fail! with :service_unavailable" do
-        expect(last_request.env["omniauth.error"]).to be_kind_of(::Net::HTTPFatalError)
-        last_request.env["omniauth.error.type"] = :service_unavailable
-      end
-    end
-
-    context "SSL failure" do
-      before do
-        stub_request(:post, "https://api.example.org/oauth/access_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/callback", {:oauth_verifier => "dudeman"}, "rack.session" => {"oauth" => {"example.org" => {"callback_confirmed" => true, "request_token" => "yourtoken", "request_secret" => "yoursecret"}}}
-      end
-
-      it "should call fail! with :service_unavailable" do
-        expect(last_request.env["omniauth.error"]).to be_kind_of(::OpenSSL::SSL::SSLError)
-        last_request.env["omniauth.error.type"] = :service_unavailable
-      end
-    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").
-        to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret")
-      get "/auth/example.org/callback", {:oauth_verifier => "dudeman"}, "rack.session" => {}
-    end
-
-    it "should call fail! with :session_expired" do
-      expect(last_request.env["omniauth.error"]).to be_kind_of(::OmniAuth::NoSessionError)
-      last_request.env["omniauth.error.type"] = :session_expired
-    end
-  end
-end