oa-oauth 0.2.6 → 0.3.0.rc3

data/lib/omniauth/strategies/oauth2/we_pay.rb

@@ -0,0 +1,48 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # OAuth 2.0 based authentication with WePay. In order to
+    # sign up for an application, you need to [register an application](https://wepay.com/developer/register)
+    # and provide the proper credentials to this middleware.
+    class WePay < OmniAuth::Strategies::OAuth2
+      # @param [Rack Application] app standard middleware application argument
+      # @param [String] client_id the application ID for your client
+      # @param [String] client_secret the application secret
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
+        client_options = {
+          :authorize_url => 'https://www.wepay.com/session/authorize',
+          :token_url => 'https://wepayapi.com/v1/oauth2/token',
+        }
+        super(app, :we_pay, client_id, client_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['user_id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_data,
+            },
+          }
+        )
+      end
+
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get('/v1/user'))['result']
+      end
+
+      def user_info
+        {
+          'email' => user_data['email'],
+          'name' => "#{user_data['firstName']} #{user_data['lastName']}".strip,
+          'first_name' => user_data['firstName'],
+          'last_name' => user_data['lastName'],
+          'image' => user_data['picture'],
+        }
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/xauth.rb

@@ -4,12 +4,12 @@ require 'multi_json'
 module OmniAuth
   module Strategies
     class XAuth
-      include OmniAuth::Strategy
-
       attr_reader :name
       attr_accessor :consumer_key, :consumer_secret, :consumer_options
 
-      def initialize(app, name, consumer_key = nil, consumer_secret = nil, consumer_options = {}, options = {}, &block)
+      include OmniAuth::Strategy
+
+      def initialize(app, name, consumer_key=nil, consumer_secret=nil, consumer_options={}, options={}, &block)
         self.consumer_key = consumer_key
         self.consumer_secret = consumer_secret
         self.consumer_options = consumer_options

data/lib/omniauth/strategies/{instapaper.rb → xauth/instapaper.rb}

@@ -4,18 +4,13 @@ require 'multi_json'
 module OmniAuth
   module Strategies
     class Instapaper < OmniAuth::Strategies::XAuth
-
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
         client_options = {
-          :title => 'Instapaper',
-          :site => 'https://www.instapaper.com',
-          :access_token_path => '/api/1/oauth/access_token'
+          :token_url => 'https://www.instapaper.com/api/1/oauth/access_token',
         }
         super(app, :instapaper, consumer_key, consumer_secret, client_options, options, &block)
       end
 
-      protected
-
       def user_data
         @data ||= MultiJson.decode(@access_token.get('/api/1/account/verify_credentials').body)[0]
       end
@@ -23,15 +18,17 @@ module OmniAuth
       def user_info
         {
           'nickname' => user_data['username'],
-          'name' => user_data['username']
+          'name' => user_data['username'],
         }
       end
 
       def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_data['user_id'],
-          'user_info' => user_info
-        })
+        OmniAuth::Utils.deep_merge(super,
+          {
+            'uid' => user_data['user_id'],
+            'user_info' => user_info,
+          }
+        )
       end
 
     end

data/lib/omniauth/version.rb

@@ -4,13 +4,13 @@ module OmniAuth
       MAJOR = 0
     end
     unless defined?(::OmniAuth::Version::MINOR)
-      MINOR = 2
+      MINOR = 3
     end
     unless defined?(::OmniAuth::Version::PATCH)
-      PATCH = 6
+      PATCH = 0
     end
     unless defined?(::OmniAuth::Version::PRE)
-      PRE   = nil
+      PRE   = "rc3"
     end
     unless defined?(::OmniAuth::Version::STRING)
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/oa-oauth.gemspec

