oa-openid 0.2.6 → 0.3.0.rc3

data/Gemfile

@@ -1,5 +1,10 @@
+require File.expand_path('../lib/omniauth/version', __FILE__)
+
 source 'http://rubygems.org'
 
+gem 'oa-core', OmniAuth::Version::STRING, :path => '../oa-core'
+gem 'oa-oauth', OmniAuth::Version::STRING, :path => '../oa-oauth'
+
 platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'
 end

data/lib/omniauth/openid.rb

@@ -55,6 +55,7 @@ module OmniAuth
   module Strategies
     autoload :OpenID, 'omniauth/strategies/open_id'
     autoload :GoogleApps, 'omniauth/strategies/google_apps'
+    autoload :GoogleHybrid, 'omniauth/strategies/google_hybrid'
     autoload :Steam, 'omniauth/strategies/steam'
   end
 end

data/lib/omniauth/strategies/google_hybrid.rb

@@ -0,0 +1,55 @@
+require 'rack/openid'
+require 'omniauth/openid'
+require 'oauth'
+
+module OmniAuth
+  module Strategies
+    # OmniAuth strategy for connecting to Google via the OpenID+OAuth Hybrid Protocol.
+    # For help, check the example implementation on https://github.com/boyvanamstel/Google-Hybrid-Omniauth-implementation
+    class GoogleHybrid < OmniAuth::Strategies::OpenID
+
+      protected
+
+      def dummy_app
+        lambda{|env| [401, {"WWW-Authenticate" => Rack::OpenID.build_header(
+          :identifier => identifier,
+          :return_to => callback_url,
+          :required => @options[:required],
+          :optional => @options[:optional],
+          :"oauth[consumer]" => @options[:consumer_key],
+          :"oauth[scope]" => @options[:scope], 
+          :method => 'post'
+        )}, []]}
+      end
+
+      def auth_hash
+        # Based on https://gist.github.com/569650 by nov
+        oauth_response = ::OpenID::OAuth::Response.from_success_response(@openid_response)
+
+        consumer = ::OAuth::Consumer.new(
+          @options[:consumer_key],
+          @options[:consumer_secret],
+          :site => 'https://www.google.com',
+          :access_token_path  => '/accounts/OAuthGetAccessToken'
+        )
+        request_token = ::OAuth::RequestToken.new(
+          consumer,
+          oauth_response.request_token,
+          "" # OAuth request token secret is also blank in OpenID/OAuth Hybrid
+        )
+        @access_token = request_token.get_access_token
+        
+        OmniAuth::Utils.deep_merge(super(), {
+          'uid' => @openid_response.display_identifier,
+          'user_info' => user_info(@openid_response),
+          'credentials' => {
+            'scope' => @options[:scope], 
+            'token' => @access_token.token,
+            'secret' => @access_token.secret
+          }
+        })
+      end
+    end
+  end
+end
+

data/lib/omniauth/strategies/open_id.rb

@@ -56,9 +56,11 @@ module OmniAuth
       end
 
       def identifier
-        options[:identifier] || request[IDENTIFIER_URL_PARAMETER]
+        i = options[:identifier] || request[IDENTIFIER_URL_PARAMETER]
+        i = nil if i == ''
+        i
       end
-
+      
       def request_phase
         identifier ? start : get_identifier
       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-openid.gemspec

@@ -1,28 +1,26 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
-  gem.add_runtime_dependency 'rack-openid', '~> 1.3.1'
-  gem.add_runtime_dependency 'ruby-openid-apps-discovery', '~> 1.2.0'
-  gem.add_development_dependency 'maruku', '~> 0.6'
+  gem.add_dependency 'oa-core', OmniAuth::Version::STRING
+  gem.add_dependency 'rack-openid', '~> 1.3.1'
+  gem.add_dependency 'ruby-openid-apps-discovery', '~> 1.2.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 'webmock', '~> 1.7'
   gem.add_development_dependency 'yard', '~> 0.7'
