oa-openid 0.0.2 → 0.0.4

data/CHANGELOG.rdoc

@@ -0,0 +1,3 @@
+== 0.0.3
+
+* Display a form if no identifier is provided at /auth/open_id

data/README.rdoc

@@ -0,0 +1,37 @@
+= OmniAuth::OpenID
+
+OpenID strategies for the OmniAuth gem.
+
+== Installation
+
+To get just OpenID functionality:
+
+    gem install oa-openid
+    
+For the full auth suite:
+
+    gem install omniauth
+    
+== Stand-Alone Example
+
+Use the strategy as a middleware in your application:
+
+    require 'omniauth/openid'
+    require 'openid/store/filesystem'
+    
+    use OmniAuth::Strategies::OpenID, OpenID::Store::Filesystem.new('/tmp')
+    
+Then simply direct users to '/auth/open_id' to prompt them for their OpenID identifier. You may also pre-set the identifier by passing an <tt>identifier</tt> parameter to the URL (Example: <tt>/auth/open_id?identifier=google.com</tt>).
+
+== OmniAuth Builder
+
+If OpenID is one of several authentication strategies, use the OmniAuth Builder:
+
+    require 'omniauth/openid'
+    require 'omniauth/basic'  # for Campfire
+    require 'openid/store/filesystem'
+    
+    use OmniAuth::Builder do
+      provider :open_id, OpenID::Store::Filesystem.new('/tmp')
+      provider :campfire
+    end

data/lib/omniauth/openid.rb

@@ -1,2 +1,8 @@
 require 'omniauth/core'
-require 'omniauth/strategies/open_id'
+
+module OmniAuth
+  module Strategies
+    autoload :OpenID, 'omniauth/strategies/open_id'
+    autoload :GoogleApps, 'omniauth/strategies/google_apps'
+  end
+end

data/lib/omniauth/strategies/google_apps.rb

@@ -0,0 +1,16 @@
+require 'omniauth/openid'
+
+module OmniAuth
+  module Strategies
+    class GoogleApps < OmniAuth::Strategies::OpenID
+      def initialize(app, store = nil, options = {})
+        options[:name] ||= 'google_apps'
+        super(app, store, options)
+      end
+      
+      def identifier
+        options[:domain] || request['domain']
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/open_id.rb

@@ -1,10 +1,18 @@
 require 'rack/openid'
+require 'gapps_openid'
+require 'omniauth/openid'
 
 module OmniAuth
   module Strategies
     class OpenID
       include OmniAuth::Strategy
       
+      attr_accessor :options
+      
+      # Should be 'openid_url'
+      # @see http://github.com/intridea/omniauth/issues/issue/13
+      IDENTIFIER_URL_PARAMETER = 'identifier'
+      
       AX = {
         :email => 'http://axschema.org/contact/email',
         :name => 'http://axschema.org/namePerson',
@@ -20,8 +28,8 @@ module OmniAuth
       def initialize(app, store = nil, options = {})
         super(app, options[:name] || :open_id)
         @options = options
-        @options[:required] ||= [AX[:email], AX[:name], 'email', 'fullname']
-        @options[:optional] ||= [AX[:first_name], AX[:last_name], AX[:nickname], AX[:city], AX[:state], AX[:website], AX[:image], 'postcode', 'nickname']
+        @options[:required] ||= [AX[:email], AX[:first_name], AX[:last_name], 'email', 'fullname']
+        @options[:optional] ||= [AX[:nickname], AX[:city], AX[:state], AX[:website], AX[:image], 'postcode', 'nickname']
         @store = store
       end
       
@@ -41,7 +49,7 @@ module OmniAuth
       end
       
       def identifier
-        request[:identifier]
+        request[IDENTIFIER_URL_PARAMETER]
       end
       
       def request_phase
@@ -53,21 +61,17 @@ module OmniAuth
         response = openid.call(env)
         case env['rack.openid.response']
         when Rack::OpenID::MissingResponse, Rack::OpenID::TimeoutResponse
-          fail :connection_failed
+          fail!(:connection_failed)
         else
           response
         end
       end
       
       def get_identifier
-        response = app.call(env)
-        if response[0] < 400
-          response
-        else
-          OmniAuth::Form.build('OpenID Authentication') do
-            text_field('OpenID Identifier', 'identifier')
-          end.to_response
-        end
+        OmniAuth::Form.build('OpenID Authentication') do
+          label_field('OpenID Identifier', IDENTIFIER_URL_PARAMETER)
+          input_field('url', IDENTIFIER_URL_PARAMETER)
+        end.to_response
       end
       
       def callback_phase
@@ -76,12 +80,11 @@ module OmniAuth
         openid = Rack::OpenID.new(lambda{|env| [200,{},[]]}, @store)
         openid.call(env)
         resp = env.delete('rack.openid.response')
-        case resp.status
-        when :failure
-          fail!(:invalid_credentials)
-        when :success
+        if resp && resp.status == :success
           request['auth'] = auth_hash(resp)
           @app.call(env)
+        else
+          fail!(:invalid_credentials)
         end
       end
       
@@ -120,4 +123,4 @@ module OmniAuth
       end
     end
   end
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-openid
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,85 +15,149 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-01 00:00:00 -04:00
+date: 2010-08-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: oa-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 0
-        - 0
-        version: 0.0.0
+        - 4
+        version: 0.0.4
+  requirement: *id001
+  name: oa-core
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 1
+        - 1
+        version: 1.1.1
+  requirement: *id002
   name: rack-openid
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id003
+  name: ruby-openid-apps-discovery
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 0
+        version: "0"
+  requirement: *id004
+  name: rake
+  prerelease: false
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: webmock
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 8
+        version: 0.0.8
+  requirement: *id005
+  name: mg
+  prerelease: false
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rack-test
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
+        - 1
+        - 3
         - 0
-        version: "0"
+        version: 1.3.0
+  requirement: *id006
+  name: rspec
+  prerelease: false
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mg
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 3
+        - 4
+        version: 1.3.4
+  requirement: *id007
+  name: webmock
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        version: "0"
+        - 5
+        - 4
+        version: 0.5.4
+  requirement: *id008
+  name: rack-test
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 4
+        - 3
+        version: 1.4.3
+  requirement: *id009
+  name: json
+  prerelease: false
   type: :development
-  version_requirements: *id006
 description: OpenID strategies for OmniAuth.
 email: michael@intridea.com
 executables: []
@@ -103,7 +168,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/omniauth/openid.rb
-- lib/omniauth/strategies/google.rb
+- lib/omniauth/strategies/google_apps.rb
 - lib/omniauth/strategies/open_id.rb
 - README.rdoc
 - LICENSE.rdoc
@@ -118,23 +183,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: OpenID strategies for OmniAuth.

data/lib/omniauth/strategies/google.rb

@@ -1,7 +0,0 @@
-module OmniAuth
-  module Strategies
-    class Google < OmniAuth::Stratgies::OpenID
-      def identifier; 'https://www.google.com/accounts/o8/id' end
-    end
-  end
-end