@@ -1,32 +1,31 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'faraday', '~> 0.6.1'
-  gem.add_runtime_dependency 'multi_json', '~> 1.0.0'
-  gem.add_runtime_dependency 'multi_xml', '~> 0.2.2'
-  gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
-  gem.add_runtime_dependency 'oauth', '~> 0.4.0'
-  gem.add_runtime_dependency 'oauth2', '~> 0.4.1'
-  gem.add_development_dependency 'evernote', '~> 0.9'
-  gem.add_development_dependency 'maruku', '~> 0.6'
+  gem.add_dependency 'faraday', '~> 0.7.3'
+  gem.add_dependency 'multi_json', '~> 1.0.0'
+  gem.add_dependency 'multi_xml', '~> 0.3.0'
+  gem.add_dependency 'oa-core', OmniAuth::Version::STRING
+  gem.add_dependency 'oauth', '~> 0.4.0'
+  gem.add_dependency 'oauth2', '~> 0.5.0'
+  gem.add_development_dependency 'evernote', '~> 1.0'
   gem.add_development_dependency 'rack-test', '~> 0.5'
   gem.add_development_dependency 'rake', '~> 0.8'
+  gem.add_development_dependency 'rdiscount', '~> 1.6'
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'simplecov', '~> 0.4'
-  gem.add_development_dependency 'webmock', '~> 1.6'
+  gem.add_development_dependency 'vcr', '~> 1.10'
+  gem.add_development_dependency 'webmock', '~> 1.7'
   gem.add_development_dependency 'yard', '~> 0.7'
-  gem.add_development_dependency 'ZenTest', '~> 4.5'
-  gem.name = 'oa-oauth'
-  gem.version = OmniAuth::Version::STRING
+  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
   gem.description = %q{OAuth strategies for OmniAuth.}
-  gem.summary = gem.description
   gem.email = ['michael@intridea.com', 'sferik@gmail.com']
-  gem.homepage = 'http://github.com/intridea/omniauth'
-  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
-  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.homepage = 'http://github.com/intridea/omniauth'
+  gem.name = 'oa-oauth'
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
+  gem.summary = gem.description
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.version = OmniAuth::Version::STRING
 end

data/spec/omniauth/strategies/{bitly_spec.rb → google_oauth2_spec.rb}

@@ -1,5 +1,5 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
-describe OmniAuth::Strategies::Bitly do
+describe OmniAuth::Strategies::GoogleOAuth2 do
   it_should_behave_like "an oauth2 strategy"
 end