-  gem.add_development_dependency 'ZenTest', '~> 4.5'
-  gem.name = 'oa-openid'
-  gem.version = OmniAuth::Version::STRING
+  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
   gem.description = %q{OpenID 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-openid'
   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/google_hybrid_spec.rb

@@ -0,0 +1,63 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'rack/openid'
+require 'omniauth/openid'
+require 'oauth'
+
+describe "OmniAuth::Strategies::GoogleHybrid" do
+
+  def app
+    Rack::Builder.new {
+      use OmniAuth::Test::PhonySession
+      use OmniAuth::Builder do
+        provider :google_hybrid, nil,
+            :name => 'google_hybrid',
+            :identifier => 'https://www.google.com/accounts/o8/id', 
+            :scope => ["https://www.google.com/m8/feeds/", "https://mail.google.com/mail/feed/atom/"], 
+            :consumer_key => '[your key here]',
+            :consumer_secret => '[your secret here]'
+      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
+
+  def expired_query_string
+    'openid=consumer&janrain_nonce=2011-07-21T20%3A14%3A56ZJ8LP3T&openid.assoc_handle=%7BHMAC-SHA1%7D%7B4e284c39%7D%7B9nvQeg%3D%3D%7D&openid.claimed_id=http%3A%2F%2Flocalhost%3A1123%2Fjohn.doe%3Fopenid.success%3Dtrue&openid.identity=http%3A%2F%2Flocalhost%3A1123%2Fjohn.doe%3Fopenid.success%3Dtrue&openid.mode=id_res&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&openid.op_endpoint=http%3A%2F%2Flocalhost%3A1123%2Fserver%2F%3Fopenid.success%3Dtrue&openid.response_nonce=2011-07-21T20%3A14%3A56Zf9gC8S&openid.return_to=http%3A%2F%2Flocalhost%3A8888%2FDevelopment%2FWordpress%2Fwp_openid%2F%3Fopenid%3Dconsumer%26janrain_nonce%3D2011-07-21T20%253A14%253A56ZJ8LP3T&openid.sig=GufV13SUJt8VgmSZ92jGZCFBEvQ%3D&openid.signed=assoc_handle%2Cclaimed_id%2Cidentity%2Cmode%2Cns%2Cop_endpoint%2Cresponse_nonce%2Creturn_to%2Csigned'
+  end
+
+  describe 'followed by /auth/google_hybrid/callback' do
+    context 'successful' do
+      #before do
+      #  @identifier_url = 'https://www.google.com/accounts/o8/id'
+      #  # TODO: change this mock to actually return some sort of OpenID response
+      #  stub_request(:get, @identifier_url)
+      #  get '/auth/google_hybrid/callback'
+      #end
+
+      it "should set provider to google_hybrid"
+      it "should create auth_hash based on sreg"
+      it "should create auth_hash based on ax"
+
+      it "should exchange OAuth request token for access token"
+
+      #it 'should call through to the master app' do
+      #  last_response.body.should == 'true'
+      #end
+    end
+
+    context 'unsuccessful' do
+      describe 'returning with expired credentials' do
+        before do
+          get '/auth/google_hybrid/callback?' + expired_query_string
+        end
+        it 'it should redirect to invalid credentials' do
+          last_response.should be_redirect 
+          last_response.headers['Location'].should =~ %r{invalid_credentials}
+        end
+      end
+    end
+  end
+end

data/spec/omniauth/strategies/open_id_spec.rb

@@ -1,71 +1,87 @@
 require File.expand_path('../../../spec_helper', __FILE__)
+require 'rack/openid'
+require 'omniauth/openid'
 
-describe OmniAuth::Strategies::OpenID do
+describe OmniAuth::Strategies::OpenID, :type => :strategy do
 
-end
+  include OmniAuth::Test::StrategyTestCase
+
+  def strategy
+    [OmniAuth::Strategies::OpenID]
+  end
+
+  def expired_query_string
+    'openid=consumer&janrain_nonce=2011-07-21T20%3A14%3A56ZJ8LP3T&openid.assoc_handle=%7BHMAC-SHA1%7D%7B4e284c39%7D%7B9nvQeg%3D%3D%7D&openid.claimed_id=http%3A%2F%2Flocalhost%3A1123%2Fjohn.doe%3Fopenid.success%3Dtrue&openid.identity=http%3A%2F%2Flocalhost%3A1123%2Fjohn.doe%3Fopenid.success%3Dtrue&openid.mode=id_res&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&openid.op_endpoint=http%3A%2F%2Flocalhost%3A1123%2Fserver%2F%3Fopenid.success%3Dtrue&openid.response_nonce=2011-07-21T20%3A14%3A56Zf9gC8S&openid.return_to=http%3A%2F%2Flocalhost%3A8888%2FDevelopment%2FWordpress%2Fwp_openid%2F%3Fopenid%3Dconsumer%26janrain_nonce%3D2011-07-21T20%253A14%253A56ZJ8LP3T&openid.sig=GufV13SUJt8VgmSZ92jGZCFBEvQ%3D&openid.signed=assoc_handle%2Cclaimed_id%2Cidentity%2Cmode%2Cns%2Cop_endpoint%2Cresponse_nonce%2Creturn_to%2Csigned'
+  end
+
+  describe '/auth/open_id without an identifier URL' do
+    before do
+      get '/auth/open_id'
+    end
+
+    it 'should respond with OK' do
+      last_response.should be_ok
+    end
+
+    it 'should respond with HTML' do
+      last_response.content_type.should == 'text/html'
+    end
+
+    it 'should render an identifier URL input' do
+      last_response.body.should =~ %r{<input[^>]*#{OmniAuth::Strategies::OpenID::IDENTIFIER_URL_PARAMETER}}
+    end
+  end
 
-# require File.dirname(__FILE__) + '/../../spec_helper'
-#
-# describe OmniAuth::Strategies::OpenID, :type => :strategy do
-#
-#   include OmniAuth::Test::StrategyTestCase
-#
-#   def strategy
-#     [OmniAuth::Strategies::OpenID]
-#   end
-#
-#   describe '/auth/open_id without an identifier URL' do
-#     before do
-#       get '/auth/open_id'
-#     end
-#
-#     it 'should respond with OK' do
-#       last_response.should be_ok
-#     end
-#
-#     it 'should respond with HTML' do
-#       last_response.content_type.should == 'text/html'
-#     end
-#
-#     it 'should render an identifier URL input' do
-#       last_response.body.should =~ %r{<input[^>]*#{OmniAuth::Strategies::OpenID::IDENTIFIER_URL_PARAMETER}}
-#     end
-#   end
-#
-#   describe '/auth/open_id with an identifier URL' do
-#     before do
-#       @identifier_url = 'http://me.example.org'
-#       # TODO: change this mock to actually return some sort of OpenID response
-#       stub_request(:get, @identifier_url)
-#       get '/auth/open_id?openid_url=' + @identifier_url
-#     end
-#
-#     it 'should redirect to the OpenID identity URL' do
-#       last_response.should be_redirect
-#       last_response.headers['Location'].should =~ %r{^#{@identifier_url}.*}
-#     end
-#
-#     it 'should tell the OpenID server to return to the callback URL' do
-#       return_to = CGI.escape(last_request.url + '/callback')
-#       last_response.headers['Location'].should =~ %r{[\?&]openid.return_to=#{return_to}}
-#     end
-#
-#   end
-#
-#   describe 'followed by /auth/open_id/callback' do
-#     before do
-#       @identifier_url = 'http://me.example.org'
-#       # TODO: change this mock to actually return some sort of OpenID response
-#       stub_request(:get, @identifier_url)
-#       get '/auth/open_id/callback'
-#     end
-#
-#     sets_an_auth_hash
-#     sets_provider_to 'open_id'
-#     sets_uid_to 'http://me.example.org'
-#
-#     it 'should call through to the master app' do
-#       last_response.body.should == 'true'
-#     end
-#   end
-# end
+  #describe '/auth/open_id with an identifier URL' do
+  #  context 'successful' do
+  #    before do
+  #      @identifier_url = 'http://me.example.org'
+  #      # TODO: change this mock to actually return some sort of OpenID response
+  #      stub_request(:get, @identifier_url)
+  #      get '/auth/open_id?openid_url=' + @identifier_url
+  #    end
+  #  
+  #    it 'should redirect to the OpenID identity URL' do
+  #      last_response.should be_redirect
+  #      last_response.headers['Location'].should =~ %r{^#{@identifier_url}.*}
+  #    end
+  #  
+  #    it 'should tell the OpenID server to return to the callback URL' do
+  #      return_to = CGI.escape(last_request.url + '/callback')
+  #      last_response.headers['Location'].should =~ %r{[\?&]openid.return_to=#{return_to}}
+  #    end
+  #  end 
+  #end
+
+  describe 'followed by /auth/open_id/callback' do
+    context 'successful' do
+      #before do
+      #  @identifier_url = 'http://me.example.org'
+      #  # TODO: change this mock to actually return some sort of OpenID response
+      #  stub_request(:get, @identifier_url)
+      #  get '/auth/open_id/callback'
+      #end
+
+      it "should set provider to open_id"
+      it "should create auth_hash based on sreg"
+      it "should create auth_hash based on ax"
+
+      #it 'should call through to the master app' do
+      #  last_response.body.should == 'true'
+      #end
+    end
+
+    context 'unsuccessful' do
+      describe 'returning with expired credentials' do
+        before do
+          get '/auth/open_id/callback?' + expired_query_string
+        end
+        it 'it should redirect to invalid credentials' do
+          last_response.should be_redirect 
+          last_response.headers['Location'].should =~ %r{invalid_credentials}
+        end
+      end
+    end
+  end
+
+end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: oa-openid
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.6
+  hash: 15424035
+  prerelease: 6
+  segments: 
+  - 0
+  - 3
+  - 0
+  - rc
+  - 3
+  version: 0.3.0.rc3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -11,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 Z
+date: 2011-09-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oa-core
@@ -21,7 +28,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.6
+        hash: 15424035
+        segments: 
+        - 0
+        - 3
+        - 0
+        - rc
+        - 3
+        version: 0.3.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,6 +46,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
   type: :runtime
   version_requirements: *id002
@@ -43,40 +62,57 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: maruku
+  name: rack-test
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.5"
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rdiscount
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -87,6 +123,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
         version: "2.5"
   type: :development
   version_requirements: *id007
@@ -98,6 +138,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 4
         version: "0.4"
   type: :development
   version_requirements: *id008
@@ -109,7 +153,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.6"
+        hash: 1
+        segments: 
+        - 1
+        - 7
+        version: "1.7"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -120,20 +168,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
         version: "0.7"
   type: :development
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: ZenTest
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "4.5"
-  type: :development
-  version_requirements: *id011
 description: OpenID strategies for OmniAuth.
 email: 
 - michael@intridea.com
@@ -156,10 +197,12 @@ files:
 - lib/omniauth/openid.rb
 - lib/omniauth/openid/gapps.rb
 - lib/omniauth/strategies/google_apps.rb
+- lib/omniauth/strategies/google_hybrid.rb
 - lib/omniauth/strategies/open_id.rb
 - lib/omniauth/strategies/steam.rb
 - lib/omniauth/version.rb
 - oa-openid.gemspec
+- spec/omniauth/strategies/google_hybrid_spec.rb
 - spec/omniauth/strategies/open_id_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/intridea/omniauth
@@ -175,20 +218,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: 1.3.6
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: OpenID strategies for OmniAuth.
 test_files: 
+- spec/omniauth/strategies/google_hybrid_spec.rb
 - spec/omniauth/strategies/open_id_spec.rb
 - spec/spec_helper.rb