oa-openid 0.1.3 → 0.1.4

data/lib/omniauth/openid/gapps.rb

@@ -0,0 +1,32 @@
+require 'openid/consumer'
+require 'gapps_openid'
+
+module OpenID
+  # Because gapps_openid changes the discovery order
+  # (looking first for Google Apps, then anything else),
+  # we need to monkeypatch it to make it play nicely
+  # with others.
+  def self.discover(uri)
+    discovered = self.default_discover(uri)
+    
+    if discovered.last.empty?
+      info = discover_google_apps(uri) 
+      return info if info
+    end
+    
+    return discovered
+  rescue OpenID::DiscoveryFailure => e
+    info = discover_google_apps(uri)
+    
+    if info.nil?
+      raise e
+    else
+      return info
+    end
+  end
+  
+  def self.discover_google_apps(uri)
+    discovery = GoogleDiscovery.new
+    discovery.perform_discovery(uri)
+  end
+end

data/lib/omniauth/strategies/open_id.rb

@@ -1,5 +1,5 @@
 require 'rack/openid'
-require 'gapps_openid'
+require 'omniauth/openid/gapps'
 require 'omniauth/openid'
 
 module OmniAuth
@@ -24,7 +24,7 @@ module OmniAuth
       }
       
       def initialize(app, store = nil, options = {})
-        super(app, options[:name] || :open_id)
+        super(app, options.delete(:name) || :open_id)
         @options = options
         @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']
@@ -47,7 +47,7 @@ module OmniAuth
       end
       
       def identifier
-        request[IDENTIFIER_URL_PARAMETER]
+        options[:identifier] || request[IDENTIFIER_URL_PARAMETER]
       end
       
       def request_phase

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-openid
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -05:00
+date: 2010-10-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,12 +24,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 4
+        version: 0.1.4
   requirement: *id001
   name: oa-core
   prerelease: false
@@ -167,6 +167,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/omniauth/openid/gapps.rb
 - lib/omniauth/openid.rb
 - lib/omniauth/strategies/google_apps.rb
 - lib/omniauth/strategies/open_id.rb