data/spec/omniauth/strategies/{dopplr_spec.rb → oauth/dopplr_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Dopplr do
   it_should_behave_like "an oauth strategy"

data/spec/omniauth/strategies/{douban_spec.rb → oauth/douban_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Douban do
   it_should_behave_like 'an oauth strategy'

data/spec/omniauth/strategies/oauth/dropbox_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe OmniAuth::Strategies::Dropbox do
+  it_should_behave_like "an oauth strategy"
+end

data/spec/omniauth/strategies/{evernote_spec.rb → oauth/evernote_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Evernote do
   it_should_behave_like "an oauth strategy"

data/spec/omniauth/strategies/oauth/flattr_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe OmniAuth::Strategies::Flattr do
+  it_should_behave_like 'an oauth strategy'
+end

data/spec/omniauth/strategies/oauth/flickr_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe OmniAuth::Strategies::Flickr do
+  it_should_behave_like "an oauth strategy"
+end
+

data/spec/omniauth/strategies/{goodreads_spec.rb → oauth/goodreads_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Goodreads do
   it_should_behave_like 'an oauth strategy'

data/spec/omniauth/strategies/oauth/google_health_sandbox_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe OmniAuth::Strategies::GoogleHealthSandbox do
+  it_should_behave_like 'an oauth strategy'
+end

data/spec/omniauth/strategies/oauth/google_health_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe OmniAuth::Strategies::GoogleHealth do
+  it_should_behave_like 'an oauth strategy'
+end

data/spec/omniauth/strategies/{google_spec.rb → oauth/google_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Google do
   it_should_behave_like 'an oauth strategy'

data/spec/omniauth/strategies/{hyves_spec.rb → oauth/hyves_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Hyves do
   it_should_behave_like "an oauth strategy"

data/spec/omniauth/strategies/{identica_spec.rb → oauth/identica_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Identica do
   it_should_behave_like 'an oauth strategy'

data/spec/omniauth/strategies/{linked_in_spec.rb → oauth/linked_in_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe OmniAuth::Strategies::LinkedIn do
   it_should_behave_like "an oauth strategy"

data/spec/omniauth/strategies/{meetup_spec.rb → oauth/meetup_spec.rb}

@@ -1,13 +1,13 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Meetup do
   it_should_behave_like 'an oauth strategy'
-  it 'should use the authenticate (sign in) path by default' do
+  it 'should use the authenticate (sign in) URL by default' do
     s = strategy_class.new(app, 'abc', 'def')
     s.consumer.options[:authorize_path].should == 'http://www.meetup.com/authenticate'
   end
 
-  it 'should use the authorize path if :sign_in is false' do
+  it 'should use the authorize URL if :sign_in is false' do
     s = strategy_class.new(app, 'abc', 'def', :sign_in => false)
     s.consumer.options[:authorize_path].should == 'http://www.meetup.com/authorize'
   end

data/spec/omniauth/strategies/{miso_spec.rb → oauth/miso_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Miso do
   it_should_behave_like 'an oauth strategy'

data/spec/omniauth/strategies/{netflix_spec.rb → oauth/netflix_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Netflix do
   it_should_behave_like "an oauth strategy"

data/spec/omniauth/strategies/oauth/oauth_spec.rb

@@ -0,0 +1,131 @@
+require 'spec_helper'
+
+describe "OmniAuth::Strategies::OAuth" do
+
+  def app
+    Rack::Builder.new {
+      use OmniAuth::Test::PhonySession
+      use OmniAuth::Builder do
+        provider :oauth, 'example.org', 'abc', 'def', :site => 'https://api.example.org'
+        provider :oauth, 'example.org_with_authorize_params', 'abc', 'def', { :site => 'https://api.example.org' }, :authorize_params => {:abc => 'def'}
+      end
+      run lambda { |env| [404, {'Content-Type' => 'text/plain'}, [env.key?('omniauth.auth').to_s]] }
+    }.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
+
+  describe '/auth/{name}' do
+    context 'successful' do
+      before do
+        get '/auth/example.org'
+      end
+      it 'should redirect to authorize_url' do
+        last_response.should be_redirect
+        last_response.headers['Location'].should == 'https://api.example.org/oauth/authorize?oauth_token=yourtoken'
+      end
+
+      it 'should redirect to authorize_url with authorize_params when set' do
+        get '/auth/example.org_with_authorize_params'
+        last_response.should be_redirect
+        [
+          'https://api.example.org/oauth/authorize?abc=def&oauth_token=yourtoken',
+          'https://api.example.org/oauth/authorize?oauth_token=yourtoken&abc=def'
+        ].should be_include(last_response.headers['Location'])
+      end
+
+      it 'should set appropriate session variables' do
+        session['oauth'].should == {"example.org" => {'callback_confirmed' => true, 'request_token' => 'yourtoken', 'request_secret' => 'yoursecret'}}
+      end
+    end
+
+    context 'unsuccessful' do
+      before do
+        stub_request(:post, 'https://api.example.org/oauth/request_token').
+           to_raise(::Net::HTTPFatalError.new(%Q{502 "Bad Gateway"}, nil))
+        get '/auth/example.org'
+      end
+
+      it 'should call fail! with :service_unavailable' do
+        last_request.env['omniauth.error'].should 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"))
+          get '/auth/example.org'
+        end
+
+        it 'should call fail! with :service_unavailable' do
+          last_request.env['omniauth.error'].should 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
+      last_request.env['omniauth.auth']['provider'].should == 'example.org'
+      last_request.env['omniauth.auth']['extra']['access_token'].should be_kind_of(OAuth::AccessToken)
+    end
+
+    it 'should call through to the master app' do
+      last_response.body.should == '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(%Q{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
+        last_request.env['omniauth.error'].should 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
+        last_request.env['omniauth.error'].should be_kind_of(::OpenSSL::SSL::SSLError)
+        last_request.env['omniauth.error.type'] = :service_unavailable
+      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
+      last_request.env['omniauth.error'].should be_kind_of(::OmniAuth::NoSessionError)
+      last_request.env['omniauth.error.type'] = :session_expired
+    end
+  end
+end