warden-github 0.4.0 → 0.4.1

data/lib/warden-github/strategy.rb

@@ -10,12 +10,12 @@ Warden::Strategies.add(:github) do
       begin
         api = api_for(params['code'])
 
-        resp = api.get '/api/v2/json/user/show' do |request|
+        resp = api.get '/api/v3/user' do |request|
           request.params['access_token'] = api.token
         end.body
 
         user = JSON.load(resp)
-        success!(Warden::Github::Oauth::User.new(user['user'], api.token))
+        success!(Warden::Github::Oauth::User.new(user, api.token))
       rescue OAuth2::Error
         %(<p>Outdated ?code=#{params['code']}:</p><p>#{$!}</p><p><a href="/auth/github">Retry</a></p>)
       end
@@ -48,16 +48,16 @@ Warden::Strategies.add(:github) do
   end
 
   def callback_url
-    absolute_url(request, env['warden'].config[:github_callback_url])
+    absolute_url(request, env['warden'].config[:github_callback_url], env['HTTP_X_FORWARDED_PROTO'])
   end
 
-  def absolute_url(request, suffix = nil)
+  def absolute_url(request, suffix = nil, proto = "http")
     port_part = case request.scheme
                 when "http"
                   request.port == 80 ? "" : ":#{request.port}"
                 when "https"
                   request.port == 443 ? "" : ":#{request.port}"
                 end
-    "#{request.scheme}://#{request.host}#{port_part}#{suffix}"
+    "#{proto}://#{request.host}#{port_part}#{suffix}"
   end
 end

data/lib/warden-github/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module Github
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warden-github
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-01 00:00:00 -08:00
+date: 2012-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency