omniauth-geekpark 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 484872d3d03863a03bc5f43d937425f472c1c433
-  data.tar.gz: e9825002eaaddf0db70ac2bd042c183fe27e5167
+  metadata.gz: 5d85ef49526a5e0081670f8db93fde4f426a2d60
+  data.tar.gz: f31ac87bbb88591241e2814c4388a4433c40d1f8
 SHA512:
-  metadata.gz: a7cfa51d0998b6add02cd6bdf006eea1329995032e7c08f8cc1273813874376e887ca63c38f8fef49a610566077630cbdb3a23ad5a2fe81cc31423eac2d509c9
-  data.tar.gz: 2bb0944037864d082bae7fcf65a1e9089cdc7206ffcce0180c90bfb82eaa40876e525e302394c425d9b17b152544f23aa0898c5190fa7761ea51927b73a77536
+  metadata.gz: 27b0a527fc75555aef50b14db55a287ba2b27627810445c975e200b6b4a50ab62cca12d01a576d4c4ff5970fd4f32581e0432d54a08e29bc286fa4b0db281157
+  data.tar.gz: 0824aaf3f4cc853e034187bc5b25a4e22094f8bb8156001b1e648f012f58a84a02255213039325f3632b85be99fc36a0c9c1df18b3bab2c5e272c645a7c09ce4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth-geekpark (0.2.1)
+    omniauth-geekpark (1.0.4)
       omniauth (~> 1.0)
       omniauth-oauth2 (= 1.3.1)
 
@@ -43,7 +43,7 @@ GEM
       rb-inotify (>= 0.9.7)
     lumberjack (1.0.10)
     method_source (0.8.2)
-    multi_json (1.12.0)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nenv (0.3.0)
@@ -111,4 +111,4 @@ DEPENDENCIES
   webmock (~> 1.24, >= 1.24.2)
 
 BUNDLED WITH
-   1.12.3
+   1.12.4

data/lib/omniauth-geekpark.rb

@@ -4,4 +4,5 @@ require 'omniauth-oauth2'
 require 'patch/omniauth-oauth2'
 require 'omniauth/strategies/geekpark'
 require 'omniauth/strategies/wechat'
+require 'omniauth/strategies/wechat_service'
 require 'omniauth/strategies/weibo'

data/lib/omniauth-geekpark/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GeekPark
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

data/lib/omniauth/strategies/wechat.rb

@@ -3,7 +3,7 @@ module OmniAuth
     class WeChat < OmniAuth::Strategies::OAuth2
       option :client_options, {
         site: 'https://api.weixin.qq.com',
-        authorize_url: 'https://open.weixin.qq.com/connect/oauth2/authorize',
+        authorize_url: 'https://open.weixin.qq.com/connect/qrconnect',
         token_url: 'https://api.weixin.qq.com/sns/oauth2/access_token',
       }
 
@@ -42,7 +42,7 @@ module OmniAuth
           appid: options.client_id,
           redirect_uri: callback_url,
           response_type: 'code',
-          scope: 'snsapi_userinfo',
+          scope: request.params['scope'] || 'snsapi_login',
         })
         if OmniAuth.config.test_mode
           @env ||= {}

data/lib/omniauth/strategies/wechat_service.rb

@@ -0,0 +1,92 @@
+module OmniAuth
+  module Strategies
+    class WeChatService < OmniAuth::Strategies::OAuth2
+      option :client_options, {
+        site: 'https://api.weixin.qq.com',
+        authorize_url: 'https://open.weixin.qq.com/connect/oauth2/authorize',
+        token_url: 'https://api.weixin.qq.com/sns/oauth2/access_token',
+      }
+
+      option :provider_ignores_state, true
+
+      uid { raw_info['unionid'] }
+
+      info do
+        {
+          nickname: raw_info['nickname'],
+          city: raw_info['city'],
+          avatar: raw_info['headimgurl']
+        }
+      end
+
+      def raw_info
+        @raw_info ||= begin
+                        response = access_token.get(
+                          '/sns/userinfo',
+                          { params: { access_token: access_token.token,
+                                      openid: access_token['openid'],
+                                      lang: 'zh-CN' },
+                                      parse: :json }
+                        ).parsed
+                        log :debug, response
+                        response
+                      end
+      end
+
+      def request_phase
+        redirect client.authorize_url(authorize_params)+'#wechat_redirect'
+      end
+
+      def authorize_params
+        params = options.authorize_params.merge({
+          appid: options.client_id,
+          redirect_uri: callback_url,
+          response_type: 'code',
+          state: request.params['state'],
+          scope: request.params['scope'] || 'snsapi_userinfo'
+        })
+        if OmniAuth.config.test_mode
+          @env ||= {}
+          @env["rack.session"] ||= {}
+        end
+        unless options.provider_ignores_state
+          params[:state] = SecureRandom.hex(24)
+          session["omniauth.state"] = params[:state]
+        end
+        params
+      end
+
+      def token_params
+        { appid: options.client_id, secret: options.client_secret }
+      end
+
+      def callback_phase
+        if request.params['state'].match(/\Ahttps?:\/\/(.*\.)?geekpark\.net\/.*\z/)
+          env['omniauth.redirect'] = {
+            callback_url: request.params['state'],
+            code: request.params['code']
+          }
+          call_app!
+        else
+          super
+        end
+      end
+
+      protected
+
+      def build_access_token
+        request_params = {
+          appid: options.client_id,
+          secret: options.client_secret,
+          code: request.params['code'],
+          grant_type: 'authorization_code',
+          parse: :json
+        }
+        client.get_token(request_params, {mode: :query})
+      end
+
+    end
+  end
+end
+
+OmniAuth.config.add_camelization('wechatservice', 'WeChatService')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-geekpark
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - HaoYunfei
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -121,6 +121,7 @@ files:
 - lib/omniauth-geekpark/version.rb
 - lib/omniauth/strategies/geekpark.rb
 - lib/omniauth/strategies/wechat.rb
+- lib/omniauth/strategies/wechat_service.rb
 - lib/omniauth/strategies/weibo.rb
 - lib/patch/omniauth-oauth2.rb
 - omniauth-geekpark.gemspec