omniauth-qzone 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be8823a03d8c2f034980ba9de4ad7cc7bb229f7
-  data.tar.gz: f10e82480400436c11fd7cc26aa1aa1bc6359d48
+  metadata.gz: add14e75ee2c096390caa09af62eb667c9a84807
+  data.tar.gz: 793a2501950e84d19dd50b6b8a3cc7e87cad1146
 SHA512:
-  metadata.gz: efbea2bc66d6e15f7509e716bf4c93f61d963ce2347e9e343ec62c006d8d935446f3c2e16eea257f2d86bd5261bdfea0e78623de3a59daa78592a27fea80034b
-  data.tar.gz: 7d73e3888133661abb734abe144f36ae92ba65f4b14bc38bc5e6503dc7c0f3d52d04c8a28ff87caf9dcae95161ff7c05dd37f774d68bab2a474b05b96bb02d8b
+  metadata.gz: 47646742befedb3570e6372e3dab9992a8c2349ff50a574639afddb3edd81d474bb378b338b98c88a4b0d18584ae750e745784607c394e8063ca8e1774677f40
+  data.tar.gz: f62b30c03da17f0a340def1d279c2bb3ea545cfd957076e2bb49c6a8c5323da313d40071672ff1b6f34c39c13b973c6c9c0fcbf1725c5b552948359f776577d6

data/lib/omniauth-qzone/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Qzone
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

data/lib/omniauth-qzone/version.rb~

@@ -0,0 +1,5 @@
+module Omniauth
+  module Qzone
+    VERSION = "2.0.0"
+  end
+end

data/lib/omniauth/strategies/qzone.rb

@@ -1,4 +1,4 @@
-require 'omniauth-oauth2'
+require 'omniauth/strategies/oauth2'
 require 'multi_json'
 module OmniAuth
   module Strategies
@@ -61,4 +61,4 @@ module OmniAuth
       end
     end
   end
-end
+end

data/lib/omniauth/strategies/qzone.rb~

@@ -0,0 +1,64 @@
+require 'omniauth-oauth2'
+require 'multi_json'
+module OmniAuth
+  module Strategies
+    #taken from https://github.com/he9qi/omniauth_china/blob/55dac2d2a657d20711459f89dfeb802a8f06c81e/lib/omniauth_china/strategies/qzone.rb
+    class Qzone < OmniAuth::Strategies::OAuth2
+      option :name, 'qzone'
+      
+      option :client_options, {
+        :site => 'https://graph.qq.com/oauth2.0/',
+        :authorize_url => '/oauth2.0/authorize',
+        :token_url => "/oauth2.0/token"
+      }
+
+      option :token_params, {
+        :state => 'foobar',
+        :parse => :query
+      }
+
+      
+      uid { 
+        @uid ||= begin
+          access_token.options[:mode] = :query
+          access_token.options[:param_name] = :access_token
+          # Response Example: "callback( {\"client_id\":\"11111\",\"openid\":\"000000FFFF\"} );\n"
+          response = access_token.get('/oauth2.0/me')
+          #TODO handle error case
+          matched = response.body.match(/"openid":"(?<openid>\w+)"/)
+          matched[:openid]
+        end
+        
+      }
+      
+      info do
+        {
+          'uid' => access_token.params[:openid],
+          'nickname' => raw_info['nickname'],
+          'name' =>  raw_info['nickname'],
+          'image' => raw_info['figureurl'],
+          'urls' => {
+            'figureurl_1' =>raw_info['figureurl_1'],
+            'figureurl_2' => raw_info['figureurl_2'],
+          },
+        }
+      end
+      extra do
+        { :raw_info => raw_info }
+      end
+      def raw_info
+        @raw_info ||= begin
+          #TODO handle error case
+          #TODO make info request url configurable
+          
+          client.request(:get, "https://graph.qq.com/user/get_user_info", :params => {
+              :format => :json,
+              :openid => uid,
+              :oauth_consumer_key => options[:client_id],
+              :access_token => access_token.token
+            }, :parse => :json).parsed
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-qzone
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - zhang ming
@@ -60,7 +60,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/omniauth-qzone/version.rb
+- lib/omniauth-qzone/version.rb~
 - lib/omniauth/strategies/qzone.rb
+- lib/omniauth/strategies/qzone.rb~
 - lib/omniauth-qzone.rb
 homepage: ''
 licenses: []