omniauth-renren 1.0.0.rc2 → 1.0.0.rc2.1

data/lib/omniauth-renren/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Renren
-    VERSION = "1.0.0.rc2"
+    VERSION = "1.0.0.rc2.1"
   end
 end

data/lib/omniauth/strategies/renren.rb

@@ -8,21 +8,19 @@ module OmniAuth
       option :client_options, {
         :authorize_url => 'http://graph.renren.com/oauth/authorize',
         :token_url => 'http://graph.renren.com/oauth/token',
+        :site => 'http://graph.renren.com'
       }
-      def request_phase
-        super
-      end
 
       uid { raw_info['uid'] }
 
       info do
         {
           "uid" => raw_info["uid"], 
-          "gender"=> (raw_info['gender'] == '0' ? 'Male' : 'Female'), 
-          "image"=>raw_info['logo50'],
+          "gender"=> (raw_info["sex"] == 1 ? 'Male' : 'Female'), 
+          "image"=>raw_info["headurl"],
           'name' => raw_info['name'],
           'urls' => {
-            'Kaixin' => "http://www.kaixin001.com/"
+            'Renren' => "http://www.renren.com/profile.do?id="+raw_info["uid"].to_s
           }
         }
       end
@@ -41,7 +39,8 @@ module OmniAuth
       end
 
       def session_key
-        @session_key ||= MultiJson.decode(@access_token.get('/renren_api/session_key'))
+        response = @access_token.get('/renren_api/session_key', {:params => {:oauth_token => @access_token.token}})
+        @session_key ||= MultiJson.decode(response.response.env[:body])
       end
 
       def request_phase
@@ -51,9 +50,12 @@ module OmniAuth
 
       def build_access_token
         if renren_session.nil? || renren_session.empty?
-          super
+          verifier = request.params['code']
+          self.access_token = client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(options))
+          puts self.access_token.inspect
+          self.access_token
         else
-          @access_token = ::OAuth2::AccessToken.new(client, renren_session['access_token'])
+          self.access_token = ::OAuth2::AccessToken.new(client, renren_session['access_token'])
         end
       end
 
@@ -67,7 +69,9 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= MultiJson.decode(Net::HTTP.post_form(URI.parse('http://api.renren.com/restserver.do'), signed_params).body)[0]
+        response = Net::HTTP.post_form(URI.parse('http://api.renren.com/restserver.do'), signed_params).body
+        puts response.inspect
+        @raw_info ||= MultiJson.decode(response)[0]
         puts @raw_info.inspect
         @raw_info
       rescue ::Errno::ETIMEDOUT

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: omniauth-renren
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 1955881117
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
   - rc2
-  version: 1.0.0.rc2
+  - 1
+  version: 1.0.0.rc2.1
 platform: ruby
 authors: 
 - Scott Ballantyne
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 +08:00
+date: 2011-11-07 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency